From 9374700d7a69f1a96af88a74737874d8e726fce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= Date: Sun, 26 Mar 2023 20:03:58 +0200 Subject: [PATCH] crypto: remove DEFAULT_ENCODING MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Citing 76b0bdf7207b275ec2e0de7c71ea333be8b38c70 from 2012, "only use this as a temporary measure." Getting or setting DEFAULT_ENCODING has emitted a warning ever since Node.js 10, so it seems appropriate to remove it in Node.js 20 five years later. The last Node.js version that did not emit a warning reached its end-of-life status at the end of 2019. This commit only removes the public API so that the change can land in time for Node.js 20. Refs: https://github.com/nodejs/node-v0.x-archive/pull/4179 Refs: https://github.com/nodejs/node/pull/18333 PR-URL: https://github.com/nodejs/node/pull/47182 Reviewed-By: Ben Noordhuis Reviewed-By: Michaël Zasso Reviewed-By: Filip Skokan Reviewed-By: Luigi Pinca Reviewed-By: Beth Griggs Reviewed-By: Erick Wendel Reviewed-By: Rafael Gonzaga --- doc/api/crypto.md | 20 - doc/api/deprecations.md | 9 +- lib/crypto.js | 11 - lib/internal/crypto/util.js | 10 +- test/parallel/test-crypto-authenticated.js | 3 - test/parallel/test-crypto-binary-default.js | 723 -------------------- test/parallel/test-crypto-scrypt.js | 17 - 7 files changed, 8 insertions(+), 785 deletions(-) delete mode 100644 test/parallel/test-crypto-binary-default.js diff --git a/doc/api/crypto.md b/doc/api/crypto.md index 5de4a76365ddad..7fd9e1d2fd7f64 100644 --- a/doc/api/crypto.md +++ b/doc/api/crypto.md @@ -2878,26 +2878,6 @@ An object containing commonly used constants for crypto and security related operations. The specific constants currently defined are described in [Crypto constants][]. -### `crypto.DEFAULT_ENCODING` - - - -> Stability: 0 - Deprecated - -The default encoding to use for functions that can take either strings -or [buffers][`Buffer`]. The default value is `'buffer'`, which makes methods -default to [`Buffer`][] objects. - -The `crypto.DEFAULT_ENCODING` mechanism is provided for backward compatibility -with legacy programs that expect `'latin1'` to be the default encoding. - -New applications should expect the default to be `'buffer'`. - -This property is deprecated. - ### `crypto.fips` -Type: Runtime +Type: End-of-Life -The [`crypto.DEFAULT_ENCODING`][] property is deprecated. +The `crypto.DEFAULT_ENCODING` property only existed for compatibility with +Node.js releases prior to versions 0.9.3 and has been removed. ### DEP0092: Top-level `this` bound to `module.exports` @@ -3388,7 +3392,6 @@ be added when a function is bound to an `AsyncResource`. [`console.error()`]: console.md#consoleerrordata-args [`console.log()`]: console.md#consolelogdata-args [`crypto.Certificate()` constructor]: crypto.md#legacy-api -[`crypto.DEFAULT_ENCODING`]: crypto.md#cryptodefault_encoding [`crypto.createCipher()`]: crypto.md#cryptocreatecipheralgorithm-password-options [`crypto.createCipheriv()`]: crypto.md#cryptocreatecipherivalgorithm-key-iv-options [`crypto.createDecipher()`]: crypto.md#cryptocreatedecipheralgorithm-password-options diff --git a/lib/crypto.js b/lib/crypto.js index 86035aea6e89a5..41adecc97c2527 100644 --- a/lib/crypto.js +++ b/lib/crypto.js @@ -114,9 +114,7 @@ const { const { getCiphers, getCurves, - getDefaultEncoding, getHashes, - setDefaultEncoding, setEngine, secureHeapUsed, } = require('internal/crypto/util'); @@ -356,15 +354,6 @@ ObjectDefineProperties(module.exports, { get: getFips, set: setFips, }, - DEFAULT_ENCODING: { - __proto__: null, - enumerable: false, - configurable: true, - get: deprecate(getDefaultEncoding, - 'crypto.DEFAULT_ENCODING is deprecated.', 'DEP0091'), - set: deprecate(setDefaultEncoding, - 'crypto.DEFAULT_ENCODING is deprecated.', 'DEP0091'), - }, constants: { __proto__: null, configurable: false, diff --git a/lib/internal/crypto/util.js b/lib/internal/crypto/util.js index 835ab26165683c..8838226c591785 100644 --- a/lib/internal/crypto/util.js +++ b/lib/internal/crypto/util.js @@ -74,14 +74,9 @@ const { const kHandle = Symbol('kHandle'); const kKeyObject = Symbol('kKeyObject'); -let defaultEncoding = 'buffer'; - -function setDefaultEncoding(val) { - defaultEncoding = val; -} - +// TODO(tniessen): remove all call sites and this function function getDefaultEncoding() { - return defaultEncoding; + return 'buffer'; } // This is here because many functions accepted binary strings without @@ -561,7 +556,6 @@ module.exports = { getHashes, kHandle, kKeyObject, - setDefaultEncoding, setEngine, toBuf, diff --git a/test/parallel/test-crypto-authenticated.js b/test/parallel/test-crypto-authenticated.js index d358f6b63c0e9f..6178445adbc634 100644 --- a/test/parallel/test-crypto-authenticated.js +++ b/test/parallel/test-crypto-authenticated.js @@ -29,8 +29,6 @@ const crypto = require('crypto'); const { inspect } = require('util'); const fixtures = require('../common/fixtures'); -crypto.DEFAULT_ENCODING = 'buffer'; - // // Test authenticated encryption modes. // @@ -74,7 +72,6 @@ const expectedWarnings = common.hasFipsCrypto ? ]; const expectedDeprecationWarnings = [ - ['crypto.DEFAULT_ENCODING is deprecated.', 'DEP0091'], ['crypto.createCipher is deprecated.', 'DEP0106'], ]; diff --git a/test/parallel/test-crypto-binary-default.js b/test/parallel/test-crypto-binary-default.js deleted file mode 100644 index 3bbca5b0da395b..00000000000000 --- a/test/parallel/test-crypto-binary-default.js +++ /dev/null @@ -1,723 +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. - -'use strict'; -// Flags: --expose-internals - -// This is the same as test/simple/test-crypto, but from before the shift -// to use buffers by default. - - -const common = require('../common'); - -if (!common.hasCrypto) - common.skip('missing crypto'); - -const assert = require('assert'); -const crypto = require('crypto'); -const fs = require('fs'); -const tls = require('tls'); -const fixtures = require('../common/fixtures'); - -require('internal/crypto/util').setDefaultEncoding('latin1'); - -// Test Certificates -const certPem = fixtures.readKey('rsa_cert.crt'); -const certPfx = fixtures.readKey('rsa_cert.pfx'); -const keyPem = fixtures.readKey('rsa_private.pem'); -const rsaPubPem = fixtures.readKey('rsa_public.pem', 'ascii'); -const rsaKeyPem = fixtures.readKey('rsa_private.pem', 'ascii'); - -// PFX tests -tls.createSecureContext({ pfx: certPfx, passphrase: 'sample' }); - -assert.throws(function() { - tls.createSecureContext({ pfx: certPfx }); -}, /^Error: mac verify failure$/); - -assert.throws(function() { - tls.createSecureContext({ pfx: certPfx, passphrase: 'test' }); -}, /^Error: mac verify failure$/); - -assert.throws(function() { - tls.createSecureContext({ pfx: 'sample', passphrase: 'test' }); -}, /^Error: not enough data$/); - -// Test HMAC -{ - const hmacHash = crypto.createHmac('sha1', 'Node') - .update('some data') - .update('to hmac') - .digest('hex'); - assert.strictEqual(hmacHash, '19fd6e1ba73d9ed2224dd5094a71babe85d9a892'); -} - -// Test HMAC-SHA-* (rfc 4231 Test Cases) -{ - const rfc4231 = [ - { - key: Buffer.from('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'), - data: Buffer.from('4869205468657265', 'hex'), // 'Hi There' - hmac: { - sha224: '896fb1128abbdf196832107cd49df33f47b4b1169912ba4f53684b22', - sha256: - 'b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c' + - '2e32cff7', - sha384: - 'afd03944d84895626b0825f4ab46907f15f9dadbe4101ec682aa034c' + - '7cebc59cfaea9ea9076ede7f4af152e8b2fa9cb6', - sha512: - '87aa7cdea5ef619d4ff0b4241a1d6cb02379f4e2ce4ec2787ad0b305' + - '45e17cdedaa833b7d6b8a702038b274eaea3f4e4be9d914eeb61f170' + - '2e696c203a126854' - } - }, - { - key: Buffer.from('4a656665', 'hex'), // 'Jefe' - data: Buffer.from('7768617420646f2079612077616e7420666f72206e6f74686' + - '96e673f', 'hex'), // 'what do ya want for nothing?' - hmac: { - sha224: 'a30e01098bc6dbbf45690f3a7e9e6d0f8bbea2a39e6148008fd05e44', - sha256: - '5bdcc146bf60754e6a042426089575c75a003f089d2739839dec58b9' + - '64ec3843', - sha384: - 'af45d2e376484031617f78d2b58a6b1b9c7ef464f5a01b47e42ec373' + - '6322445e8e2240ca5e69e2c78b3239ecfab21649', - sha512: - '164b7a7bfcf819e2e395fbe73b56e0a387bd64222e831fd610270cd7' + - 'ea2505549758bf75c05a994a6d034f65f8f0e6fdcaeab1a34d4a6b4b' + - '636e070a38bce737' - } - }, - { - key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'), - data: Buffer.from('ddddddddddddddddddddddddddddddddddddddddddddddddd' + - 'ddddddddddddddddddddddddddddddddddddddddddddddddddd', - 'hex'), - hmac: { - sha224: '7fb3cb3588c6c1f6ffa9694d7d6ad2649365b0c1f65d69d1ec8333ea', - sha256: - '773ea91e36800e46854db8ebd09181a72959098b3ef8c122d9635514' + - 'ced565fe', - sha384: - '88062608d3e6ad8a0aa2ace014c8a86f0aa635d947ac9febe83ef4e5' + - '5966144b2a5ab39dc13814b94e3ab6e101a34f27', - sha512: - 'fa73b0089d56a284efb0f0756c890be9b1b5dbdd8ee81a3655f83e33' + - 'b2279d39bf3e848279a722c806b485a47e67c807b946a337bee89426' + - '74278859e13292fb' - } - }, - { - key: Buffer.from('0102030405060708090a0b0c0d0e0f10111213141516171819', - 'hex'), - data: Buffer.from('cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdc' + - 'dcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd', - 'hex'), - hmac: { - sha224: '6c11506874013cac6a2abc1bb382627cec6a90d86efc012de7afec5a', - sha256: - '82558a389a443c0ea4cc819899f2083a85f0faa3e578f8077a2e3ff4' + - '6729665b', - sha384: - '3e8a69b7783c25851933ab6290af6ca77a9981480850009cc5577c6e' + - '1f573b4e6801dd23c4a7d679ccf8a386c674cffb', - sha512: - 'b0ba465637458c6990e5a8c5f61d4af7e576d97ff94b872de76f8050' + - '361ee3dba91ca5c11aa25eb4d679275cc5788063a5f19741120c4f2d' + - 'e2adebeb10a298dd' - } - }, - { - key: Buffer.from('0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c', 'hex'), - // 'Test With Truncation' - data: Buffer.from('546573742057697468205472756e636174696f6e', 'hex'), - hmac: { - sha224: '0e2aea68a90c8d37c988bcdb9fca6fa8', - sha256: 'a3b6167473100ee06e0c796c2955552b', - sha384: '3abf34c3503b2a23a46efc619baef897', - sha512: '415fad6271580a531d4179bc891d87a6' - }, - truncate: true - }, - { - key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaa', 'hex'), - // 'Test Using Larger Than Block-Size Key - Hash Key First' - data: Buffer.from('54657374205573696e67204c6172676572205468616e20426' + - 'c6f636b2d53697a65204b6579202d2048617368204b657920' + - '4669727374', 'hex'), - hmac: { - sha224: '95e9a0db962095adaebe9b2d6f0dbce2d499f112f2d2b7273fa6870e', - sha256: - '60e431591ee0b67f0d8a26aacbf5b77f8e0bc6213728c5140546040f' + - '0ee37f54', - sha384: - '4ece084485813e9088d2c63a041bc5b44f9ef1012a2b588f3cd11f05' + - '033ac4c60c2ef6ab4030fe8296248df163f44952', - sha512: - '80b24263c7c1a3ebb71493c1dd7be8b49b46d1f41b4aeec1121b0137' + - '83f8f3526b56d037e05f2598bd0fd2215d6a1e5295e64f73f63f0aec' + - '8b915a985d786598' - } - }, - { - key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaa', 'hex'), - // 'This is a test using a larger than block-size key and a larger ' + - // 'than block-size data. The key needs to be hashed before being ' + - // 'used by the HMAC algorithm.' - data: Buffer.from('5468697320697320612074657374207573696e672061206c6' + - '172676572207468616e20626c6f636b2d73697a65206b6579' + - '20616e642061206c6172676572207468616e20626c6f636b2' + - 'd73697a6520646174612e20546865206b6579206e65656473' + - '20746f20626520686173686564206265666f7265206265696' + - 'e6720757365642062792074686520484d414320616c676f72' + - '6974686d2e', 'hex'), - hmac: { - sha224: '3a854166ac5d9f023f54d517d0b39dbd946770db9c2b95c9f6f565d1', - sha256: - '9b09ffa71b942fcb27635fbcd5b0e944bfdc63644f0713938a7f5153' + - '5c3a35e2', - sha384: - '6617178e941f020d351e2f254e8fd32c602420feb0b8fb9adccebb82' + - '461e99c5a678cc31e799176d3860e6110c46523e', - sha512: - 'e37b6a775dc87dbaa4dfa9f96e5e3ffddebd71f8867289865df5a32d' + - '20cdc944b6022cac3c4982b10d5eeb55c3e4de15134676fb6de04460' + - '65c97440fa8c6a58' - } - }, - ]; - - for (const testCase of rfc4231) { - for (const hash in testCase.hmac) { - let result = crypto.createHmac(hash, testCase.key) - .update(testCase.data) - .digest('hex'); - if (testCase.truncate) { - result = result.substr(0, 32); // first 128 bits == 32 hex chars - } - assert.strictEqual( - testCase.hmac[hash], - result - ); - } - } -} - -// Test HMAC-MD5/SHA1 (rfc 2202 Test Cases) -{ - const rfc2202_md5 = [ - { - key: Buffer.from('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'), - data: 'Hi There', - hmac: '9294727a3638bb1c13f48ef8158bfc9d' - }, - { - key: 'Jefe', - data: 'what do ya want for nothing?', - hmac: '750c783e6ab0b503eaa86e310a5db738' - }, - { - key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'), - data: Buffer.from('ddddddddddddddddddddddddddddddddddddddddddddddddd' + - 'ddddddddddddddddddddddddddddddddddddddddddddddddddd', - 'hex'), - hmac: '56be34521d144c88dbb8c733f0e8b3f6' - }, - { - key: Buffer.from('0102030405060708090a0b0c0d0e0f10111213141516171819', - 'hex'), - data: Buffer.from('cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdc' + - 'dcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd' + - 'cdcdcdcdcd', - 'hex'), - hmac: '697eaf0aca3a3aea3a75164746ffaa79' - }, - { - key: Buffer.from('0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c', 'hex'), - data: 'Test With Truncation', - hmac: '56461ef2342edc00f9bab995690efd4c' - }, - { - key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaa', - 'hex'), - data: 'Test Using Larger Than Block-Size Key - Hash Key First', - hmac: '6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd' - }, - { - key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaa', - 'hex'), - data: - 'Test Using Larger Than Block-Size Key and Larger Than One ' + - 'Block-Size Data', - hmac: '6f630fad67cda0ee1fb1f562db3aa53e' - }, - ]; - const rfc2202_sha1 = [ - { - key: Buffer.from('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'), - data: 'Hi There', - hmac: 'b617318655057264e28bc0b6fb378c8ef146be00' - }, - { - key: 'Jefe', - data: 'what do ya want for nothing?', - hmac: 'effcdf6ae5eb2fa2d27416d5f184df9c259a7c79' - }, - { - key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'), - data: Buffer.from('ddddddddddddddddddddddddddddddddddddddddddddd' + - 'ddddddddddddddddddddddddddddddddddddddddddddd' + - 'dddddddddd', - 'hex'), - hmac: '125d7342b9ac11cd91a39af48aa17b4f63f175d3' - }, - { - key: Buffer.from('0102030405060708090a0b0c0d0e0f10111213141516171819', - 'hex'), - data: Buffer.from('cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdc' + - 'dcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd' + - 'cdcdcdcdcd', - 'hex'), - hmac: '4c9007f4026250c6bc8414f9bf50c86c2d7235da' - }, - { - key: Buffer.from('0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c', 'hex'), - data: 'Test With Truncation', - hmac: '4c1a03424b55e07fe7f27be1d58bb9324a9a5a04' - }, - { - key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaa', - 'hex'), - data: 'Test Using Larger Than Block-Size Key - Hash Key First', - hmac: 'aa4ae5e15272d00e95705637ce8a3b55ed402112' - }, - { - key: Buffer.from('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' + - 'aaaaaaaaaaaaaaaaaaaaaa', - 'hex'), - data: - 'Test Using Larger Than Block-Size Key and Larger Than One ' + - 'Block-Size Data', - hmac: 'e8e99d0f45237d786d6bbaa7965c7808bbff1a91' - }, - ]; - - if (!common.hasFipsCrypto) { - for (const testCase of rfc2202_md5) { - assert.strictEqual( - testCase.hmac, - crypto.createHmac('md5', testCase.key) - .update(testCase.data) - .digest('hex') - ); - } - } - for (const testCase of rfc2202_sha1) { - assert.strictEqual( - testCase.hmac, - crypto.createHmac('sha1', testCase.key) - .update(testCase.data) - .digest('hex') - ); - } -} - -// Test hashing -{ - const a1 = crypto.createHash('sha1').update('Test123').digest('hex'); - const a2 = crypto.createHash('sha256').update('Test123').digest('base64'); - const a3 = crypto.createHash('sha512').update('Test123').digest(); // binary - const a4 = crypto.createHash('sha1').update('Test123').digest('buffer'); - - if (!common.hasFipsCrypto) { - const a0 = crypto.createHash('md5').update('Test123').digest('latin1'); - assert.strictEqual( - a0, - 'h\u00ea\u00cb\u0097\u00d8o\fF!\u00fa+\u000e\u0017\u00ca\u00bd\u008c' - ); - } - - assert.strictEqual(a1, '8308651804facb7b9af8ffc53a33a22d6a1c8ac2'); - - assert.strictEqual(a2, '2bX1jws4GYKTlxhloUB09Z66PoJZW+y+hq5R8dnx9l4='); - - // Test SHA512 as assumed latin1 - assert.strictEqual( - a3, - '\u00c1(4\u00f1\u0003\u001fd\u0097!O\'\u00d4C/&Qz\u00d4' + - '\u0094\u0015l\u00b8\u008dQ+\u00db\u001d\u00c4\u00b5}\u00b2' + - '\u00d6\u0092\u00a3\u00df\u00a2i\u00a1\u009b\n\n*\u000f' + - '\u00d7\u00d6\u00a2\u00a8\u0085\u00e3<\u0083\u009c\u0093' + - '\u00c2\u0006\u00da0\u00a1\u00879(G\u00ed\'' - ); - - assert.deepStrictEqual( - a4, - Buffer.from('8308651804facb7b9af8ffc53a33a22d6a1c8ac2', 'hex') - ); -} - -// Test multiple updates to same hash -{ - const h1 = crypto.createHash('sha1').update('Test123').digest('hex'); - const h2 = crypto.createHash('sha1').update('Test').update('123') - .digest('hex'); - assert.strictEqual(h1, h2); -} - -// Test hashing for binary files -{ - const fn = fixtures.path('sample.png'); - const sha1Hash = crypto.createHash('sha1'); - const fileStream = fs.createReadStream(fn); - fileStream.on('data', function(data) { - sha1Hash.update(data); - }); - fileStream.on('close', common.mustCall(function() { - assert.strictEqual( - sha1Hash.digest('hex'), - '22723e553129a336ad96e10f6aecdf0f45e4149e' - ); - })); -} - -// Unknown digest method should throw an error: -// https://github.com/nodejs/node-v0.x-archive/issues/2227 -assert.throws(function() { - crypto.createHash('xyzzy'); -}, /^Error: Digest method not supported$/); - -// Test signing and verifying -{ - const s1 = crypto.createSign('SHA1') - .update('Test123') - .sign(keyPem, 'base64'); - const s1Verified = crypto.createVerify('SHA1') - .update('Test') - .update('123') - .verify(certPem, s1, 'base64'); - assert.strictEqual(s1Verified, true); - - const s2 = crypto.createSign('SHA256') - .update('Test123') - .sign(keyPem); // binary - const s2Verified = crypto.createVerify('SHA256') - .update('Test') - .update('123') - .verify(certPem, s2); // binary - assert.strictEqual(s2Verified, true); - - const s3 = crypto.createSign('SHA1') - .update('Test123') - .sign(keyPem, 'buffer'); - const s3Verified = crypto.createVerify('SHA1') - .update('Test') - .update('123') - .verify(certPem, s3); - assert.strictEqual(s3Verified, true); -} - - -function testCipher1(key) { - // Test encryption and decryption - const plaintext = 'Keep this a secret? No! Tell everyone about node.js!'; - const cipher = crypto.createCipher('aes192', key); - - // Encrypt plaintext which is in utf8 format - // to a ciphertext which will be in hex - let ciph = cipher.update(plaintext, 'utf8', 'hex'); - // Only use binary or hex, not base64. - ciph += cipher.final('hex'); - - const decipher = crypto.createDecipher('aes192', key); - let txt = decipher.update(ciph, 'hex', 'utf8'); - txt += decipher.final('utf8'); - - assert.strictEqual(txt, plaintext); -} - - -function testCipher2(key) { - // Encryption and decryption with Base64. - // Reported in https://github.com/joyent/node/issues/738 - const plaintext = - '32|RmVZZkFUVmpRRkp0TmJaUm56ZU9qcnJkaXNNWVNpTTU*|iXmckfRWZBGWWELw' + - 'eCBsThSsfUHLeRe0KCsK8ooHgxie0zOINpXxfZi/oNG7uq9JWFVCk70gfzQH8ZUJ' + - 'jAfaFg**'; - const cipher = crypto.createCipher('aes256', key); - - // Encrypt plaintext which is in utf8 format - // to a ciphertext which will be in Base64 - let ciph = cipher.update(plaintext, 'utf8', 'base64'); - ciph += cipher.final('base64'); - - const decipher = crypto.createDecipher('aes256', key); - let txt = decipher.update(ciph, 'base64', 'utf8'); - txt += decipher.final('utf8'); - - assert.strictEqual(txt, plaintext); -} - - -function testCipher3(key, iv) { - // Test encryption and decryption with explicit key and iv - const plaintext = - '32|RmVZZkFUVmpRRkp0TmJaUm56ZU9qcnJkaXNNWVNpTTU*|iXmckfRWZBGWWELw' + - 'eCBsThSsfUHLeRe0KCsK8ooHgxie0zOINpXxfZi/oNG7uq9JWFVCk70gfzQH8ZUJ' + - 'jAfaFg**'; - const cipher = crypto.createCipheriv('des-ede3-cbc', key, iv); - let ciph = cipher.update(plaintext, 'utf8', 'hex'); - ciph += cipher.final('hex'); - - const decipher = crypto.createDecipheriv('des-ede3-cbc', key, iv); - let txt = decipher.update(ciph, 'hex', 'utf8'); - txt += decipher.final('utf8'); - - assert.strictEqual(txt, plaintext); -} - - -function testCipher4(key, iv) { - // Test encryption and decryption with explicit key and iv - const plaintext = - '32|RmVZZkFUVmpRRkp0TmJaUm56ZU9qcnJkaXNNWVNpTTU*|iXmckfRWZBGWWELw' + - 'eCBsThSsfUHLeRe0KCsK8ooHgxie0zOINpXxfZi/oNG7uq9JWFVCk70gfzQH8ZUJ' + - 'jAfaFg**'; - const cipher = crypto.createCipheriv('des-ede3-cbc', key, iv); - let ciph = cipher.update(plaintext, 'utf8', 'buffer'); - ciph = Buffer.concat([ciph, cipher.final('buffer')]); - - const decipher = crypto.createDecipheriv('des-ede3-cbc', key, iv); - let txt = decipher.update(ciph, 'buffer', 'utf8'); - txt += decipher.final('utf8'); - - assert.strictEqual(txt, plaintext); -} - - -function testCipher5(key, iv) { - // Test encryption and decryption with explicit key with aes128-wrap - const plaintext = - '32|RmVZZkFUVmpRRkp0TmJaUm56ZU9qcnJkaXNNWVNpTTU*|iXmckfRWZBGWWELw' + - 'eCBsThSsfUHLeRe0KCsK8ooHgxie0zOINpXxfZi/oNG7uq9JWFVCk70gfzQH8ZUJ' + - 'jAfaFg**'; - const cipher = crypto.createCipher('id-aes128-wrap', key); - let ciph = cipher.update(plaintext, 'utf8', 'buffer'); - ciph = Buffer.concat([ciph, cipher.final('buffer')]); - - const decipher = crypto.createDecipher('id-aes128-wrap', key); - let txt = decipher.update(ciph, 'buffer', 'utf8'); - txt += decipher.final('utf8'); - - assert.strictEqual(txt, plaintext); -} - -if (!common.hasFipsCrypto) { - testCipher1('MySecretKey123'); - testCipher1(Buffer.from('MySecretKey123')); - - testCipher2('0123456789abcdef'); - testCipher2(Buffer.from('0123456789abcdef')); - - testCipher5(Buffer.from('0123456789abcd0123456789')); -} - -testCipher3('0123456789abcd0123456789', '12345678'); -testCipher3('0123456789abcd0123456789', Buffer.from('12345678')); -testCipher3(Buffer.from('0123456789abcd0123456789'), '12345678'); -testCipher3(Buffer.from('0123456789abcd0123456789'), Buffer.from('12345678')); - -testCipher4(Buffer.from('0123456789abcd0123456789'), Buffer.from('12345678')); - - -// update() should only take buffers / strings -assert.throws( - () => crypto.createHash('sha1').update({ foo: 'bar' }), - { - code: 'ERR_INVALID_ARG_TYPE', - name: 'TypeError' - }); - - -// Test Diffie-Hellman with two parties sharing a secret, -// using various encodings as we go along -{ - const size = common.hasFipsCrypto || common.hasOpenSSL3 ? 1024 : 256; - const dh1 = crypto.createDiffieHellman(size); - const p1 = dh1.getPrime('buffer'); - const dh2 = crypto.createDiffieHellman(p1, 'base64'); - const key1 = dh1.generateKeys(); - const key2 = dh2.generateKeys('hex'); - const secret1 = dh1.computeSecret(key2, 'hex', 'base64'); - const secret2 = dh2.computeSecret(key1, 'latin1', 'buffer'); - - assert.strictEqual(secret1, secret2.toString('base64')); - - // Create "another dh1" using generated keys from dh1, - // and compute secret again - const dh3 = crypto.createDiffieHellman(p1, 'buffer'); - const privkey1 = dh1.getPrivateKey(); - dh3.setPublicKey(key1); - dh3.setPrivateKey(privkey1); - - assert.strictEqual(dh1.getPrime(), dh3.getPrime()); - assert.strictEqual(dh1.getGenerator(), dh3.getGenerator()); - assert.strictEqual(dh1.getPublicKey(), dh3.getPublicKey()); - assert.strictEqual(dh1.getPrivateKey(), dh3.getPrivateKey()); - - const secret3 = dh3.computeSecret(key2, 'hex', 'base64'); - - assert.strictEqual(secret1, secret3); - - // https://github.com/joyent/node/issues/2338 - const p = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' + - '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' + - '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' + - 'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF'; - crypto.createDiffieHellman(p, 'hex'); - - // Test RSA key signing/verification - const rsaSign = crypto.createSign('SHA1'); - const rsaVerify = crypto.createVerify('SHA1'); - assert.ok(rsaSign instanceof crypto.Sign); - assert.ok(rsaVerify instanceof crypto.Verify); - - rsaSign.update(rsaPubPem); - const rsaSignature = rsaSign.sign(rsaKeyPem, 'hex'); - const expectedSignature = fixtures.readKey( - 'rsa_public_sha1_signature_signedby_rsa_private.sha1', - 'hex' - ); - assert.strictEqual(rsaSignature, expectedSignature); - - rsaVerify.update(rsaPubPem); - assert.strictEqual(rsaVerify.verify(rsaPubPem, rsaSignature, 'hex'), true); -} - -// -// Test RSA signing and verification -// -{ - const privateKey = fixtures.readKey('rsa_private_b.pem'); - const publicKey = fixtures.readKey('rsa_public_b.pem'); - - const input = 'I AM THE WALRUS'; - - const signature = fixtures.readKey( - 'I_AM_THE_WALRUS_sha256_signature_signedby_rsa_private_b.sha256', - 'hex' - ); - - const sign = crypto.createSign('SHA256'); - sign.update(input); - - const output = sign.sign(privateKey, 'hex'); - assert.strictEqual(output, signature); - - const verify = crypto.createVerify('SHA256'); - verify.update(input); - - assert.strictEqual(verify.verify(publicKey, signature, 'hex'), true); -} - - -// -// Test DSA signing and verification -// -{ - const privateKey = fixtures.readKey('dsa_private.pem'); - const publicKey = fixtures.readKey('dsa_public.pem'); - - const input = 'I AM THE WALRUS'; - - // DSA signatures vary across runs so there is no static string to verify - // against - const sign = crypto.createSign('SHA1'); - sign.update(input); - const signature = sign.sign(privateKey, 'hex'); - - const verify = crypto.createVerify('SHA1'); - verify.update(input); - - assert.strictEqual(verify.verify(publicKey, signature, 'hex'), true); -} - - -// -// Test PBKDF2 with RFC 6070 test vectors (except #4) -// -function testPBKDF2(password, salt, iterations, keylen, expected) { - const actual = crypto.pbkdf2Sync(password, salt, iterations, keylen, - 'sha256'); - assert.strictEqual(actual, expected); - - const cb = common.mustCall((err, actual) => { - assert.strictEqual(actual, expected); - }); - crypto.pbkdf2(password, salt, iterations, keylen, 'sha256', cb); -} - - -testPBKDF2('password', 'salt', 1, 20, - '\x12\x0f\xb6\xcf\xfc\xf8\xb3\x2c\x43\xe7\x22\x52' + - '\x56\xc4\xf8\x37\xa8\x65\x48\xc9'); - -testPBKDF2('password', 'salt', 2, 20, - '\xae\x4d\x0c\x95\xaf\x6b\x46\xd3\x2d\x0a\xdf\xf9' + - '\x28\xf0\x6d\xd0\x2a\x30\x3f\x8e'); - -testPBKDF2('password', 'salt', 4096, 20, - '\xc5\xe4\x78\xd5\x92\x88\xc8\x41\xaa\x53\x0d\xb6' + - '\x84\x5c\x4c\x8d\x96\x28\x93\xa0'); - -testPBKDF2('passwordPASSWORDpassword', - 'saltSALTsaltSALTsaltSALTsaltSALTsalt', - 4096, - 25, - '\x34\x8c\x89\xdb\xcb\xd3\x2b\x2f\x32\xd8\x14\xb8' + - '\x11\x6e\x84\xcf\x2b\x17\x34\x7e\xbc\x18\x00\x18\x1c'); - -testPBKDF2('pass\0word', 'sa\0lt', 4096, 16, - '\x89\xb6\x9d\x05\x16\xf8\x29\x89\x3c\x69\x62\x26' + - '\x65\x0a\x86\x87'); diff --git a/test/parallel/test-crypto-scrypt.js b/test/parallel/test-crypto-scrypt.js index 9e5e46164fb05c..63656e056f195a 100644 --- a/test/parallel/test-crypto-scrypt.js +++ b/test/parallel/test-crypto-scrypt.js @@ -188,23 +188,6 @@ for (const options of toobig) { })); } -{ - const defaultEncoding = crypto.DEFAULT_ENCODING; - const defaults = { N: 16384, p: 1, r: 8 }; - const expected = crypto.scryptSync('pass', 'salt', 1, defaults); - - const testEncoding = 'latin1'; - crypto.DEFAULT_ENCODING = testEncoding; - const actual = crypto.scryptSync('pass', 'salt', 1); - assert.deepStrictEqual(actual, expected.toString(testEncoding)); - - crypto.scrypt('pass', 'salt', 1, common.mustSucceed((actual) => { - assert.deepStrictEqual(actual, expected.toString(testEncoding)); - })); - - crypto.DEFAULT_ENCODING = defaultEncoding; -} - for (const { args, expected } of badargs) { assert.throws(() => crypto.scrypt(...args), expected); assert.throws(() => crypto.scryptSync(...args), expected);