diff --git a/utils/build.ps1 b/utils/build.ps1
index 9bf5481adcf29..eac36e9a8abdf 100644
--- a/utils/build.ps1
+++ b/utils/build.ps1
@@ -2976,12 +2976,13 @@ function Build-Crypto([Hashtable] $Platform) {
     -Src $SourceCache\swift-crypto `
     -Bin (Get-ProjectBinaryCache $Platform Crypto) `
     -Platform $Platform `
-    -UseBuiltCompilers Swift `
+    -UseBuiltCompilers ASM, C, CXX, Swift `
     -SwiftSDK (Get-SwiftSDK Windows) `
     -BuildTargets default `
     -Defines @{
       BUILD_SHARED_LIBS = "NO";
       CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
+      SwiftASN1_DIR = (Get-ProjectCMakeModules $Platform ASN1);
     }
 }
 
@@ -3547,9 +3548,9 @@ if (-not $SkipBuild) {
   Invoke-BuildStep Build-LLBuild $HostPlatform
   Invoke-BuildStep Build-ArgumentParser $HostPlatform
   Invoke-BuildStep Build-Driver $HostPlatform
+  Invoke-BuildStep Build-ASN1 $HostPlatform
   Invoke-BuildStep Build-Crypto $HostPlatform
   Invoke-BuildStep Build-Collections $HostPlatform
-  Invoke-BuildStep Build-ASN1 $HostPlatform
   Invoke-BuildStep Build-Certificates $HostPlatform
   Invoke-BuildStep Build-System $HostPlatform
   Invoke-BuildStep Build-Build $HostPlatform
diff --git a/utils/update_checkout/update-checkout-config.json b/utils/update_checkout/update-checkout-config.json
index 7895b9d741f76..60effa4a9acad 100644
--- a/utils/update_checkout/update-checkout-config.json
+++ b/utils/update_checkout/update-checkout-config.json
@@ -140,7 +140,7 @@
                 "swift-argument-parser": "1.5.1",
                 "swift-atomics": "1.2.0",
                 "swift-collections": "1.1.5",
-                "swift-crypto": "3.12.3",
+                "swift-crypto": "3.12.5",
                 "swift-certificates": "1.10.1",
                 "swift-asn1": "1.3.2",
                 "swift-async-algorithms": "1.0.1",
@@ -457,7 +457,7 @@
                 "swift-argument-parser": "1.4.0",
                 "swift-atomics": "1.2.0",
                 "swift-collections": "1.1.5",
-                "swift-crypto": "3.12.3",
+                "swift-crypto": "3.12.5",
                 "swift-certificates": "1.10.1",
                 "swift-asn1": "1.3.2",
                 "swift-async-algorithms": "1.0.1",
@@ -515,7 +515,7 @@
                 "swift-async-algorithms": "1.0.1",
                 "swift-atomics": "1.2.0",
                 "swift-collections": "1.1.5",
-                "swift-crypto": "3.12.3",
+                "swift-crypto": "3.12.5",
                 "swift-certificates": "1.10.1",
                 "swift-asn1": "1.3.2",
                 "swift-driver": "main",