From 54f327b4dcb37f373bc4146686c7e4edcd9c524d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= <tniessen@tnie.de>
Date: Sun, 8 Sep 2019 04:41:04 +0200
Subject: [PATCH] crypto: add oaepLabel option

The label acts as the "L" input to the RSA-OAEP algorithm.

PR-URL: https://github.com/nodejs/node/pull/29489
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Minwoo Jung <minwoo@nodesource.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/crypto.md                      | 10 ++++
 lib/internal/crypto/cipher.js          | 10 +++-
 src/node_crypto.cc                     | 20 ++++++++
 src/node_crypto.h                      |  2 +
 test/fixtures/rsa-oaep-test-vectors.js | 30 ++++++++++++
 test/parallel/test-crypto-rsa-dsa.js   | 65 ++++++++------------------
 6 files changed, 89 insertions(+), 48 deletions(-)
 create mode 100644 test/fixtures/rsa-oaep-test-vectors.js

diff --git a/doc/api/crypto.md b/doc/api/crypto.md
index 137d6e0508a33e..ca2e02d190bb80 100644
--- a/doc/api/crypto.md
+++ b/doc/api/crypto.md
@@ -2383,6 +2383,9 @@ An array of supported digest functions can be retrieved using
 <!-- YAML
 added: v0.11.14
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/29489
+    description: The `oaepLabel` option was added.
   - version: v12.9.0
     pr-url: https://github.com/nodejs/node/pull/28335
     description: The `oaepHash` option was added.
@@ -2394,6 +2397,8 @@ changes:
 * `privateKey` {Object | string | Buffer | KeyObject}
   - `oaepHash` {string} The hash function to use for OAEP padding.
     **Default:** `'sha1'`
+  - `oaepLabel` {Buffer | TypedArray | DataView} The label to use for OAEP
+    padding. If not specified, no label is used.
   - `padding` {crypto.constants} An optional padding value defined in
     `crypto.constants`, which may be: `crypto.constants.RSA_NO_PADDING`,
     `crypto.constants.RSA_PKCS1_PADDING`, or
@@ -2467,6 +2472,9 @@ be passed instead of a public key.
 <!-- YAML
 added: v0.11.14
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/29489
+    description: The `oaepLabel` option was added.
   - version: v12.9.0
     pr-url: https://github.com/nodejs/node/pull/28335
     description: The `oaepHash` option was added.
@@ -2477,6 +2485,8 @@ changes:
 
 * `key` {Object | string | Buffer | KeyObject}
   - `key` {string | Buffer | KeyObject} A PEM encoded public or private key.
+  - `oaepLabel` {Buffer | TypedArray | DataView} The label to use for OAEP
+    padding. If not specified, no label is used.
   - `oaepHash` {string} The hash function to use for OAEP padding.
     **Default:** `'sha1'`
   - `passphrase` {string | Buffer} An optional passphrase for the private key.
