crypto: clean up parameter validation in HKDF

PR-URL: #42924 Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Zeyu Yang <himself65@outlook.com>
nodejs · May 10, 2022 · 183bcc0 · 183bcc0
1 parent 924670f
commit 183bcc0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/lib/internal/crypto/hkdf.js b/lib/internal/crypto/hkdf.js
@@ -53,13 +53,10 @@ const {
 } = require('internal/errors');
 
 const validateParameters = hideStackFrames((hash, key, salt, info, length) => {
-  key = prepareKey(key);
-  salt = toBuf(salt);
-  info = toBuf(info);
-
   validateString(hash, 'digest');
-  validateByteSource(salt, 'salt');
-  validateByteSource(info, 'info');
+  key = prepareKey(key);
+  salt = validateByteSource(salt, 'salt');
+  info = validateByteSource(info, 'info');
 
   validateInteger(length, 'length', 0, kMaxLength);
 

diff --git a/lib/internal/crypto/util.js b/lib/internal/crypto/util.js
@@ -271,7 +271,7 @@ const validateByteSource = hideStackFrames((val, name) => {
   val = toBuf(val);
 
   if (isAnyArrayBuffer(val) || isArrayBufferView(val))
-    return;
+    return val;
 
   throw new ERR_INVALID_ARG_TYPE(
     name,

diff --git a/test/parallel/test-crypto-hkdf.js b/test/parallel/test-crypto-hkdf.js
@@ -15,6 +15,11 @@ const {
 } = require('crypto');
 
 {
+  assert.throws(() => hkdf(), {
+    code: 'ERR_INVALID_ARG_TYPE',
+    message: /The "digest" argument must be of type string/
+  });
+
   [1, {}, [], false, Infinity].forEach((i) => {
     assert.throws(() => hkdf(i, 'a'), {
       code: 'ERR_INVALID_ARG_TYPE',