Replace CryptoAPI with Cryptography API: Next Generation (CNG)

dlang · Jan 25, 2025 · ad93bd7 · ad93bd7
1 parent 6a02863
commit ad93bd7
Showing 1 changed file with 26 additions and 29 deletions.
diff --git a/std/random.d b/std/random.d
@@ -1792,39 +1792,36 @@ version (linux)
 
 version (Windows)
 {
-    pragma(lib, "advapi32.lib"); // `std.registry` does so, too.
+    pragma(lib, "Bcrypt.lib");
 
-    private bool wincryptGenRandom(T)(out T result) @trusted
+    private bool bcryptGenRandom(T)(out T result) @trusted
     {
-        import core.sys.windows.windef : DWORD, PBYTE;
-        import core.sys.windows.wincrypt :
-            CryptAcquireContext,
-            CryptGenRandom,
-            CryptReleaseContext,
-            CRYPT_VERIFYCONTEXT,
-            HCRYPTPROV,
-            MS_STRONG_PROV,
-            PROV_RSA_FULL;
-
-        HCRYPTPROV wincryptHandle;
-
-        const gotHandle = CryptAcquireContext(
-            &wincryptHandle,
-            null,
+        import core.sys.windows.windef : PUCHAR, ULONG;
+        import core.sys.windows.ntdef : NTSTATUS, NT_SUCCESS;
+        import core.sys.windows.bcrypt :
+            BCryptCloseAlgorithmProvider,
+            BCryptGenRandom,
+            BCryptOpenAlgorithmProvider,
+            BCRYPT_ALG_HANDLE;
+
+        BCRYPT_ALG_HANDLE bcryptHandle;
+
+        const handleStatus = BCryptOpenAlgorithmProvider(
+            &bcryptHandle,
             MS_STRONG_PROV.ptr,
-            PROV_RSA_FULL,
-            CRYPT_VERIFYCONTEXT,
+            null,
+            0,
         );
-        if (!gotHandle)
+        if (!NT_SUCCESS(handleStatus))
             return false;
 
         scope (exit)
-            if (!CryptReleaseContext(wincryptHandle, 0)) { /* ignore */ }
+            if (!BCryptCloseAlgorithmProvider(bcryptHandle, 0)) { /* ignore */ }
 
-        const gotRandom = CryptGenRandom(
-            wincryptHandle,
-            DWORD(T.sizeof),
-            cast(PBYTE) &result,
+        const gotRandom = BCryptGenRandom(
+            bcryptHandle,
+            cast(PUCHAR) &result,
+            ULONG(T.sizeof),
         );
         if (!gotRandom)
             return false;
@@ -1894,12 +1891,12 @@ how excellent the source of entropy is.
     else version (Windows)
     {
         uint result;
-        if (!wincryptGenRandom!uint(result))
+        if (!bcryptGenRandom!uint(result))
         {
             version (none)
                 return fallbackSeed();
             else
-                assert(false, "CryptAcquireContext() or CryptGenRandom() failed.");
+                assert(false, "BCryptOpenAlgorithmProvider() or BCryptGenRandom() failed.");
         }
         return result;
     }
@@ -1973,12 +1970,12 @@ if (isUnsigned!UIntType)
             else version (Windows)
             {
                 UIntType result;
-                if (!wincryptGenRandom!UIntType(result))
+                if (!bcryptGenRandom!UIntType(result))
                 {
                     version (none)
                         return fallbackSeed();
                     else
-                        assert(false, "CryptAcquireContext() or CryptGenRandom() failed.");
+                        assert(false, "BCryptOpenAlgorithmProvider() or BCryptGenRandom() failed.");
                 }
                 return result;
             }