From 05c9362b14d31ca65995fa8104518f989ff6406e Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Mon, 29 Mar 2021 13:16:00 -0700
Subject: [PATCH 1/2] crypto: expose subtle and getRandomValues from crypto

In the browser, the `crypto` global exposes `subtle` and
`getRandomValues` as properties. In the Node.js impl, those
require an additional indirection via `crypto.webcrypto.*`.
This commit exposes aliases to promote cross-environment
isomorphism.

Note: In the browser, the `CryptoKey` object is also exposed
as a global. I decided not to do that here because it requires
a larger change to the internal `node_crypto` binding because
of the need to register external references. That can be done
in a separate PR but it's a much lower priority.

Signed-off-by: James M Snell <jasnell@gmail.com>
---
 doc/api/crypto.md               | 21 +++++++++++++++++++++
 lib/crypto.js                   | 12 ++++++++++++
 test/parallel/test-webcrypto.js | 16 ++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 test/parallel/test-webcrypto.js

diff --git a/doc/api/crypto.md b/doc/api/crypto.md
index 0918d599c287fc..03564234aefbc5 100644
--- a/doc/api/crypto.md
+++ b/doc/api/crypto.md
@@ -3836,6 +3836,18 @@ const {
 console.log(getHashes()); // ['DSA', 'DSA-SHA', 'DSA-SHA1', ...]
 ```
 
+### `crypto.getRandomValues(typedArray)`
+<!-- YAML
+added: REPLACEME
+-->
+
+* `typedArray` {Buffer|TypedArray|DataView|ArrayBuffer}
+* Returns: {Buffer|TypedArray|DataView|ArrayBuffer} Returns `typedArray`.
+
+Alias for `crypto.webcrypto.getRandomValues(typedArray)`
+
+See [`webcrypto.getRandomValues()`][] for details.
+
 ### `crypto.hkdf(digest, key, salt, info, keylen, callback)`
 <!-- YAML
 added: v15.0.0
@@ -5002,6 +5014,13 @@ additional properties can be passed:
 
 If the `callback` function is provided this function uses libuv's threadpool.
 
+### `crypto.subtle`
+<!-- YAML
+added: REPLACEME
+-->
+
+Alias for [`webcrypto.subtle`][].
+
 ### `crypto.timingSafeEqual(a, b)`
 <!-- YAML
 added: v6.6.0
@@ -5724,6 +5743,8 @@ See the [list of SSL OP Flags][] for details.
 [`util.promisify()`]: util.md#util_util_promisify_original
 [`verify.update()`]: #crypto_verify_update_data_inputencoding
 [`verify.verify()`]: #crypto_verify_verify_object_signature_signatureencoding
+[`webcrypto.getRandomValues()`]: webcrypto.md#webcrypto_crypto_getrandomvalues_typedarray
+[`webcrypto.subtle`]: webcrypto.md#webcrypto_crypto_subtle
 [certificate object]: tls.md#tls_certificate_object
 [encoding]: buffer.md#buffer_buffers_and_character_encodings
 [initialization vector]: https://en.wikipedia.org/wiki/Initialization_vector
diff --git a/lib/crypto.js b/lib/crypto.js
index e2355b0f5d53f6..c05880fe59baaf 100644
--- a/lib/crypto.js
+++ b/lib/crypto.js
@@ -287,6 +287,18 @@ ObjectDefineProperties(module.exports, {
     get() { return lazyRequire('internal/crypto/webcrypto'); }
   },
 
+  subtle: {
+    configurable: true,
+    enumerable: false,
+    get() { return this.webcrypto.subtle; },
+  },
+
+  getRandomValues: {
+    configurable: true,
+    enumerable: false,
+    get() { return this.webcrypto.getRandomValues; },
+  },
+
   // Aliases for randomBytes are deprecated.
   // The ecosystem needs those to exist for backwards compatibility.
   prng: {
diff --git a/test/parallel/test-webcrypto.js b/test/parallel/test-webcrypto.js
new file mode 100644
index 00000000000000..3ec0f1cc7d6328
--- /dev/null
+++ b/test/parallel/test-webcrypto.js
@@ -0,0 +1,16 @@
+'use strict';
+
+const common = require('../common');
+
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+const { strictEqual } = require('assert');
+const {
+  webcrypto,
+  subtle,
+  getRandomValues,
+} = require('crypto');
+
+strictEqual(subtle, webcrypto.subtle);
+strictEqual(getRandomValues, webcrypto.getRandomValues);

From fce125d15500eca430e57bd8656a4e05b30b8eb8 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Mon, 29 Mar 2021 13:18:40 -0700
Subject: [PATCH 2/2] crypto: graduate webcrypto to stable

Signed-off-by: James M Snell <jasnell@gmail.com>
---
 doc/api/webcrypto.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/webcrypto.md b/doc/api/webcrypto.md
index 43327f58e5b6ae..b97a521531a240 100644
--- a/doc/api/webcrypto.md
+++ b/doc/api/webcrypto.md
@@ -2,7 +2,7 @@
 
 <!-- introduced_in=v15.0.0 -->
 
-> Stability: 1 - Experimental
+> Stability: 2 - Stable
 
 Node.js provides an implementation of the standard [Web Crypto API][].