crypto: move createCipher to runtime deprecation

PR-URL: #22089 Reviewed-By: Tiancheng "Timothy" Gu <[email protected]> Reviewed-By: Yihong Wang <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Ujjwal Sharma <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
nodejs · Aug 5, 2018 · 933d8eb · 933d8eb
1 parent 28c70ac
commit 933d8eb
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/doc/api/deprecations.md b/doc/api/deprecations.md
@@ -954,7 +954,7 @@ Type: End-of-Life
 <a id="DEP0106"></a>
 ### DEP0106: crypto.createCipher and crypto.createDecipher
 
-Type: Documentation-only
+Type: Runtime
 
 Using [`crypto.createCipher()`][] and [`crypto.createDecipher()`][] should be
 avoided as they use a weak key derivation function (MD5 with no salt) and static

diff --git a/lib/crypto.js b/lib/crypto.js
@@ -140,9 +140,7 @@ function createVerify(algorithm, options) {
 module.exports = exports = {
   // Methods
   _toBuf: toBuf,
-  createCipher,
   createCipheriv,
-  createDecipher,
   createDecipheriv,
   createDiffieHellman,
   createDiffieHellmanGroup,
@@ -209,6 +207,16 @@ function getFipsForced() {
 }
 
 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()
   fips: {
     get: !fipsMode ? getFipsDisabled :

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

diff --git a/test/parallel/test-crypto-cipher-decipher.js b/test/parallel/test-crypto-cipher-decipher.js
@@ -10,6 +10,15 @@ if (common.hasFipsCrypto)
 const crypto = require('crypto');
 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) {
   // Test encryption and decryption
   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 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);
   cipher.setAAD(aadbuf);
   cipher.setAutoPadding();

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