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

test: improve test-crypto-rsa-dsa

Browse Source 
* use const and let instead of var
* use assert.strictEqual or assert.strictDeepEqual instead of assert.equal
* use arrow functions
* swap assertions arguments to match the standard
* validate the error for assert.throws

PR-URL: https://github.com/nodejs/node/pull/10681
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
This commit is contained in:
Adrian Estrada 2017-01-09 11:32:57 -05:00 committed by Luigi Pinca
parent 5aa210afe6
commit 85a90340e1
1 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
test/parallel/test-crypto-rsa-dsa.js
View File

@ -11,21 +11,24 @@ const constants = require('crypto').constants;
const crypto = require('crypto'); const crypto = require('crypto');
// Test certificates // Test certificates
var certPem = fs.readFileSync(common.fixturesDir + '/test_cert.pem', 'ascii'); const certPem = fs.readFileSync(common.fixturesDir + '/test_cert.pem', 'ascii');
var keyPem = fs.readFileSync(common.fixturesDir + '/test_key.pem', 'ascii'); const keyPem = fs.readFileSync(common.fixturesDir + '/test_key.pem', 'ascii');
var rsaPubPem = fs.readFileSync(common.fixturesDir + '/test_rsa_pubkey.pem', const rsaPubPem = fs.readFileSync(common.fixturesDir + '/test_rsa_pubkey.pem',
'ascii'); 'ascii');
var rsaKeyPem = fs.readFileSync(common.fixturesDir + '/test_rsa_privkey.pem', const rsaKeyPem = fs.readFileSync(common.fixturesDir + '/test_rsa_privkey.pem',
'ascii'); 'ascii');
var rsaKeyPemEncrypted = fs.readFileSync( const rsaKeyPemEncrypted = fs.readFileSync(
common.fixturesDir + '/test_rsa_privkey_encrypted.pem', 'ascii'); common.fixturesDir + '/test_rsa_privkey_encrypted.pem', 'ascii');
var dsaPubPem = fs.readFileSync(common.fixturesDir + '/test_dsa_pubkey.pem', const dsaPubPem = fs.readFileSync(common.fixturesDir + '/test_dsa_pubkey.pem',
'ascii'); 'ascii');
var dsaKeyPem = fs.readFileSync(common.fixturesDir + '/test_dsa_privkey.pem', const dsaKeyPem = fs.readFileSync(common.fixturesDir + '/test_dsa_privkey.pem',
'ascii'); 'ascii');
var dsaKeyPemEncrypted = fs.readFileSync( const dsaKeyPemEncrypted = fs.readFileSync(
common.fixturesDir + '/test_dsa_privkey_encrypted.pem', 'ascii'); common.fixturesDir + '/test_dsa_privkey_encrypted.pem', 'ascii');
const decryptError = new RegExp('^Error: error:06065064:digital envelope ' +
'routines:EVP_DecryptFinal_ex:bad decrypt$');
// Test RSA encryption/decryption // Test RSA encryption/decryption
{ {
const input = 'I AM THE WALRUS'; const input = 'I AM THE WALRUS';
@ -34,13 +37,13 @@ var dsaKeyPemEncrypted = fs.readFileSync(
let encryptedBuffer = crypto.publicEncrypt(rsaPubPem, bufferToEncrypt); let encryptedBuffer = crypto.publicEncrypt(rsaPubPem, bufferToEncrypt);
let decryptedBuffer = crypto.privateDecrypt(rsaKeyPem, encryptedBuffer); let decryptedBuffer = crypto.privateDecrypt(rsaKeyPem, encryptedBuffer);
assert.strictEqual(input, decryptedBuffer.toString()); assert.strictEqual(decryptedBuffer.toString(), input);
let decryptedBufferWithPassword = crypto.privateDecrypt({ let decryptedBufferWithPassword = crypto.privateDecrypt({
key: rsaKeyPemEncrypted, key: rsaKeyPemEncrypted,
passphrase: 'password' passphrase: 'password'
}, encryptedBuffer); }, encryptedBuffer);
assert.strictEqual(input, decryptedBufferWithPassword.toString()); assert.strictEqual(decryptedBufferWithPassword.toString(), input);
encryptedBuffer = crypto.publicEncrypt({ encryptedBuffer = crypto.publicEncrypt({
key: rsaKeyPemEncrypted, key: rsaKeyPemEncrypted,
@ -51,7 +54,7 @@ var dsaKeyPemEncrypted = fs.readFileSync(
key: rsaKeyPemEncrypted, key: rsaKeyPemEncrypted,
passphrase: 'password' passphrase: 'password'
}, encryptedBuffer); }, encryptedBuffer);
assert.strictEqual(input, decryptedBufferWithPassword.toString()); assert.strictEqual(decryptedBufferWithPassword.toString(), input);
encryptedBuffer = crypto.privateEncrypt({ encryptedBuffer = crypto.privateEncrypt({
key: rsaKeyPemEncrypted, key: rsaKeyPemEncrypted,
@ -62,68 +65,69 @@ var dsaKeyPemEncrypted = fs.readFileSync(
key: rsaKeyPemEncrypted, key: rsaKeyPemEncrypted,
passphrase: Buffer.from('password') passphrase: Buffer.from('password')
}, encryptedBuffer); }, encryptedBuffer);
assert.strictEqual(input, decryptedBufferWithPassword.toString()); assert.strictEqual(decryptedBufferWithPassword.toString(), input);
encryptedBuffer = crypto.publicEncrypt(certPem, bufferToEncrypt); encryptedBuffer = crypto.publicEncrypt(certPem, bufferToEncrypt);
decryptedBuffer = crypto.privateDecrypt(keyPem, encryptedBuffer); decryptedBuffer = crypto.privateDecrypt(keyPem, encryptedBuffer);
assert.strictEqual(input, decryptedBuffer.toString()); assert.strictEqual(decryptedBuffer.toString(), input);
encryptedBuffer = crypto.publicEncrypt(keyPem, bufferToEncrypt); encryptedBuffer = crypto.publicEncrypt(keyPem, bufferToEncrypt);
decryptedBuffer = crypto.privateDecrypt(keyPem, encryptedBuffer); decryptedBuffer = crypto.privateDecrypt(keyPem, encryptedBuffer);
assert.strictEqual(input, decryptedBuffer.toString()); assert.strictEqual(decryptedBuffer.toString(), input);
encryptedBuffer = crypto.privateEncrypt(keyPem, bufferToEncrypt); encryptedBuffer = crypto.privateEncrypt(keyPem, bufferToEncrypt);
decryptedBuffer = crypto.publicDecrypt(keyPem, encryptedBuffer); decryptedBuffer = crypto.publicDecrypt(keyPem, encryptedBuffer);
assert.strictEqual(input, decryptedBuffer.toString()); assert.strictEqual(decryptedBuffer.toString(), input);
assert.throws(function() { assert.throws(() => {
crypto.privateDecrypt({ crypto.privateDecrypt({
key: rsaKeyPemEncrypted, key: rsaKeyPemEncrypted,
passphrase: 'wrong' passphrase: 'wrong'
}, bufferToEncrypt); }, bufferToEncrypt);
}); }, decryptError);
assert.throws(function() { assert.throws(() => {
crypto.publicEncrypt({ crypto.publicEncrypt({
key: rsaKeyPemEncrypted, key: rsaKeyPemEncrypted,
passphrase: 'wrong' passphrase: 'wrong'
}, encryptedBuffer); }, encryptedBuffer);
}); }, decryptError);
encryptedBuffer = crypto.privateEncrypt({ encryptedBuffer = crypto.privateEncrypt({
key: rsaKeyPemEncrypted, key: rsaKeyPemEncrypted,
passphrase: Buffer.from('password') passphrase: Buffer.from('password')
}, bufferToEncrypt); }, bufferToEncrypt);
assert.throws(function() { assert.throws(() => {
crypto.publicDecrypt({ crypto.publicDecrypt({
key: rsaKeyPemEncrypted, key: rsaKeyPemEncrypted,
passphrase: [].concat.apply([], Buffer.from('password')) passphrase: [].concat.apply([], Buffer.from('password'))
}, encryptedBuffer); }, encryptedBuffer);
}); }, decryptError);
} }
function test_rsa(padding) { function test_rsa(padding) {
var input = Buffer.allocUnsafe(padding === 'RSA_NO_PADDING' ? 1024 / 8 : 32); const size = (padding === 'RSA_NO_PADDING') ? 1024 / 8 : 32;
for (var i = 0; i < input.length; i++) const input = Buffer.allocUnsafe(size);
for (let i = 0; i < input.length; i++)
input[i] = (i * 7 + 11) & 0xff; input[i] = (i * 7 + 11) & 0xff;
var bufferToEncrypt = Buffer.from(input); const bufferToEncrypt = Buffer.from(input);
padding = constants[padding]; padding = constants[padding];
var encryptedBuffer = crypto.publicEncrypt({ const encryptedBuffer = crypto.publicEncrypt({
key: rsaPubPem, key: rsaPubPem,
padding: padding padding: padding
}, bufferToEncrypt); }, bufferToEncrypt);
var decryptedBuffer = crypto.privateDecrypt({ const decryptedBuffer = crypto.privateDecrypt({
key: rsaKeyPem, key: rsaKeyPem,
padding: padding padding: padding
}, encryptedBuffer); }, encryptedBuffer);
assert.equal(input, decryptedBuffer.toString()); assert.deepStrictEqual(decryptedBuffer, input);
} }
test_rsa('RSA_NO_PADDING'); test_rsa('RSA_NO_PADDING');
@ -131,19 +135,21 @@ test_rsa('RSA_PKCS1_PADDING');
test_rsa('RSA_PKCS1_OAEP_PADDING'); test_rsa('RSA_PKCS1_OAEP_PADDING');
// Test RSA key signing/verification // Test RSA key signing/verification
var rsaSign = crypto.createSign('RSA-SHA1'); let rsaSign = crypto.createSign('RSA-SHA1');
var rsaVerify = crypto.createVerify('RSA-SHA1'); let rsaVerify = crypto.createVerify('RSA-SHA1');
assert.ok(rsaSign); assert.ok(rsaSign);
assert.ok(rsaVerify); assert.ok(rsaVerify);
const expectedSignature =
'5c50e3145c4e2497aadb0eabc83b342d0b0021ece0d4c4a064b7c' +
'8f020d7e2688b122bfb54c724ac9ee169f83f66d2fe90abeb95e8' +
'e1290e7e177152a4de3d944cf7d4883114a20ed0f78e70e25ef0f' +
'60f06b858e6af42a2f276ede95bbc6bc9a9bbdda15bd663186a6f' +
'40819a7af19e577bb2efa5e579a1f5ce8a0d4ca8b8f6';
rsaSign.update(rsaPubPem); rsaSign.update(rsaPubPem);
var rsaSignature = rsaSign.sign(rsaKeyPem, 'hex'); let rsaSignature = rsaSign.sign(rsaKeyPem, 'hex');
assert.equal(rsaSignature, assert.strictEqual(rsaSignature, expectedSignature);
'5c50e3145c4e2497aadb0eabc83b342d0b0021ece0d4c4a064b7c' +
'8f020d7e2688b122bfb54c724ac9ee169f83f66d2fe90abeb95e8' +
'e1290e7e177152a4de3d944cf7d4883114a20ed0f78e70e25ef0f' +
'60f06b858e6af42a2f276ede95bbc6bc9a9bbdda15bd663186a6f' +
'40819a7af19e577bb2efa5e579a1f5ce8a0d4ca8b8f6');
rsaVerify.update(rsaPubPem); rsaVerify.update(rsaPubPem);
assert.strictEqual(rsaVerify.verify(rsaPubPem, rsaSignature, 'hex'), true); assert.strictEqual(rsaVerify.verify(rsaPubPem, rsaSignature, 'hex'), true);
@ -151,16 +157,11 @@ assert.strictEqual(rsaVerify.verify(rsaPubPem, rsaSignature, 'hex'), true);
// Test RSA key signing/verification with encrypted key // Test RSA key signing/verification with encrypted key
rsaSign = crypto.createSign('RSA-SHA1'); rsaSign = crypto.createSign('RSA-SHA1');
rsaSign.update(rsaPubPem); rsaSign.update(rsaPubPem);
assert.doesNotThrow(function() { assert.doesNotThrow(() => {
var signOptions = { key: rsaKeyPemEncrypted, passphrase: 'password' }; var signOptions = { key: rsaKeyPemEncrypted, passphrase: 'password' };
rsaSignature = rsaSign.sign(signOptions, 'hex'); rsaSignature = rsaSign.sign(signOptions, 'hex');
}); });
assert.equal(rsaSignature, assert.strictEqual(rsaSignature, expectedSignature);
'5c50e3145c4e2497aadb0eabc83b342d0b0021ece0d4c4a064b7c' +
'8f020d7e2688b122bfb54c724ac9ee169f83f66d2fe90abeb95e8' +
'e1290e7e177152a4de3d944cf7d4883114a20ed0f78e70e25ef0f' +
'60f06b858e6af42a2f276ede95bbc6bc9a9bbdda15bd663186a6f' +
'40819a7af19e577bb2efa5e579a1f5ce8a0d4ca8b8f6');
rsaVerify = crypto.createVerify('RSA-SHA1'); rsaVerify = crypto.createVerify('RSA-SHA1');
rsaVerify.update(rsaPubPem); rsaVerify.update(rsaPubPem);
@ -168,10 +169,10 @@ assert.strictEqual(rsaVerify.verify(rsaPubPem, rsaSignature, 'hex'), true);
rsaSign = crypto.createSign('RSA-SHA1'); rsaSign = crypto.createSign('RSA-SHA1');
rsaSign.update(rsaPubPem); rsaSign.update(rsaPubPem);
assert.throws(function() { assert.throws(() => {
var signOptions = { key: rsaKeyPemEncrypted, passphrase: 'wrong' }; var signOptions = { key: rsaKeyPemEncrypted, passphrase: 'wrong' };
rsaSign.sign(signOptions, 'hex'); rsaSign.sign(signOptions, 'hex');
}); }, decryptError);
// //
// Test RSA signing and verification // Test RSA signing and verification
@ -196,7 +197,7 @@ assert.throws(function() {
sign.update(input); sign.update(input);
const output = sign.sign(privateKey, 'hex'); const output = sign.sign(privateKey, 'hex');
assert.strictEqual(output, signature); assert.strictEqual(signature, output);
const verify = crypto.createVerify('RSA-SHA256'); const verify = crypto.createVerify('RSA-SHA256');
verify.update(input); verify.update(input);
@ -232,9 +233,9 @@ const input = 'I AM THE WALRUS';
{ {
const sign = crypto.createSign('DSS1'); const sign = crypto.createSign('DSS1');
sign.update(input); sign.update(input);
assert.throws(function() { assert.throws(() => {
sign.sign({ key: dsaKeyPemEncrypted, passphrase: 'wrong' }, 'hex'); sign.sign({ key: dsaKeyPemEncrypted, passphrase: 'wrong' }, 'hex');
}); }, decryptError);
} }
{ {
@ -244,7 +245,7 @@ const input = 'I AM THE WALRUS';
sign.update(input); sign.update(input);
let signature; let signature;
assert.doesNotThrow(function() { assert.doesNotThrow(() => {
const signOptions = { key: dsaKeyPemEncrypted, passphrase: 'password' }; const signOptions = { key: dsaKeyPemEncrypted, passphrase: 'password' };
signature = sign.sign(signOptions, 'hex'); signature = sign.sign(signOptions, 'hex');
}); });