diff options
author | Tobias Nießen <tniessen@tnie.de> | 2018-09-19 19:40:44 +0200 |
---|---|---|
committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2018-09-24 07:26:08 +0200 |
commit | 4da11f2dc5df6ccdcfefed2bd2cf26221e176185 (patch) | |
tree | c2fda448e20b74605cf593ca2ead212f1eaa70ea /test | |
parent | 2790db5e3d74c4f7521cc27a1115228700dd4049 (diff) | |
download | android-node-v8-4da11f2dc5df6ccdcfefed2bd2cf26221e176185.tar.gz android-node-v8-4da11f2dc5df6ccdcfefed2bd2cf26221e176185.tar.bz2 android-node-v8-4da11f2dc5df6ccdcfefed2bd2cf26221e176185.zip |
tls: fix DEP0083 after upgrading to OpenSSL 1.1.0
Setting ecdhCurve to false is already unsupported, so the deprecation
should already be EOL. The test was skipped ever since we upgraded to
OpenSSL 1.1.0.
PR-URL: https://github.com/nodejs/node/pull/22953
Refs: https://github.com/nodejs/node/pull/16130
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Diffstat (limited to 'test')
-rw-r--r-- | test/parallel/test-tls-ecdh-disable.js | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/test/parallel/test-tls-ecdh-disable.js b/test/parallel/test-tls-ecdh-disable.js deleted file mode 100644 index f06063200c..0000000000 --- a/test/parallel/test-tls-ecdh-disable.js +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright Joyent, Inc. and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - -// Test that the usage of elliptic curves are not permitted if disabled during -// server initialization. - -'use strict'; -const common = require('../common'); -const { readKey } = require('../common/fixtures'); -if (!common.hasCrypto) - common.skip('missing crypto'); - -if (!common.opensslCli) - common.skip('missing openssl-cli'); - -const OPENSSL_VERSION_NUMBER = - require('crypto').constants.OPENSSL_VERSION_NUMBER; -if (OPENSSL_VERSION_NUMBER >= 0x10100000) - common.skip('false ecdhCurve not supported in OpenSSL 1.1.0'); - -const assert = require('assert'); -const tls = require('tls'); -const exec = require('child_process').exec; - -const options = { - key: readKey('agent2-key.pem'), - cert: readKey('agent2-cert.pem'), - ciphers: 'ECDHE-RSA-AES128-SHA', - ecdhCurve: false -}; - -common.expectWarning('DeprecationWarning', - '{ ecdhCurve: false } is deprecated.', - 'DEP0083'); - -const server = tls.createServer(options, common.mustNotCall()); - -server.listen(0, '127.0.0.1', common.mustCall(function() { - const cmd = `"${common.opensslCli}" s_client -cipher ${ - options.ciphers} -connect 127.0.0.1:${this.address().port}`; - - exec(cmd, common.mustCall(function(err, stdout, stderr) { - // Old versions of openssl will still exit with 0 so we - // can't just check if err is not null. - assert(stderr.includes('handshake failure')); - server.close(); - })); -})); |