aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Nießen <tniessen@tnie.de>2019-02-21 20:52:45 +0100
committerTobias Nießen <tniessen@tnie.de>2019-03-02 10:58:12 +0100
commitb8018f407b2ae2daa70d41b2aa9dbbc5ca921b0f (patch)
tree80928d8b26d4582004c16f4e8dfe176e88166edb
parentf11e8b959dce355bbb21fa2f95108732db464897 (diff)
downloadandroid-node-v8-b8018f407b2ae2daa70d41b2aa9dbbc5ca921b0f.tar.gz
android-node-v8-b8018f407b2ae2daa70d41b2aa9dbbc5ca921b0f.tar.bz2
android-node-v8-b8018f407b2ae2daa70d41b2aa9dbbc5ca921b0f.zip
crypto: move DEP0113 to End-of-Life
PR-URL: https://github.com/nodejs/node/pull/26249 Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
-rw-r--r--doc/api/deprecations.md11
-rw-r--r--lib/internal/crypto/cipher.js21
2 files changed, 7 insertions, 25 deletions
diff --git a/doc/api/deprecations.md b/doc/api/deprecations.md
index e8ea13ffbd..60151401fb 100644
--- a/doc/api/deprecations.md
+++ b/doc/api/deprecations.md
@@ -2162,17 +2162,18 @@ accessed outside of Node.js core: `Socket.prototype._handle`,
### DEP0113: Cipher.setAuthTag(), Decipher.getAuthTag()
<!-- YAML
changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/26249
+ description: End-of-Life.
- version: v11.0.0
pr-url: https://github.com/nodejs/node/pull/22126
description: Runtime deprecation.
-->
-Type: Runtime
+Type: End-of-Life
-With the current crypto API, having `Cipher.setAuthTag()` and
-`Decipher.getAuthTag()` is not helpful and both functions will throw an error
-when called. They have never been documented and will be removed in a future
-release.
+`Cipher.setAuthTag()` and `Decipher.getAuthTag()` are no longer available. They
+were never documented and would throw when called.
<a id="DEP0114"></a>
### DEP0114: crypto._toBuf()
diff --git a/lib/internal/crypto/cipher.js b/lib/internal/crypto/cipher.js
index a2ede771ac..dd6fe2d6d7 100644
--- a/lib/internal/crypto/cipher.js
+++ b/lib/internal/crypto/cipher.js
@@ -37,7 +37,7 @@ const {
const assert = require('internal/assert');
const LazyTransform = require('internal/streams/lazy_transform');
-const { deprecate, normalizeEncoding } = require('internal/util');
+const { normalizeEncoding } = require('internal/util');
// Lazy loaded for startup performance.
let StringDecoder;
@@ -206,13 +206,6 @@ function setAuthTag(tagbuf) {
return this;
}
-Object.defineProperty(Cipher.prototype, 'setAuthTag', {
- get: deprecate(() => setAuthTag,
- 'Cipher.setAuthTag is deprecated and will be removed in a ' +
- 'future version of Node.js.',
- 'DEP0113')
-});
-
Cipher.prototype.setAAD = function setAAD(aadbuf, options) {
if (!isArrayBufferView(aadbuf)) {
throw new ERR_INVALID_ARG_TYPE('buffer',
@@ -243,20 +236,8 @@ function addCipherPrototypeFunctions(constructor) {
constructor.prototype.setAutoPadding = Cipher.prototype.setAutoPadding;
if (constructor === Cipheriv) {
constructor.prototype.getAuthTag = Cipher.prototype.getAuthTag;
- Object.defineProperty(constructor.prototype, 'setAuthTag', {
- get: deprecate(() => setAuthTag,
- 'Cipher.setAuthTag is deprecated and will be removed in ' +
- 'a future version of Node.js.',
- 'DEP0113')
- });
} else {
constructor.prototype.setAuthTag = setAuthTag;
- Object.defineProperty(constructor.prototype, 'getAuthTag', {
- get: deprecate(() => constructor.prototype.getAuthTag,
- 'Decipher.getAuthTag is deprecated and will be removed ' +
- 'in a future version of Node.js.',
- 'DEP0113')
- });
}
constructor.prototype.setAAD = Cipher.prototype.setAAD;
}