From 181d08250c8567b64488b9b41f295e85e87b62a2 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Tue, 21 Dec 2021 10:38:26 -0800
Subject: [PATCH 1/3] crypto: alias webcrypto.subtle and
 webcrypto.getRandomValues on crypto

The aliases allow code written to assume that `crypto.subtle` and
`crypto.getRandomValues()` exist on the `crypto` global to just work.

Signed-off-by: James M Snell <jasnell@gmail.com>
---
 doc/api/crypto.md | 22 ++++++++++++++++++++++
 lib/crypto.js     | 23 +++++++++++++++++++++--
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/doc/api/crypto.md b/doc/api/crypto.md
index 593e469952ad89..89e17dd44ed771 100644
--- a/doc/api/crypto.md
+++ b/doc/api/crypto.md
@@ -4015,6 +4015,17 @@ 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`.
+
+A convenient alias for [`crypto.webcrypto.getRandomValues()`][].
+
 ### `crypto.hkdf(digest, ikm, salt, info, keylen, callback)`
 
 <!-- YAML
@@ -5194,6 +5205,16 @@ additional properties can be passed:
 
 If the `callback` function is provided this function uses libuv's threadpool.
 
+### `crypto.subtle`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+* Type: {SubtleCrypto}
+
+A convenient alias for `crypto.webcrypto.subtle`.
+
 ### `crypto.timingSafeEqual(a, b)`
 
 <!-- YAML
@@ -5908,6 +5929,7 @@ See the [list of SSL OP Flags][] for details.
 [`crypto.randomBytes()`]: #cryptorandombytessize-callback
 [`crypto.randomFill()`]: #cryptorandomfillbuffer-offset-size-callback
 [`crypto.scrypt()`]: #cryptoscryptpassword-salt-keylen-options-callback
+[`crypto.webcrypto.getRandomValues()`]: webcrypto.md#cryptogetrandomvaluestypedarray
 [`decipher.final()`]: #decipherfinaloutputencoding
 [`decipher.update()`]: #decipherupdatedata-inputencoding-outputencoding
 [`diffieHellman.setPublicKey()`]: #diffiehellmansetpublickeypublickey-encoding
diff --git a/lib/crypto.js b/lib/crypto.js
index 6e050068b2093d..eab3397d5252a6 100644
--- a/lib/crypto.js
+++ b/lib/crypto.js
@@ -119,11 +119,18 @@ const {
   getHashes,
   setDefaultEncoding,
   setEngine,
-  lazyRequire,
   secureHeapUsed,
 } = require('internal/crypto/util');
 const Certificate = require('internal/crypto/certificate');
 
+let webcrypto;
+function lazyWebCrypto() {
+  if (webcrypto === undefined) {
+    webcrypto = require('internal/crypto/webcrypto');
+  }
+  return webcrypto;
+}
+
 // These helper functions are needed because the constructors can
 // use new, in which case V8 cannot inline the recursive constructor call
 function createHash(algorithm, options) {
@@ -284,7 +291,19 @@ ObjectDefineProperties(module.exports, {
   webcrypto: {
     configurable: false,
     enumerable: true,
-    get() { return lazyRequire('internal/crypto/webcrypto').crypto; }
+    get() { return lazyWebCrypto().crypto; }
+  },
+
+  subtle: {
+    configurable: false,
+    enumerable: true,
+    get() { return lazyWebCrypto().crypto.subtle; }
+  },
+
+  getRandomValues: {
+    configurable: false,
+    enumerable: true,
+    get() { return lazyWebCrypto().crypto.getRandomValues; }
   },
 
   // Aliases for randomBytes are deprecated.

From 195d391c1ff746e2d048b3d49e742abdab2998d5 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Tue, 21 Dec 2021 15:06:52 -0800
Subject: [PATCH 2/3] [Squash] nits

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
 lib/crypto.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/crypto.js b/lib/crypto.js
index eab3397d5252a6..ac601a7664697d 100644
--- a/lib/crypto.js
+++ b/lib/crypto.js
@@ -125,9 +125,7 @@ const Certificate = require('internal/crypto/certificate');
 
 let webcrypto;
 function lazyWebCrypto() {
-  if (webcrypto === undefined) {
-    webcrypto = require('internal/crypto/webcrypto');
-  }
+  webcrypto ??= require('internal/crypto/webcrypto');
   return webcrypto;
 }
 
@@ -291,19 +289,22 @@ ObjectDefineProperties(module.exports, {
   webcrypto: {
     configurable: false,
     enumerable: true,
-    get() { return lazyWebCrypto().crypto; }
+    get() { return lazyWebCrypto().crypto; },
+    set: undefined,
   },
 
   subtle: {
     configurable: false,
     enumerable: true,
-    get() { return lazyWebCrypto().crypto.subtle; }
+    get() { return lazyWebCrypto().crypto.subtle; },
+    set: undefined,
   },
 
   getRandomValues: {
     configurable: false,
     enumerable: true,
-    get() { return lazyWebCrypto().crypto.getRandomValues; }
+    get() { return lazyWebCrypto().crypto.getRandomValues; },
+    set: undefined,
   },
 
   // Aliases for randomBytes are deprecated.

From 1eebe394e4a7bca3a91f67af3dd237648ca54d28 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Wed, 22 Dec 2021 17:14:59 -0800
Subject: [PATCH 3/3] [Squash] nit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michaël Zasso <targos@protonmail.com>
---
 doc/api/crypto.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/api/crypto.md b/doc/api/crypto.md
index 89e17dd44ed771..90c3eee2419d3f 100644
--- a/doc/api/crypto.md
+++ b/doc/api/crypto.md
@@ -5213,7 +5213,7 @@ added: REPLACEME
 
 * Type: {SubtleCrypto}
 
-A convenient alias for `crypto.webcrypto.subtle`.
+A convenient alias for [`crypto.webcrypto.subtle`][].
 
 ### `crypto.timingSafeEqual(a, b)`
 
@@ -5930,6 +5930,7 @@ See the [list of SSL OP Flags][] for details.
 [`crypto.randomFill()`]: #cryptorandomfillbuffer-offset-size-callback
 [`crypto.scrypt()`]: #cryptoscryptpassword-salt-keylen-options-callback
 [`crypto.webcrypto.getRandomValues()`]: webcrypto.md#cryptogetrandomvaluestypedarray
+[`crypto.webcrypto.subtle`]: webcrypto.md#class-subtlecrypto
 [`decipher.final()`]: #decipherfinaloutputencoding
 [`decipher.update()`]: #decipherupdatedata-inputencoding-outputencoding
 [`diffieHellman.setPublicKey()`]: #diffiehellmansetpublickeypublickey-encoding