diff options
author | Shigeki Ohtsu <ohtsu@iij.ad.jp> | 2014-08-27 18:00:13 +0900 |
---|---|---|
committer | Fedor Indutny <fedor@indutny.com> | 2014-08-29 00:36:48 +0400 |
commit | 0dfedb7127ac388f66f5ea5d38330c86af6539b5 (patch) | |
tree | 0945fdc64f2bd89c3cf60bf1ec65c59d3c37a3b6 /test | |
parent | 6e453fad87c51dc15327628aa75886d3fbb3fa1c (diff) | |
download | android-node-v8-0dfedb7127ac388f66f5ea5d38330c86af6539b5.tar.gz android-node-v8-0dfedb7127ac388f66f5ea5d38330c86af6539b5.tar.bz2 android-node-v8-0dfedb7127ac388f66f5ea5d38330c86af6539b5.zip |
tls, crypto: add DHE support
In case of an invalid DH parameter file, it is sliently discarded. To
use auto DH parameter in a server and DHE key length check in a
client, we need to wait for the next release of OpenSSL-1.0.2.
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Diffstat (limited to 'test')
-rw-r--r-- | test/fixtures/dherror.pem | 3 | ||||
-rw-r--r-- | test/fixtures/keys/Makefile | 11 | ||||
-rw-r--r-- | test/fixtures/keys/dh1024.pem | 5 | ||||
-rw-r--r-- | test/fixtures/keys/dh2048.pem | 8 | ||||
-rw-r--r-- | test/fixtures/keys/dh512.pem | 4 | ||||
-rw-r--r-- | test/simple/test-tls-dhe.js | 107 |
6 files changed, 137 insertions, 1 deletions
diff --git a/test/fixtures/dherror.pem b/test/fixtures/dherror.pem new file mode 100644 index 0000000000..455795fc6c --- /dev/null +++ b/test/fixtures/dherror.pem @@ -0,0 +1,3 @@ +-----BEGIN DH PARAMETERS----- +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +-----END DH PARAMETERS----- diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile index 31e8484e5c..0793329209 100644 --- a/test/fixtures/keys/Makefile +++ b/test/fixtures/keys/Makefile @@ -1,4 +1,4 @@ -all: agent1-cert.pem agent2-cert.pem agent3-cert.pem agent4-cert.pem ca2-crl.pem ec-cert.pem +all: agent1-cert.pem agent2-cert.pem agent3-cert.pem agent4-cert.pem ca2-crl.pem ec-cert.pem dh512.pem dh1024.pem dh2048.pem # @@ -145,6 +145,15 @@ ec-cert.pem: ec-csr.pem ec-key.pem -signkey ec-key.pem \ -out ec-cert.pem +dh512.pem: + openssl dhparam -out dh512.pem 512 + +dh1024.pem: + openssl dhparam -out dh1024.pem 1024 + +dh2048.pem: + openssl dhparam -out dh2048.pem 2048 + clean: rm -f *.pem *.srl ca2-database.txt ca2-serial diff --git a/test/fixtures/keys/dh1024.pem b/test/fixtures/keys/dh1024.pem new file mode 100644 index 0000000000..e5556e0202 --- /dev/null +++ b/test/fixtures/keys/dh1024.pem @@ -0,0 +1,5 @@ +-----BEGIN DH PARAMETERS----- +MIGHAoGBAO2Ij3VgqTKsxLZiK0uW0xWVszBzNbdjgLkriicMcZuUj1fQOSM6CPwv +5kdrRV8kHCK9q8dU1Dpf2dgh3l4fFFLpjIuUmUx3b7Q+GfHZ1UepNxr1NHSJaCl+ +wA0gwSDYhy8xRAsZ3bFVsLfDCuxuzPNC0yjtS5CVqci//vq0NTM7AgEC +-----END DH PARAMETERS----- diff --git a/test/fixtures/keys/dh2048.pem b/test/fixtures/keys/dh2048.pem new file mode 100644 index 0000000000..451de9b92a --- /dev/null +++ b/test/fixtures/keys/dh2048.pem @@ -0,0 +1,8 @@ +-----BEGIN DH PARAMETERS----- +MIIBCAKCAQEAg3ytm4B8bqS4KmLTw7eeqrzp8Y4Ew65weXKL9eY2FmudR0VUkoti +fs7/fKDsxMVgLyL+9UpbTs18CNslwWgMCSkrXe/NtXWlQQBLgXhEHOaeK/6j9zyt +S6rlSvGK68NF0/e7o6jZXOSktIeflJQXoUyeds65+la/l5O2iuX0tgnGfNjB2Pdt +RnoAPNJW+SBvyfcmiWjfd5Lh67SBgckqFMiH+CPiw54U2CeDPB343DUEPpTcnLJB +aJs4uuxDnskz/0ZVidNBpUBs1wPQ8ruVNZx3hG2+PIqNPvOfYUPXIgn1ABj3mGAR +sgtN63KUBX322zkTVPJnt30mrWp/F62GSwIBAg== +-----END DH PARAMETERS----- diff --git a/test/fixtures/keys/dh512.pem b/test/fixtures/keys/dh512.pem new file mode 100644 index 0000000000..dcab8db9fb --- /dev/null +++ b/test/fixtures/keys/dh512.pem @@ -0,0 +1,4 @@ +-----BEGIN DH PARAMETERS----- +MEYCQQDpl3okBAjG92NSOaQEsIyqzvJRN06yHuGXunxYVIqxg7TnU8DBZW0ZYyiJ +rJLRA/9b9dCk5DXpq1pFGoAkYLoDAgEC +-----END DH PARAMETERS----- diff --git a/test/simple/test-tls-dhe.js b/test/simple/test-tls-dhe.js new file mode 100644 index 0000000000..3975c5ed40 --- /dev/null +++ b/test/simple/test-tls-dhe.js @@ -0,0 +1,107 @@ +// 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 common = require('../common'); + +if (!common.opensslCli) { + console.error('Skipping because node compiled without OpenSSL CLI.'); + process.exit(0); +} + +var assert = require('assert'); +var spawn = require('child_process').spawn; +var tls = require('tls'); +var fs = require('fs'); +var key = fs.readFileSync(common.fixturesDir + '/keys/agent2-key.pem'); +var cert = fs.readFileSync(common.fixturesDir + '/keys/agent2-cert.pem'); +var nsuccess = 0; +var ntests = 0; +var ciphers = 'DHE-RSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256'; + + +function loadDHParam(n) { + var path = common.fixturesDir; + if (n !== 'error') path += '/keys'; + return fs.readFileSync(path + '/dh' + n + '.pem'); +} + +function test(keylen, expectedCipher, cb) { + var options = { + key: key, + cert: cert, + dhparam: loadDHParam(keylen) + }; + + var server = tls.createServer(options, function(conn) { + conn.end(); + }); + + server.on('close', function(err) { + assert(!err); + if (cb) cb(); + }); + + server.listen(common.PORT, '127.0.0.1', function() { + var args = ['s_client', '-connect', '127.0.0.1:' + common.PORT, + '-cipher', ciphers]; + var client = spawn(common.opensslCli, args); + var out = ''; + client.stdout.setEncoding('utf8'); + client.stdout.on('data', function(d) { + out += d; + }); + client.stdout.on('end', function() { + // DHE key length can be checked -brief option in s_client but it + // is only supported in openssl 1.0.2 so we cannot check it. + var reg = new RegExp('Cipher : ' + expectedCipher); + if (reg.test(out)) { + nsuccess++; + server.close(); + } + }); + }); +} + +function test512() { + test(512, 'DHE-RSA-AES128-SHA256', test1024); + ntests++; +} + +function test1024() { + test(1024, 'DHE-RSA-AES128-SHA256', test2048); + ntests++; +} + +function test2048() { + test(2048, 'DHE-RSA-AES128-SHA256', testError); + ntests++; +} + +function testError() { + test('error', 'ECDHE-RSA-AES128-SHA256', null); + ntests++; +} + +test512(); + +process.on('exit', function() { + assert.equal(ntests, nsuccess); +}); |