1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: remove workaround for unsupported OpenSSLs

Browse Source 
Workaround added in d9b9229d98afb4b is no longer needed, since OpenSSL
versions lower than 1.1.1 are unsupported.

PR-URL: https://github.com/nodejs/node/pull/28085
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
This commit is contained in:
Sam Roberts 2019-06-02 20:01:05 +02:00 committed by Anna Henningsen
parent 94a7c2ab8a
commit ba7551cad8
No known key found for this signature in database
GPG Key ID: 9C63F3A6CD2AD8F9
1 changed files with 7 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
test/parallel/test-https-agent-session-eviction.js
View File

@ -7,10 +7,8 @@ const { readKey } = require('../common/fixtures');
if (!common.hasCrypto) if (!common.hasCrypto)
common.skip('missing crypto'); common.skip('missing crypto');
const assert = require('assert');
const https = require('https'); const https = require('https');
const { OPENSSL_VERSION_NUMBER, SSL_OP_NO_TICKET } = const { SSL_OP_NO_TICKET } = require('crypto').constants;
require('crypto').constants;
const options = { const options = {
key: readKey('agent1-key.pem'), key: readKey('agent1-key.pem'),
@ -60,38 +58,12 @@ function second(server, session) {
res.resume(); res.resume();
}); });
if (OPENSSL_VERSION_NUMBER >= 0x10100000) { // Although we have a TLS 1.2 session to offer to the TLS 1.0 server,
// Although we have a TLS 1.2 session to offer to the TLS 1.0 server, // connection to the TLS 1.0 server should work.
// connection to the TLS 1.0 server should work. req.on('response', common.mustCall(function(res) {
req.on('response', common.mustCall(function(res) { // The test is now complete for OpenSSL 1.1.0.
// The test is now complete for OpenSSL 1.1.0.
server.close();
}));
} else {
// OpenSSL 1.0.x mistakenly locked versions based on the session it was
// offering. This causes this sequent request to fail. Let it fail, but
// test that this is mitigated on the next try by invalidating the session.
req.on('error', common.mustCall(function(err) {
assert(/wrong version number/.test(err.message));
req.on('close', function() {
third(server);
});
}));
}
req.end();
}
// Try one more time - session should be evicted!
function third(server) {
const req = https.request({
port: server.address().port,
rejectUnauthorized: false
}, function(res) {
res.resume();
assert(!req.socket.isSessionReused());
server.close(); server.close();
}); }));
req.on('error', common.mustNotCall());
req.end(); req.end();
} }