mirror of https://github.com/lukechilds/node.git
Browse Source
Revert "disable RC4, add --cipher-list command line switch" and "tls: make --enable-legacy-cipher-list=val less verbose" This reverts commitv0.12.3-releasef9291a9449andb5737bb977. There is still some work to be done to guarantee secure defaults and a smooth upgrade path for v0.12.x users. Before this work is finished, we want to be able to release new versions of v0.12.x. So instead of waiting for these changes to be ready to ship, revert them and integrate them when they're ready to be shipped. Conflicts: src/node.cc Reviewed-By: James M Snell <jasnell@gmail.com> PR-URL: https://github.com/joyent/node/pull/25296
Julien Gilli
10 years ago
8 changed files with 12 additions and 262 deletions
@ -1,69 +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.
|
|||
|
|||
var spawn = require('child_process').spawn; |
|||
var assert = require('assert'); |
|||
var tls = require('tls'); |
|||
|
|||
function doTest(checklist, env, useswitch) { |
|||
var options; |
|||
if (env && useswitch === 1) { |
|||
options = {env:env}; |
|||
} |
|||
var args = ['-e', 'console.log(require(\'tls\').DEFAULT_CIPHERS)']; |
|||
|
|||
switch(useswitch) { |
|||
case 1: |
|||
// Test --cipher-test
|
|||
args.unshift('--cipher-list=' + env); |
|||
break; |
|||
case 2: |
|||
// Test --enable-legacy-cipher-list
|
|||
args.unshift('--enable-legacy-cipher-list=' + env); |
|||
break; |
|||
case 3: |
|||
// Test NODE_LEGACY_CIPHER_LIST
|
|||
if (env) options = {env:{"NODE_LEGACY_CIPHER_LIST": env}}; |
|||
break; |
|||
default: |
|||
// Test NODE_CIPHER_LIST
|
|||
if (env) options = {env:env}; |
|||
} |
|||
|
|||
var out = ''; |
|||
spawn(process.execPath, args, options). |
|||
stdout. |
|||
on('data', function(data) { |
|||
out += data; |
|||
}). |
|||
on('end', function() { |
|||
assert.equal(out.trim(), checklist); |
|||
}); |
|||
} |
|||
|
|||
doTest(tls.DEFAULT_CIPHERS); // test the default
|
|||
doTest('ABC', {'NODE_CIPHER_LIST':'ABC'}); // test the envar
|
|||
doTest('ABC', 'ABC', 1); // test the --cipher-list switch
|
|||
|
|||
['v0.10.38', 'v0.10.39', 'v0.12.2'].forEach(function(ver) { |
|||
doTest(tls.getLegacyCiphers(ver), ver, 2); |
|||
doTest(tls.getLegacyCiphers(ver), ver, 3); |
|||
}); |
|||
Loading…
Reference in new issue