From a0e2c6d2843ea6e37035a949827cdcc7949026d6 Mon Sep 17 00:00:00 2001 From: Yaniv Friedensohn Date: Sat, 11 May 2019 20:00:38 +0300 Subject: src: add error codes to errors thrown in C++ PR-URL: https://github.com/nodejs/node/pull/27700 Reviewed-By: James M Snell Reviewed-By: Joyee Cheung Reviewed-By: Matteo Collina Reviewed-By: Rich Trott --- lib/internal/crypto/cipher.js | 4 +++- lib/internal/crypto/hash.js | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'lib/internal/crypto') diff --git a/lib/internal/crypto/cipher.js b/lib/internal/crypto/cipher.js index 34507dd157..20ca1454c8 100644 --- a/lib/internal/crypto/cipher.js +++ b/lib/internal/crypto/cipher.js @@ -12,7 +12,7 @@ const { ERR_INVALID_ARG_TYPE, ERR_INVALID_OPT_VALUE } = require('internal/errors').codes; -const { validateString } = require('internal/validators'); +const { validateEncoding, validateString } = require('internal/validators'); const { preparePrivateKey, @@ -161,6 +161,8 @@ Cipher.prototype.update = function update(data, inputEncoding, outputEncoding) { throw invalidArrayBufferView('data', data); } + validateEncoding(data, inputEncoding); + const ret = this[kHandle].update(data, inputEncoding); if (outputEncoding && outputEncoding !== 'buffer') { diff --git a/lib/internal/crypto/hash.js b/lib/internal/crypto/hash.js index 38b125e5f2..7e4a83ca93 100644 --- a/lib/internal/crypto/hash.js +++ b/lib/internal/crypto/hash.js @@ -25,7 +25,8 @@ const { ERR_CRYPTO_HASH_UPDATE_FAILED, ERR_INVALID_ARG_TYPE } = require('internal/errors').codes; -const { validateString, validateUint32 } = require('internal/validators'); +const { validateEncoding, validateString, validateUint32 } = + require('internal/validators'); const { normalizeEncoding } = require('internal/util'); const { isArrayBufferView } = require('internal/util/types'); const LazyTransform = require('internal/streams/lazy_transform'); @@ -61,6 +62,8 @@ Hash.prototype._flush = function _flush(callback) { }; Hash.prototype.update = function update(data, encoding) { + encoding = encoding || getDefaultEncoding(); + const state = this[kState]; if (state[kFinalized]) throw new ERR_CRYPTO_HASH_FINALIZED(); @@ -74,7 +77,9 @@ Hash.prototype.update = function update(data, encoding) { data); } - if (!this[kHandle].update(data, encoding || getDefaultEncoding())) + validateEncoding(data, encoding); + + if (!this[kHandle].update(data, encoding)) throw new ERR_CRYPTO_HASH_UPDATE_FAILED(); return this; }; -- cgit v1.2.3