Skip to content

Commit debf389

Browse files
tonymetry
authored andcommitted
Catch Exceptions thrown when openssl is disabled
1 parent 5c9b9c2 commit debf389

File tree

6 files changed

+33
-6
lines changed

6 files changed

+33
-6
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ test/fixtures/hello.txt
1212
tmp/
1313
node
1414
node_g
15+
*.swp

test/disabled/tls_client.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ var client = net.createConnection(443, "www.microsoft.com");
1212
var caPem = fs.readFileSync(common.fixturesDir+"/msca.pem");
1313
//var caPem = fs.readFileSync("ca.pem");
1414

15-
var credentials = crypto.createCredentials({ca:caPem});
15+
try{
16+
var credentials = crypto.createCredentials({ca:caPem});
17+
} catch (e) {
18+
console.log("Not compiled with OPENSSL support.");
19+
process.exit();
20+
}
1621

1722
client.setEncoding("UTF8");
1823
client.addListener("connect", function () {

test/disabled/tls_server.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@ var crypto=require('crypto');
99
var keyPem = fs.readFileSync(common.fixturesDir + "/cert.pem");
1010
var certPem = fs.readFileSync(common.fixturesDir + "/cert.pem");
1111

12-
var credentials = crypto.createCredentials({key:keyPem, cert:certPem});
12+
try{
13+
var credentials = crypto.createCredentials({key:keyPem, cert:certPem});
14+
} catch (e) {
15+
console.log("Not compiled with OPENSSL support.");
16+
process.exit();
17+
}
1318
var i = 0;
1419
var server = net.createServer(function (connection) {
1520
connection.setSecure(credentials);

test/simple/test-crypto.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@ var caPem = fs.readFileSync(common.fixturesDir+"/test_ca.pem", 'ascii');
1717
var certPem = fs.readFileSync(common.fixturesDir+"/test_cert.pem", 'ascii');
1818
var keyPem = fs.readFileSync(common.fixturesDir+"/test_key.pem", 'ascii');
1919

20-
var credentials = crypto.createCredentials({key:keyPem, cert:certPem, ca:caPem});
20+
try{
21+
var credentials = crypto.createCredentials({key:keyPem, cert:certPem, ca:caPem});
22+
} catch (e) {
23+
console.log("Not compiled with OPENSSL support.");
24+
process.exit();
25+
}
2126

2227
// Test HMAC
2328
//var h1 = (new crypto.Hmac).init("sha1", "Node").update("some data").update("to hmac").digest("hex");

test/simple/test-http-tls.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,13 @@ var caPem = fs.readFileSync(common.fixturesDir+"/test_ca.pem", 'ascii');
2727
var certPem = fs.readFileSync(common.fixturesDir+"/test_cert.pem", 'ascii');
2828
var keyPem = fs.readFileSync(common.fixturesDir+"/test_key.pem", 'ascii');
2929

30-
var credentials = crypto.createCredentials({key:keyPem, cert:certPem, ca:caPem});
30+
try{
31+
var credentials = crypto.createCredentials({key:keyPem, cert:certPem, ca:caPem});
32+
} catch (e) {
33+
console.log("Not compiled with OPENSSL support.");
34+
process.exit();
35+
}
36+
3137

3238
var https_server = http.createServer(function (req, res) {
3339
res.id = request_number;

test/simple/test-net-tls.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ var caPem = fs.readFileSync(common.fixturesDir+"/test_ca.pem", 'ascii');
1818
var certPem = fs.readFileSync(common.fixturesDir+"/test_cert.pem", 'ascii');
1919
var keyPem = fs.readFileSync(common.fixturesDir+"/test_key.pem", 'ascii');
2020

21-
var credentials = crypto.createCredentials({key:keyPem, cert:certPem, ca:caPem});
21+
try{
22+
var credentials = crypto.createCredentials({key:keyPem, cert:certPem, ca:caPem});
23+
} catch (e) {
24+
console.log("Not compiled with OPENSSL support.");
25+
process.exit();
26+
}
2227

2328
var testData = "TEST123";
2429
var serverData = '';
@@ -96,4 +101,4 @@ secureServer.addListener("listening", function() {
96101
process.addListener("exit", function () {
97102
assert.ok(gotSecureServer, "Did not get secure event for server");
98103
assert.ok(gotSecureClient, "Did not get secure event for clientr");
99-
});
104+
});

0 commit comments

Comments
 (0)