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

crypto: move createCipher to runtime deprecation

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/22089
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Yihong Wang <yh.wang@ibm.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This commit is contained in:
Tobias Nießen 2018-08-02 15:23:09 +02:00
parent 28c70ac131
commit 933d8eb689
No known key found for this signature in database
GPG Key ID: 718207F8FD156B70
5 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/api/deprecations.md
View File

@ -954,7 +954,7 @@ Type: End-of-Life
<a id="DEP0106"></a> <a id="DEP0106"></a>
### DEP0106: crypto.createCipher and crypto.createDecipher ### DEP0106: crypto.createCipher and crypto.createDecipher
Type: Documentation-only Type: Runtime
Using [`crypto.createCipher()`][] and [`crypto.createDecipher()`][] should be Using [`crypto.createCipher()`][] and [`crypto.createDecipher()`][] should be
avoided as they use a weak key derivation function (MD5 with no salt) and static avoided as they use a weak key derivation function (MD5 with no salt) and static

12
lib/crypto.js
View File

@ -140,9 +140,7 @@ function createVerify(algorithm, options) {
module.exports = exports = { module.exports = exports = {
// Methods // Methods
_toBuf: toBuf, _toBuf: toBuf,
createCipher,
createCipheriv, createCipheriv,
createDecipher,
createDecipheriv, createDecipheriv,
createDiffieHellman, createDiffieHellman,
createDiffieHellmanGroup, createDiffieHellmanGroup,
@ -209,6 +207,16 @@ function getFipsForced() {
} }
Object.defineProperties(exports, { Object.defineProperties(exports, {
createCipher: {
enumerable: false,
value: deprecate(createCipher,
'crypto.createCipher is deprecated.', 'DEP0106')
},
createDecipher: {
enumerable: false,
value: deprecate(createDecipher,
'crypto.createDecipher is deprecated.', 'DEP0106')
},
// crypto.fips is deprecated. DEP0093. Use crypto.getFips()/crypto.setFips() // crypto.fips is deprecated. DEP0093. Use crypto.getFips()/crypto.setFips()
fips: { fips: {
get: !fipsMode ? getFipsDisabled : get: !fipsMode ? getFipsDisabled :

6
test/parallel/test-crypto-authenticated.js
View File

@ -71,8 +71,10 @@ const expectedWarnings = common.hasFipsCrypto ?
['Use Cipheriv for counter mode of aes-256-ccm', common.noWarnCode] ['Use Cipheriv for counter mode of aes-256-ccm', common.noWarnCode]
]; ];
const expectedDeprecationWarnings = ['crypto.DEFAULT_ENCODING is deprecated.', const expectedDeprecationWarnings = [
'DEP0091']; ['crypto.DEFAULT_ENCODING is deprecated.', 'DEP0091'],
['crypto.createCipher is deprecated.', 'DEP0106']
];
common.expectWarning({ common.expectWarning({
Warning: expectedWarnings, Warning: expectedWarnings,

13
test/parallel/test-crypto-cipher-decipher.js
View File

@ -10,6 +10,15 @@ if (common.hasFipsCrypto)
const crypto = require('crypto'); const crypto = require('crypto');
const assert = require('assert'); const assert = require('assert');
common.expectWarning({
Warning: [
['Use Cipheriv for counter mode of aes-256-gcm', common.noWarnCode]
],
DeprecationWarning: [
['crypto.createCipher is deprecated.', 'DEP0106']
]
});
function testCipher1(key) { function testCipher1(key) {
// Test encryption and decryption // Test encryption and decryption
const plaintext = 'Keep this a secret? No! Tell everyone about node.js!'; const plaintext = 'Keep this a secret? No! Tell everyone about node.js!';
@ -235,10 +244,6 @@ testCipher2(Buffer.from('0123456789abcdef'));
const aadbuf = Buffer.from('aadbuf'); const aadbuf = Buffer.from('aadbuf');
const data = Buffer.from('test-crypto-cipher-decipher'); const data = Buffer.from('test-crypto-cipher-decipher');
common.expectWarning('Warning',
'Use Cipheriv for counter mode of aes-256-gcm',
common.noWarnCode);
const cipher = crypto.createCipher('aes-256-gcm', key); const cipher = crypto.createCipher('aes-256-gcm', key);
cipher.setAAD(aadbuf); cipher.setAAD(aadbuf);
cipher.setAutoPadding(); cipher.setAutoPadding();

11
test/parallel/test-process-emit-warning-from-native.js
View File

@ -11,9 +11,14 @@ const crypto = require('crypto');
const key = '0123456789'; const key = '0123456789';
{ {
common.expectWarning('Warning', common.expectWarning({
'Use Cipheriv for counter mode of aes-256-gcm', DeprecationWarning: [
common.noWarnCode); ['crypto.createCipher is deprecated.', 'DEP0106']
],
Warning: [
['Use Cipheriv for counter mode of aes-256-gcm', common.noWarnCode]
]
});
// Emits regular warning expected by expectWarning() // Emits regular warning expected by expectWarning()
crypto.createCipher('aes-256-gcm', key); crypto.createCipher('aes-256-gcm', key);