Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
OpenSSL version back to 1.1.1l
  • Loading branch information
Jacob B. Sanders
Jacob B. Sanders committed Jul 14, 2022
commit 13c709a3c73e3290e9853e18ff50e89688697650
35 changes: 17 additions & 18 deletions test/tests/openssl.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,26 @@ var subprocess = require("child_process");

describe("OpenSSL", function () {
/***
* Note that the {"macOS_deployment_target": "10.11"} is currently the target in the gyp binding(s) file;
* @note - darwin 10.15, v1.1.1l builds are failing. However, v1.1.1p are succeeding, so it's defined as 1.1.1p, and is
* set to `skip` until project maintainers can elect to either remove, use, or evaluate for another time.
*
* @note - the {"macOS_deployment_target": "10.11"} is currently the target in the gyp binding(s) file;
*/
if (process.argv.includes("--force-open-ssl-unit-testing")) {
it( "darwin 10.15, openSSL v1.1.1p acquireOpenSSL successfully executes", function () {
function execute () {
try {
subprocess.execFileSync("node", [ path.join(process.cwd(), "utils", "acquireOpenSSL.js"), "10.15" ], {
shell: false, encoding: "utf-8", env: process.env, cwd: process.cwd(), stdio: "ignore"
});
it.skip( "darwin 10.15, openSSL v1.1.1p acquireOpenSSL successfully executes", function () {
function execute () {
try {
subprocess.execFileSync("node", [ path.join(process.cwd(), "utils", "acquireOpenSSL.js"), "10.15" ], {
shell: false, encoding: "utf-8", env: process.env, cwd: process.cwd(), stdio: "ignore"
});

return 0;
} catch (exception) {
console.trace(exception);
return 0;
} catch (exception) {
console.trace(exception);

return 1;
}
return 1;
}
}

assert(execute() === 0);
} );
} else {
it.skip("darwin 10.15, openSSL v1.1.1p acquireOpenSSL");
}
assert(execute() === 0);
});
});
2 changes: 1 addition & 1 deletion utils/acquireOpenSSL.js
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ const acquireOpenSSL = async () => {
}
}

await buildOpenSSLIfNecessary("1.1.1p", macOsDeploymentTarget);
await buildOpenSSLIfNecessary("1.1.1l", macOsDeploymentTarget);
} catch (err) {
console.error("Acquire failed: ", err);
process.exit(1);
Expand Down