nodejs
diff --git a/‎doc/api/crypto.md‎
Lines changed: 10 additions & 0 deletions b/‎doc/api/crypto.md‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎lib/internal/crypto/cipher.js‎
Lines changed: 5 additions & 3 deletions b/‎lib/internal/crypto/cipher.js‎
Lines changed: 5 additions & 3 deletions
diff --git a/‎test/parallel/test-crypto-encoding-validation-error.js‎
Lines changed: 8 additions & 2 deletions b/‎test/parallel/test-crypto-encoding-validation-error.js‎
Lines changed: 8 additions & 2 deletions
@@ -848,6 +848,9 @@ added: v0.1.94
   If `outputEncoding` is specified, a string is
   returned. If an `outputEncoding` is not provided, a [`Buffer`][] is returned.
 
+If an output encoding was specified in a previous call to
+[`cipher.update()`][], `outputEncoding` must use the same encoding.
+
 Once the `cipher.final()` method has been called, the `Cipheriv` object can no
 longer be used to encrypt data. Attempts to call `cipher.final()` more than
 once will result in an error being thrown.
@@ -940,6 +943,8 @@ The `outputEncoding` specifies the output format of the enciphered
 data. If the `outputEncoding`
 is specified, a string using the specified encoding is returned. If no
 `outputEncoding` is provided, a [`Buffer`][] is returned.
+When `outputEncoding` is specified, it must use the same encoding as previous
+calls to `cipher.update()`.
 
 The `cipher.update()` method can be called multiple times with new data until
 [`cipher.final()`][] is called. Calling `cipher.update()` after
@@ -1158,6 +1163,9 @@ added: v0.1.94
   If `outputEncoding` is specified, a string is
   returned. If an `outputEncoding` is not provided, a [`Buffer`][] is returned.
 
+If an output encoding was specified in a previous call to
+[`decipher.update()`][], `outputEncoding` must use the same encoding.
+
 Once the `decipher.final()` method has been called, the `Decipheriv` object can
 no longer be used to decrypt data. Attempts to call `decipher.final()` more
 than once will result in an error being thrown.
@@ -1294,6 +1302,8 @@ The `outputEncoding` specifies the output format of the enciphered
 data. If the `outputEncoding`
 is specified, a string using the specified encoding is returned. If no
 `outputEncoding` is provided, a [`Buffer`][] is returned.
+When `outputEncoding` is specified, it must use the same encoding as previous
+calls to `decipher.update()`.
 
 The `decipher.update()` method can be called multiple times with new data until
 [`decipher.final()`][] is called. Calling `decipher.update()` after
 
@@ -54,8 +54,6 @@ const {
   isArrayBufferView,
 } = require('internal/util/types');
 
-const assert = require('internal/assert');
-
 const LazyTransform = require('internal/streams/lazy_transform');
 
 const { normalizeEncoding } = require('internal/util');
@@ -98,7 +96,11 @@ function getDecoder(decoder, encoding) {
     if (normalizedEncoding === undefined) {
       throw new ERR_UNKNOWN_ENCODING(encoding);
     }
-    assert.fail('Cannot change encoding');
+    throw new ERR_INVALID_ARG_VALUE(
+      'outputEncoding',
+      encoding,
+      `cannot be changed from '${decoder.encoding}'`,
+    );
   }
   return decoder;
 }
 
@@ -12,13 +12,19 @@ const createCipher = () => {
   return createCipheriv('aes-256-cbc', randomBytes(32), randomBytes(16));
 };
 
+const encodingChangeError = {
+  code: 'ERR_INVALID_ARG_VALUE',
+  name: 'TypeError',
+  message: /cannot be changed from 'utf8'/,
+};
+
 {
   const cipher = createCipher();
   cipher.update('test', 'utf-8', 'utf-8');
 
   assert.throws(
     () => cipher.update('666f6f', 'hex', 'hex'),
-    { message: /Cannot change encoding/ }
+    encodingChangeError
   );
 }
 
@@ -28,7 +34,7 @@ const createCipher = () => {
 
   assert.throws(
     () => cipher.final('hex'),
-    { message: /Cannot change encoding/ }
+    encodingChangeError
   );
 }
Original file line number	Diff line number	Diff line change
@@ -54,8 +54,6 @@ const {
54	54	isArrayBufferView,
55	55	} = require('internal/util/types');
56	56
57		- const assert = require('internal/assert');
58		-
59	57	const LazyTransform = require('internal/streams/lazy_transform');
60	58
61	59	const { normalizeEncoding } = require('internal/util');
@@ -98,7 +96,11 @@ function getDecoder(decoder, encoding) {
98	96	if (normalizedEncoding === undefined) {
99	97	throw new ERR_UNKNOWN_ENCODING(encoding);
100	98	}
101		- assert.fail('Cannot change encoding');
	99	+ throw new ERR_INVALID_ARG_VALUE(
	100	+ 'outputEncoding',
	101	+ encoding,
	102	+ `cannot be changed from '${decoder.encoding}'`,
	103	+ );
102	104	}
103	105	return decoder;
104	106	}