summaryrefslogtreecommitdiff
path: root/lib/internal/crypto
diff options
context:
space:
mode:
authorTobias Nießen <tniessen@tnie.de>2019-03-05 18:35:50 +0100
committerTobias Nießen <tniessen@tnie.de>2019-03-09 12:00:23 +0100
commit3afa5d7ba8d7b25ff3acda303c20e41230342e18 (patch)
treec4d69aa25ff4f1cf608f5cb88dd0da055017a2f2 /lib/internal/crypto
parent1acf3b155f6345c6d3ad24f90cd49ec9d83424f5 (diff)
downloadandroid-node-v8-3afa5d7ba8d7b25ff3acda303c20e41230342e18.tar.gz
android-node-v8-3afa5d7ba8d7b25ff3acda303c20e41230342e18.tar.bz2
android-node-v8-3afa5d7ba8d7b25ff3acda303c20e41230342e18.zip
crypto: improve error handling in parseKeyEncoding
This change only affects KeyObject.export(). PR-URL: https://github.com/nodejs/node/pull/26455 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
Diffstat (limited to 'lib/internal/crypto')
-rw-r--r--lib/internal/crypto/keys.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/internal/crypto/keys.js b/lib/internal/crypto/keys.js
index 15a359be96..2f4dce8a3b 100644
--- a/lib/internal/crypto/keys.js
+++ b/lib/internal/crypto/keys.js
@@ -178,6 +178,9 @@ function isStringOrBuffer(val) {
}
function parseKeyEncoding(enc, keyType, isPublic, objName) {
+ if (enc === null || typeof enc !== 'object')
+ throw new ERR_INVALID_ARG_TYPE('options', 'object', enc);
+
const isInput = keyType === undefined;
const {