diff --git a/lib/internal/crypto/cipher.js b/lib/internal/crypto/cipher.js
index 34507dd157b378..fd34b7df7ec9f5 100644
--- a/lib/internal/crypto/cipher.js
+++ b/lib/internal/crypto/cipher.js
@@ -50,10 +50,16 @@ function rsaFunctionFor(method, defaultPadding, keyType) {
         preparePrivateKey(options) :
         preparePublicOrPrivateKey(options);
     const padding = options.padding || defaultPadding;
-    const { oaepHash } = options;
+    const { oaepHash, oaepLabel } = options;
     if (oaepHash !== undefined && typeof oaepHash !== 'string')
       throw new ERR_INVALID_ARG_TYPE('options.oaepHash', 'string', oaepHash);
-    return method(data, format, type, passphrase, buffer, padding, oaepHash);
+    if (oaepLabel !== undefined && !isArrayBufferView(oaepLabel)) {
+      throw new ERR_INVALID_ARG_TYPE('options.oaepLabel',
+                                     ['Buffer', 'TypedArray', 'DataView'],
+                                     oaepLabel);
+    }
+    return method(data, format, type, passphrase, buffer, padding, oaepHash,
+                  oaepLabel);
   };
 }
 
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 5a3bd09d512b6a..8084d935efa8e2 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -5201,6 +5201,8 @@ bool PublicKeyCipher::Cipher(Environment* env,
                              const ManagedEVPPKey& pkey,
                              int padding,
                              const EVP_MD* digest,
+                             const void* oaep_label,
+                             size_t oaep_label_len,
                              const unsigned char* data,
                              int len,
                              AllocatedBuffer* out) {
@@ -5217,6 +5219,16 @@ bool PublicKeyCipher::Cipher(Environment* env,
       return false;
   }
 
+  if (oaep_label_len != 0) {
+    // OpenSSL takes ownership of the label, so we need to create a copy.
+    void* label = OPENSSL_memdup(oaep_label, oaep_label_len);
+    CHECK_NOT_NULL(label);
+    if (!EVP_PKEY_CTX_set0_rsa_oaep_label(ctx.get(), label, oaep_label_len)) {
+      OPENSSL_free(label);
+      return false;
+    }
+  }
+
   size_t out_len = 0;
   if (EVP_PKEY_cipher(ctx.get(), nullptr, &out_len, data, len) <= 0)
     return false;
@@ -5262,6 +5274,12 @@ void PublicKeyCipher::Cipher(const FunctionCallbackInfo<Value>& args) {
       return THROW_ERR_OSSL_EVP_INVALID_DIGEST(env);
   }
 
+  ArrayBufferViewContents<unsigned char> oaep_label;
+  if (!args[offset + 3]->IsUndefined()) {
+    CHECK(args[offset + 3]->IsArrayBufferView());
+    oaep_label.Read(args[offset + 3].As<ArrayBufferView>());
+  }
+
   AllocatedBuffer out;
 
   ClearErrorOnReturn clear_error_on_return;
@@ -5271,6 +5289,8 @@ void PublicKeyCipher::Cipher(const FunctionCallbackInfo<Value>& args) {
       pkey,
       padding,
       digest,
+      oaep_label.data(),
+      oaep_label.length(),
       buf.data(),
       buf.length(),
       &out);
diff --git a/src/node_crypto.h b/src/node_crypto.h
index 99e6c481177c19..e335491612d8d3 100644
--- a/src/node_crypto.h
+++ b/src/node_crypto.h
@@ -714,6 +714,8 @@ class PublicKeyCipher {
                      const ManagedEVPPKey& pkey,
                      int padding,
                      const EVP_MD* digest,
+                     const void* oaep_label,
+                     size_t oaep_label_size,
                      const unsigned char* data,
                      int len,
                      AllocatedBuffer* out);
diff --git a/test/fixtures/rsa-oaep-test-vectors.js b/test/fixtures/rsa-oaep-test-vectors.js
new file mode 100644
index 00000000000000..47e681f84d1908
--- /dev/null
+++ b/test/fixtures/rsa-oaep-test-vectors.js
@@ -0,0 +1,30 @@
+{
+  "comment": "RSA-OAEP test vectors for test-crypto-rsa-dsa.js",
+  "decryptionTests": [
+    {
+      "ct": "16ece59cf985a8cf1a3434e4b9707c922c20638fdf9abf7e5dc7943f4136899348c54116d15b2c17563b9c7143f9d5b85b45615ad0598ea6d21c900f3957b65400612306a9bebae441f005646f7a7c97129a103ab54e777168ef966514adb17786b968ea0ff430a524904c4a11c683764b7c8dbb60df0952768381cdba4d665e5006034393a10d56d33e75b2714db824a18da46441ef7f94a34a7058c0bbad0394083a038558bcc6dd370f8e518e1bd8d73b296fc51d77da44799e4ee774926ded7910e8768f92db76f63107338d33354b735d3ad094240dbd7ffdfda27ef0255306dcf4a6462849492abd1a97fdd37743ff87c4d2ec89866c5cdbb696bd2b30"
+    },
+    {
+      "ct": "16ece59cf985a8cf1a3434e4b9707c922c20638fdf9abf7e5dc7943f4136899348c54116d15b2c17563b9c7143f9d5b85b45615ad0598ea6d21c900f3957b65400612306a9bebae441f005646f7a7c97129a103ab54e777168ef966514adb17786b968ea0ff430a524904c4a11c683764b7c8dbb60df0952768381cdba4d665e5006034393a10d56d33e75b2714db824a18da46441ef7f94a34a7058c0bbad0394083a038558bcc6dd370f8e518e1bd8d73b296fc51d77da44799e4ee774926ded7910e8768f92db76f63107338d33354b735d3ad094240dbd7ffdfda27ef0255306dcf4a6462849492abd1a97fdd37743ff87c4d2ec89866c5cdbb696bd2b30",
+      "oaepHash": "sha1"
+    },
+    {
+      "ct": "16ccf09afe5eb0130182b9fc1ca4af61a38e772047cac42146bfa0fa5879aa9639203e4d01442d212ff95bddfbe4661222215a2e91908c37ab926edea7cfc53f83357bc27f86af0f5f2818ae141f4e9e934d4e66189aff30f062c9c3f6eb9bc495a59082cb978f99b56ce5fa530a8469e46129258e5c42897cb194b6805e936e5cbbeaa535bad6b1d3cdfc92119b7dd325a2e6d2979e316bdacc9f80e29c7bbdf6846d738e380deadcb48df8c1e8aabf7a9dd2f8c71d6681dbec7dcadc01887c51288674268796bc77fdf8f1c94c9ca50b1cc7cddbaf4e56cb151d23e2c699d2844c0104ee2e7e9dcdb907cfab43339120a40c59ca54f32b8d21b48a29656c77",
+      "oaepHash": "sha256"
+    },
+    {
+      "ct": "831b72e8dd91841729ecbddf2647d6f19dc0094734f8803d8c651b5655a12ae6156b74d9b594bcc0eacd002728380b94f46e8657f130f354e03b6e7815ee257eda78dba296d67d24410c31c48e5875cc79e4bde594b412be5f357f57a7ac1f1d18b718e408df162d1795508e6a0616192b647ad942ea068a44fb2b323d35a3a61b926feb105d6c0b2a8fc8050222d1cf4a9e44da1f95bbc677fd643749c6c89ac551d072f04cd9320c97a8d94755c8a804954c082bed7fa59199a00aca154c14a7b584b63c538daf9b9c7c90abfca19387d2131f9d9b9ecfc8672249c33144d1be3bfc41558a13f994663661a3af24fd0a97619d508db36f5fc131af86fc68cf",
+      "oaepHash": "sha512"
+    },
+    {
+      "ct": "04a25a3dbe0a44b10b7dde19632ce0963e7a7e9876905cd4a4f68ba8e0bda593a738847235df4494f9c28927b165511d22006ef6fae0eb7fe01883e4ae495643328d21e13dad65e71e45f885c7e1e2fe77c39fa84b8bbd2d7d3ed72fea2bf3c87a5c864bdc41b45caa3d668ca3f35297f43dc97950fa959ee88031c8385da7628d03923dfd26a7e0568c95a2f38ec5760335b00fa30935abdd9ab5b3581fc319ff787c59930319707caa24fe9e5d0ce6c48eff4ee6e124fd6c595353acc29a194863dbf7b74d08edf7129ca52eb5f4ccf3888311e97602fcd37b476c41749b260efad4e0760064082f7c9ea0f8704134936b2e38fd0f82886486b5f7e5fb9696",
+      "oaepHash": "sha384",
+      "oaepLabel": "01020304"
+    },
+    {
+      "ct": "678f9ff724e0f48b48e6ff3cbdac5eb995d263da1c23f948d8d09411131f69f40da07f0c650e1aedc82fbaf0972a5d3b3e8f1f82cc4fa1780abfebb4e06b6827a52bf768b12388817c1e3ee1324342e05135733a4056a6cc02f5211172c338eb96e5e33c1d6f53560e3f3aab2419c13a600c4e67648088ffe8aac2cea8bce78e2ab899741cf7c9a9d5246cde6ce97aae0157f42db68eea380dec6dcd842c1e6900ae21d5275c4bf21810b5e1b0e1bc0441cbce34e00a31b9e857f6f2c791257d45997c278ea928f42e8cb6476f633f5de102fa0c4af964a9c4f4336869509e933ebc0aa94ad16b0b1db2aaa924f409a5f9f29dfbd88849c5eaa4818e1c3e335e",
+      "oaepHash": "sha1",
+      "oaepLabel": "00112233445566778899"
+    }
+  ]
+}
diff --git a/test/parallel/test-crypto-rsa-dsa.js b/test/parallel/test-crypto-rsa-dsa.js
index c773aae829481e..30ef7ec6d185ed 100644
--- a/test/parallel/test-crypto-rsa-dsa.js
+++ b/test/parallel/test-crypto-rsa-dsa.js
@@ -202,59 +202,21 @@ common.expectsError(() => {
 // The following RSA-OAEP test cases were created using the WebCrypto API to
 // ensure compatibility when using non-SHA1 hash functions.
 {
-  function testDecrypt(oaepHash, ciphertext) {
+  const { decryptionTests } =
+      JSON.parse(fixtures.readSync('rsa-oaep-test-vectors.js', 'utf8'));
+
+  for (const { ct, oaepHash, oaepLabel } of decryptionTests) {
     const decrypted = crypto.privateDecrypt({
       key: rsaPkcs8KeyPem,
-      oaepHash
-    }, Buffer.from(ciphertext, 'hex'));
+      oaepHash,
+      oaepLabel: oaepLabel ? Buffer.from(oaepLabel, 'hex') : undefined
+    }, Buffer.from(ct, 'hex'));
 
     assert.strictEqual(decrypted.toString('utf8'), 'Hello Node.js');
   }
-
-  testDecrypt(undefined, '16ece59cf985a8cf1a3434e4b9707c922c20638fdf9abf7e5dc' +
-                         '7943f4136899348c54116d15b2c17563b9c7143f9d5b85b4561' +
-                         '5ad0598ea6d21c900f3957b65400612306a9bebae441f005646' +
-                         'f7a7c97129a103ab54e777168ef966514adb17786b968ea0ff4' +
-                         '30a524904c4a11c683764b7c8dbb60df0952768381cdba4d665' +
-                         'e5006034393a10d56d33e75b2714db824a18da46441ef7f94a3' +
-                         '4a7058c0bbad0394083a038558bcc6dd370f8e518e1bd8d73b2' +
-                         '96fc51d77da44799e4ee774926ded7910e8768f92db76f63107' +
-                         '338d33354b735d3ad094240dbd7ffdfda27ef0255306dcf4a64' +
-                         '62849492abd1a97fdd37743ff87c4d2ec89866c5cdbb696bd2b' +
-                         '30');
-  testDecrypt('sha1', '16ece59cf985a8cf1a3434e4b9707c922c20638fdf9abf7e5dc794' +
-                      '3f4136899348c54116d15b2c17563b9c7143f9d5b85b45615ad059' +
-                      '8ea6d21c900f3957b65400612306a9bebae441f005646f7a7c9712' +
-                      '9a103ab54e777168ef966514adb17786b968ea0ff430a524904c4a' +
-                      '11c683764b7c8dbb60df0952768381cdba4d665e5006034393a10d' +
-                      '56d33e75b2714db824a18da46441ef7f94a34a7058c0bbad039408' +
-                      '3a038558bcc6dd370f8e518e1bd8d73b296fc51d77da44799e4ee7' +
-                      '74926ded7910e8768f92db76f63107338d33354b735d3ad094240d' +
-                      'bd7ffdfda27ef0255306dcf4a6462849492abd1a97fdd37743ff87' +
-                      'c4d2ec89866c5cdbb696bd2b30');
-  testDecrypt('sha256', '16ccf09afe5eb0130182b9fc1ca4af61a38e772047cac42146bf' +
-                        'a0fa5879aa9639203e4d01442d212ff95bddfbe4661222215a2e' +
-                        '91908c37ab926edea7cfc53f83357bc27f86af0f5f2818ae141f' +
-                        '4e9e934d4e66189aff30f062c9c3f6eb9bc495a59082cb978f99' +
-                        'b56ce5fa530a8469e46129258e5c42897cb194b6805e936e5cbb' +
-                        'eaa535bad6b1d3cdfc92119b7dd325a2e6d2979e316bdacc9f80' +
-                        'e29c7bbdf6846d738e380deadcb48df8c1e8aabf7a9dd2f8c71d' +
-                        '6681dbec7dcadc01887c51288674268796bc77fdf8f1c94c9ca5' +
-                        '0b1cc7cddbaf4e56cb151d23e2c699d2844c0104ee2e7e9dcdb9' +
-                        '07cfab43339120a40c59ca54f32b8d21b48a29656c77');
-  testDecrypt('sha512', '831b72e8dd91841729ecbddf2647d6f19dc0094734f8803d8c65' +
-                        '1b5655a12ae6156b74d9b594bcc0eacd002728380b94f46e8657' +
-                        'f130f354e03b6e7815ee257eda78dba296d67d24410c31c48e58' +
-                        '75cc79e4bde594b412be5f357f57a7ac1f1d18b718e408df162d' +
-                        '1795508e6a0616192b647ad942ea068a44fb2b323d35a3a61b92' +
-                        '6feb105d6c0b2a8fc8050222d1cf4a9e44da1f95bbc677fd6437' +
-                        '49c6c89ac551d072f04cd9320c97a8d94755c8a804954c082bed' +
-                        '7fa59199a00aca154c14a7b584b63c538daf9b9c7c90abfca193' +
-                        '87d2131f9d9b9ecfc8672249c33144d1be3bfc41558a13f99466' +
-                        '3661a3af24fd0a97619d508db36f5fc131af86fc68cf');
 }
 
-// Test invalid oaepHash options.
+// Test invalid oaepHash and oaepLabel options.
 for (const fn of [crypto.publicEncrypt, crypto.privateDecrypt]) {
   assert.throws(() => {
     fn({
@@ -275,6 +237,17 @@ for (const fn of [crypto.publicEncrypt, crypto.privateDecrypt]) {
       code: 'ERR_INVALID_ARG_TYPE'
     });
   }
+
+  for (const oaepLabel of [0, false, null, Symbol(), () => {}, {}, 'foo']) {
+    common.expectsError(() => {
+      fn({
+        key: rsaPubPem,
+        oaepLabel
+      }, Buffer.alloc(10));
+    }, {
+      code: 'ERR_INVALID_ARG_TYPE'
+    });
+  }
 }
 
 // Test RSA key signing/verification