Skip to content

Commit

Permalink
Merge pull request #1103 from microsoft/dev/auto-sync/microsoft/relea…
Browse files Browse the repository at this point in the history
…se-branch.go1.21

Update submodule to latest `release-branch.go1.21` in `microsoft/release-branch.go1.21`
  • Loading branch information
dagood authored Jan 11, 2024
2 parents a278c56 + ae14277 commit 5b6ff83
Show file tree
Hide file tree
Showing 7 changed files with 1,302 additions and 421 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
go1.21.5
go1.21.6
2 changes: 1 addition & 1 deletion go
Submodule go updated 41 files
+2 −2 VERSION
+13 −0 doc/godebug.md
+9 −1 src/cmd/compile/internal/escape/call.go
+6 −6 src/cmd/compile/internal/ssa/memcombine.go
+126 −0 src/cmd/compile/internal/test/memcombine_test.go
+17 −11 src/crypto/internal/boring/Dockerfile
+1 −1 src/crypto/internal/boring/LICENSE
+4 −3 src/crypto/internal/boring/README.md
+22 −7 src/crypto/internal/boring/aes.go
+1 −1 src/crypto/internal/boring/build-goboring.sh
+6 −0 src/crypto/internal/boring/build.sh
+2 −0 src/crypto/internal/boring/goboringcrypto.h
+1 −0 src/crypto/internal/boring/notboring.go
+ src/crypto/internal/boring/syso/goboringcrypto_linux_amd64.syso
+ src/crypto/internal/boring/syso/goboringcrypto_linux_arm64.syso
+15 −11 src/crypto/tls/boring.go
+51 −18 src/crypto/tls/boring_test.go
+7 −1 src/crypto/tls/cipher_suites.go
+3 −1 src/crypto/tls/handshake_client.go
+0 −4 src/crypto/tls/handshake_client_tls13.go
+19 −9 src/crypto/tls/handshake_server_test.go
+3 −4 src/crypto/tls/handshake_server_tls13.go
+2 −0 src/crypto/tls/notboring.go
+2 −2 src/crypto/x509/boring.go
+31 −0 src/internal/godebug/godebug_test.go
+58 −0 src/maps/maps_test.go
+99 −83 src/os/signal/signal_test.go
+2 −0 src/runtime/export_test.go
+7 −0 src/runtime/extern.go
+5 −0 src/runtime/gc_test.go
+18 −4 src/runtime/map.go
+8 −0 src/runtime/mem_linux.go
+64 −50 src/runtime/mstats.go
+4 −3 src/runtime/pprof/proto.go
+62 −0 src/runtime/pprof/protomem_test.go
+9 −4 src/runtime/runtime.go
+2 −0 src/runtime/runtime1.go
+37 −0 test/codegen/memcombine.go
+7 −0 test/escape_calls.go
+15 −0 test/fixedbugs/issue64565.go
+3 −0 test/fixedbugs/issue64565.out
23 changes: 12 additions & 11 deletions patches/0002-Add-crypto-backend-foundation.patch
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Subject: [PATCH] Add crypto backend foundation
src/crypto/internal/backend/bbig/big.go | 17 +++
src/crypto/internal/backend/common.go | 78 +++++++++++++
src/crypto/internal/backend/isrequirefips.go | 9 ++
src/crypto/internal/backend/nobackend.go | 116 +++++++++++++++++++
src/crypto/internal/backend/nobackend.go | 117 +++++++++++++++++++
src/crypto/internal/backend/norequirefips.go | 9 ++
src/crypto/internal/backend/stub.s | 10 ++
src/crypto/rand/rand_unix.go | 2 +-
Expand All @@ -38,7 +38,7 @@ Subject: [PATCH] Add crypto backend foundation
src/crypto/tls/cipher_suites.go | 2 +-
src/go/build/deps_test.go | 2 +
src/runtime/runtime_boring.go | 5 +
34 files changed, 305 insertions(+), 29 deletions(-)
34 files changed, 306 insertions(+), 29 deletions(-)
create mode 100644 src/crypto/internal/backend/backend_test.go
create mode 100644 src/crypto/internal/backend/bbig/big.go
create mode 100644 src/crypto/internal/backend/common.go
Expand Down Expand Up @@ -87,7 +87,7 @@ index 097c37e343fdb8..1cf43edba40359 100644
// Enabled reports whether BoringCrypto handles supported crypto operations.
func Enabled() bool {
diff --git a/src/crypto/ecdh/ecdh.go b/src/crypto/ecdh/ecdh.go
index 74420559b5892f..bfe1309011fe2b 100644
index b86f5217878251..a48043a044f309 100644
--- a/src/crypto/ecdh/ecdh.go
+++ b/src/crypto/ecdh/ecdh.go
@@ -8,7 +8,7 @@ package ecdh
Expand Down Expand Up @@ -128,7 +128,7 @@ index 275c60b4de49eb..61e70f981db4eb 100644
"math/big"
)
diff --git a/src/crypto/ecdsa/ecdsa.go b/src/crypto/ecdsa/ecdsa.go
index 1c93cefdbf247e..5a2118de2f16e9 100644
index e1503779ae421c..e8f8b85fdac62e 100644
--- a/src/crypto/ecdsa/ecdsa.go
+++ b/src/crypto/ecdsa/ecdsa.go
@@ -26,9 +26,9 @@ import (
Expand Down Expand Up @@ -355,10 +355,10 @@ index 00000000000000..e5d7570d6d4363
+const isRequireFIPS = true
diff --git a/src/crypto/internal/backend/nobackend.go b/src/crypto/internal/backend/nobackend.go
new file mode 100644
index 00000000000000..ad6081552af15d
index 00000000000000..2f0f2d986f752f
--- /dev/null
+++ b/src/crypto/internal/backend/nobackend.go
@@ -0,0 +1,116 @@
@@ -0,0 +1,117 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
Expand Down Expand Up @@ -401,6 +401,7 @@ index 00000000000000..ad6081552af15d
+
+func NewAESCipher(key []byte) (cipher.Block, error) { panic("cryptobackend: not available") }
+func NewGCMTLS(c cipher.Block) (cipher.AEAD, error) { panic("cryptobackend: not available") }
+func NewGCMTLS13(c cipher.Block) (cipher.AEAD, error) { panic("cryptobackend: not available") }
+
+type PublicKeyECDSA struct{ _ int }
+type PrivateKeyECDSA struct{ _ int }
Expand Down Expand Up @@ -548,7 +549,7 @@ index 2abc0436405f8a..34c22c8fbba7da 100644
func boringPublicKey(*PublicKey) (*boring.PublicKeyRSA, error) {
panic("boringcrypto: not available")
diff --git a/src/crypto/rsa/pkcs1v15.go b/src/crypto/rsa/pkcs1v15.go
index 489555358d0600..81c319d200a27a 100644
index 55fea1ab93d29a..05357064930a92 100644
--- a/src/crypto/rsa/pkcs1v15.go
+++ b/src/crypto/rsa/pkcs1v15.go
@@ -6,7 +6,7 @@ package rsa
Expand All @@ -561,7 +562,7 @@ index 489555358d0600..81c319d200a27a 100644
"crypto/subtle"
"errors"
diff --git a/src/crypto/rsa/pss.go b/src/crypto/rsa/pss.go
index f7d23b55ef811a..f2f2a64ed35e23 100644
index 3a377cc9dbbddb..1096f5fbbb8846 100644
--- a/src/crypto/rsa/pss.go
+++ b/src/crypto/rsa/pss.go
@@ -9,7 +9,7 @@ package rsa
Expand All @@ -574,7 +575,7 @@ index f7d23b55ef811a..f2f2a64ed35e23 100644
"hash"
"io"
diff --git a/src/crypto/rsa/rsa.go b/src/crypto/rsa/rsa.go
index 88e44508cdf222..1124c6d09fbe18 100644
index f0aef1f542bec9..7f44522c7fe8c0 100644
--- a/src/crypto/rsa/rsa.go
+++ b/src/crypto/rsa/rsa.go
@@ -27,9 +27,9 @@ package rsa
Expand Down Expand Up @@ -681,7 +682,7 @@ index 921cdbb7bbd477..2fef7ddae07480 100644
"encoding"
"encoding/hex"
diff --git a/src/crypto/tls/cipher_suites.go b/src/crypto/tls/cipher_suites.go
index 589e8b6fafbba3..0a6d665ee3096d 100644
index fd538da0f78d60..b385c54b2f4017 100644
--- a/src/crypto/tls/cipher_suites.go
+++ b/src/crypto/tls/cipher_suites.go
@@ -10,7 +10,7 @@ import (
Expand All @@ -694,7 +695,7 @@ index 589e8b6fafbba3..0a6d665ee3096d 100644
"crypto/sha1"
"crypto/sha256"
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index be8ac30f9daf9f..3356154c7d1082 100644
index 592f2fd72ad47b..63751beca3892b 100644
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -426,6 +426,7 @@ var depsRules = `
Expand Down
9 changes: 5 additions & 4 deletions patches/0003-Add-BoringSSL-crypto-backend.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Subject: [PATCH] Add BoringSSL crypto backend

---
.../internal/backend/bbig/big_boring.go | 12 ++
src/crypto/internal/backend/boring_linux.go | 135 ++++++++++++++++++
2 files changed, 147 insertions(+)
src/crypto/internal/backend/boring_linux.go | 136 ++++++++++++++++++
2 files changed, 148 insertions(+)
create mode 100644 src/crypto/internal/backend/bbig/big_boring.go
create mode 100644 src/crypto/internal/backend/boring_linux.go

Expand All @@ -30,10 +30,10 @@ index 00000000000000..0b62cef68546d0
+var Dec = bbig.Dec
diff --git a/src/crypto/internal/backend/boring_linux.go b/src/crypto/internal/backend/boring_linux.go
new file mode 100644
index 00000000000000..3b5504b6afc5c6
index 00000000000000..590d84f90fb16c
--- /dev/null
+++ b/src/crypto/internal/backend/boring_linux.go
@@ -0,0 +1,135 @@
@@ -0,0 +1,136 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
Expand Down Expand Up @@ -72,6 +72,7 @@ index 00000000000000..3b5504b6afc5c6
+
+func NewAESCipher(key []byte) (cipher.Block, error) { return boring.NewAESCipher(key) }
+func NewGCMTLS(c cipher.Block) (cipher.AEAD, error) { return boring.NewGCMTLS(c) }
+func NewGCMTLS13(c cipher.Block) (cipher.AEAD, error) { return boring.NewGCMTLS13(c) }
+
+type PublicKeyECDSA = boring.PublicKeyECDSA
+type PrivateKeyECDSA = boring.PrivateKeyECDSA
Expand Down
27 changes: 14 additions & 13 deletions patches/0004-Add-OpenSSL-crypto-backend.patch
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Subject: [PATCH] Add OpenSSL crypto backend
src/crypto/ecdsa/notboring.go | 2 +-
src/crypto/internal/backend/bbig/big.go | 2 +-
.../internal/backend/bbig/big_openssl.go | 12 ++
src/crypto/internal/backend/openssl_linux.go | 203 ++++++++++++++++++
src/crypto/internal/backend/openssl_linux.go | 204 ++++++++++++++++++
src/crypto/internal/boring/fipstls/stub.s | 2 +-
src/crypto/internal/boring/fipstls/tls.go | 2 +-
src/crypto/rsa/boring.go | 2 +-
Expand All @@ -36,7 +36,7 @@ Subject: [PATCH] Add OpenSSL crypto backend
.../goexperiment/exp_opensslcrypto_on.go | 9 +
src/internal/goexperiment/flags.go | 1 +
src/os/exec/exec_test.go | 9 +
32 files changed, 284 insertions(+), 23 deletions(-)
32 files changed, 285 insertions(+), 23 deletions(-)
create mode 100644 src/crypto/internal/backend/bbig/big_openssl.go
create mode 100644 src/crypto/internal/backend/openssl_linux.go
create mode 100644 src/internal/goexperiment/exp_opensslcrypto_off.go
Expand Down Expand Up @@ -189,10 +189,10 @@ index 00000000000000..61ef3fdd90b607
+var Dec = bbig.Dec
diff --git a/src/crypto/internal/backend/openssl_linux.go b/src/crypto/internal/backend/openssl_linux.go
new file mode 100644
index 00000000000000..2c36a07866fd6a
index 00000000000000..0b2d4710952a27
--- /dev/null
+++ b/src/crypto/internal/backend/openssl_linux.go
@@ -0,0 +1,203 @@
@@ -0,0 +1,204 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
Expand Down Expand Up @@ -299,6 +299,7 @@ index 00000000000000..2c36a07866fd6a
+
+func NewAESCipher(key []byte) (cipher.Block, error) { return openssl.NewAESCipher(key) }
+func NewGCMTLS(c cipher.Block) (cipher.AEAD, error) { return openssl.NewGCMTLS(c) }
+func NewGCMTLS13(c cipher.Block) (cipher.AEAD, error) { return openssl.NewGCMTLS13(c) }
+
+type PublicKeyECDSA = openssl.PublicKeyECDSA
+type PrivateKeyECDSA = openssl.PrivateKeyECDSA
Expand Down Expand Up @@ -476,7 +477,7 @@ index 95f4b8e98d2fb0..3bb307e7bddc48 100644

msg := []byte{0xed, 0x36, 0x90, 0x8d, 0xbe, 0xfc, 0x35, 0x40, 0x70, 0x4f, 0xf5, 0x9d, 0x6e, 0xc2, 0xeb, 0xf5, 0x27, 0xae, 0x65, 0xb0, 0x59, 0x29, 0x45, 0x25, 0x8c, 0xc1, 0x91, 0x22}
diff --git a/src/crypto/tls/boring.go b/src/crypto/tls/boring.go
index 1827f764589b58..70baa62d63754a 100644
index aad96b1c747784..9ee834e5a5952b 100644
--- a/src/crypto/tls/boring.go
+++ b/src/crypto/tls/boring.go
@@ -2,7 +2,7 @@
Expand All @@ -489,7 +490,7 @@ index 1827f764589b58..70baa62d63754a 100644
package tls

diff --git a/src/crypto/tls/boring_test.go b/src/crypto/tls/boring_test.go
index ba68f355eb037c..929111d8679cc2 100644
index 96dfc93e286f4c..e2543f53d77990 100644
--- a/src/crypto/tls/boring_test.go
+++ b/src/crypto/tls/boring_test.go
@@ -2,7 +2,7 @@
Expand Down Expand Up @@ -528,7 +529,7 @@ index f8485dc3ca1c29..9c1d3d279c472f 100644
package fipsonly

diff --git a/src/crypto/tls/notboring.go b/src/crypto/tls/notboring.go
index 7d85b39c59319e..1aaabd5ef486aa 100644
index edccb44d87a553..cae24d19c9f444 100644
--- a/src/crypto/tls/notboring.go
+++ b/src/crypto/tls/notboring.go
@@ -2,7 +2,7 @@
Expand All @@ -541,7 +542,7 @@ index 7d85b39c59319e..1aaabd5ef486aa 100644
package tls

diff --git a/src/crypto/x509/boring.go b/src/crypto/x509/boring.go
index 095b58c31590d4..9aec21dbcd3bff 100644
index e6237e96bb3b17..e4086bd90feb83 100644
--- a/src/crypto/x509/boring.go
+++ b/src/crypto/x509/boring.go
@@ -2,7 +2,7 @@
Expand Down Expand Up @@ -580,24 +581,24 @@ index c83a7272c9f01f..a0548a7f9179c5 100644
package x509

diff --git a/src/go.mod b/src/go.mod
index 3b24053b94da17..7037a89880f11a 100644
index 3b24053b94da17..715845b399f627 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -3,6 +3,7 @@ module std
go 1.21

require (
+ github.com/microsoft/go-crypto-openssl v0.2.8
+ github.com/microsoft/go-crypto-openssl v0.2.9-0.20240110181346-cf2e349f6f4f
golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d
golang.org/x/net v0.12.1-0.20231027154334-5ca955b1789c
)
diff --git a/src/go.sum b/src/go.sum
index caf8ff010daafd..a9054cd98bd29f 100644
index caf8ff010daafd..5f729bd90aeeeb 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -1,3 +1,5 @@
+github.com/microsoft/go-crypto-openssl v0.2.8 h1:16B6DVeBCimOAG0B92PSySOnVDq6Qr/siI3TyyMHXoI=
+github.com/microsoft/go-crypto-openssl v0.2.8/go.mod h1:xOSmQnWz4xvNB2+KQN2g2UUwMG9vqDHBk9nk/NdmyRw=
+github.com/microsoft/go-crypto-openssl v0.2.9-0.20240110181346-cf2e349f6f4f h1:HRNz2SIk2d4O4KVVzzrLNvwefELKnlAeKMgS5RMPZ9A=
+github.com/microsoft/go-crypto-openssl v0.2.9-0.20240110181346-cf2e349f6f4f/go.mod h1:xOSmQnWz4xvNB2+KQN2g2UUwMG9vqDHBk9nk/NdmyRw=
golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d h1:LiA25/KWKuXfIq5pMIBq1s5hz3HQxhJJSu/SUGlD+SM=
golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
golang.org/x/net v0.12.1-0.20231027154334-5ca955b1789c h1:d+VvAxu4S13DWtf73R5eY//VaCk3aUcVdyYjM1SX7zw=
Expand Down
42 changes: 23 additions & 19 deletions patches/0005-Add-CNG-crypto-backend.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Subject: [PATCH] Add CNG crypto backend
src/crypto/internal/backend/backend_test.go | 4 +-
src/crypto/internal/backend/bbig/big.go | 2 +-
src/crypto/internal/backend/bbig/big_cng.go | 12 +
src/crypto/internal/backend/cng_windows.go | 207 ++++++++++++++++++
src/crypto/internal/backend/cng_windows.go | 211 ++++++++++++++++++
src/crypto/internal/backend/common.go | 33 ++-
src/crypto/internal/boring/fipstls/stub.s | 2 +-
src/crypto/internal/boring/fipstls/tls.go | 2 +-
Expand Down Expand Up @@ -48,7 +48,7 @@ Subject: [PATCH] Add CNG crypto backend
.../goexperiment/exp_cngcrypto_off.go | 9 +
src/internal/goexperiment/exp_cngcrypto_on.go | 9 +
src/internal/goexperiment/flags.go | 1 +
44 files changed, 402 insertions(+), 44 deletions(-)
44 files changed, 406 insertions(+), 44 deletions(-)
create mode 100644 src/crypto/internal/backend/bbig/big_cng.go
create mode 100644 src/crypto/internal/backend/cng_windows.go
create mode 100644 src/internal/goexperiment/exp_cngcrypto_off.go
Expand Down Expand Up @@ -167,10 +167,10 @@ index 00000000000000..92623031fd87d0
+var Dec = bbig.Dec
diff --git a/src/crypto/internal/backend/cng_windows.go b/src/crypto/internal/backend/cng_windows.go
new file mode 100644
index 00000000000000..1e39e1fb5c8da1
index 00000000000000..408d5a83b71749
--- /dev/null
+++ b/src/crypto/internal/backend/cng_windows.go
@@ -0,0 +1,207 @@
@@ -0,0 +1,211 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
Expand Down Expand Up @@ -260,6 +260,10 @@ index 00000000000000..1e39e1fb5c8da1
+ return cng.NewGCMTLS(c)
+}
+
+func NewGCMTLS13(c cipher.Block) (cipher.AEAD, error) {
+ return cng.NewGCMTLS13(c)
+}
+
+type PublicKeyECDSA = cng.PublicKeyECDSA
+type PrivateKeyECDSA = cng.PrivateKeyECDSA
+
Expand Down Expand Up @@ -461,7 +465,7 @@ index 4e629a4db8f7c7..a7cd24a0d15647 100644
// Package fipstls allows control over whether crypto/tls requires FIPS-approved settings.
// This package only exists with GOEXPERIMENT=boringcrypto, but the effects are independent
diff --git a/src/crypto/rand/rand_windows.go b/src/crypto/rand/rand_windows.go
index 6c0655c72b692a..755861fc5bc21d 100644
index 7380f1f0f1e6e6..35318d8fa67336 100644
--- a/src/crypto/rand/rand_windows.go
+++ b/src/crypto/rand/rand_windows.go
@@ -8,10 +8,17 @@
Expand Down Expand Up @@ -892,7 +896,7 @@ index 2fef7ddae07480..979e4c69ab710c 100644

h := New()
diff --git a/src/crypto/tls/boring.go b/src/crypto/tls/boring.go
index 70baa62d63754a..ecd0f5a7b3e9ed 100644
index 9ee834e5a5952b..5444d9b0fc0942 100644
--- a/src/crypto/tls/boring.go
+++ b/src/crypto/tls/boring.go
@@ -2,7 +2,7 @@
Expand All @@ -905,7 +909,7 @@ index 70baa62d63754a..ecd0f5a7b3e9ed 100644
package tls

diff --git a/src/crypto/tls/boring_test.go b/src/crypto/tls/boring_test.go
index 929111d8679cc2..3e63ba6a053c42 100644
index e2543f53d77990..b2b4a57ea1d195 100644
--- a/src/crypto/tls/boring_test.go
+++ b/src/crypto/tls/boring_test.go
@@ -2,7 +2,7 @@
Expand Down Expand Up @@ -944,7 +948,7 @@ index 9c1d3d279c472f..0ca7a863b73690 100644
package fipsonly

diff --git a/src/crypto/tls/handshake_server_tls13.go b/src/crypto/tls/handshake_server_tls13.go
index 07b1a3851e0714..6fae2b4ba22540 100644
index dd5298b728f715..21d009cd83bae5 100644
--- a/src/crypto/tls/handshake_server_tls13.go
+++ b/src/crypto/tls/handshake_server_tls13.go
@@ -13,6 +13,7 @@ import (
Expand All @@ -955,7 +959,7 @@ index 07b1a3851e0714..6fae2b4ba22540 100644
"io"
"time"
)
@@ -402,6 +403,15 @@ func cloneHash(in hash.Hash, h crypto.Hash) hash.Hash {
@@ -401,6 +402,15 @@ func cloneHash(in hash.Hash, h crypto.Hash) hash.Hash {
}
marshaler, ok := in.(binaryMarshaler)
if !ok {
Expand All @@ -972,7 +976,7 @@ index 07b1a3851e0714..6fae2b4ba22540 100644
}
state, err := marshaler.MarshalBinary()
diff --git a/src/crypto/tls/notboring.go b/src/crypto/tls/notboring.go
index 1aaabd5ef486aa..5a133c9b2f94c7 100644
index cae24d19c9f444..7625ccb867dd92 100644
--- a/src/crypto/tls/notboring.go
+++ b/src/crypto/tls/notboring.go
@@ -2,7 +2,7 @@
Expand All @@ -985,7 +989,7 @@ index 1aaabd5ef486aa..5a133c9b2f94c7 100644
package tls

diff --git a/src/crypto/x509/boring.go b/src/crypto/x509/boring.go
index 9aec21dbcd3bff..05324f731bedc4 100644
index e4086bd90feb83..674990c63c0539 100644
--- a/src/crypto/x509/boring.go
+++ b/src/crypto/x509/boring.go
@@ -2,7 +2,7 @@
Expand Down Expand Up @@ -1024,26 +1028,26 @@ index a0548a7f9179c5..ae6117a1554b7f 100644
package x509

diff --git a/src/go.mod b/src/go.mod
index 7037a89880f11a..1dfa2df1f0ca79 100644
index 715845b399f627..4326603793be6e 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -4,6 +4,7 @@ go 1.21

require (
github.com/microsoft/go-crypto-openssl v0.2.8
+ github.com/microsoft/go-crypto-winnative v0.0.0-20230502061212-6eb98854418e
github.com/microsoft/go-crypto-openssl v0.2.9-0.20240110181346-cf2e349f6f4f
+ github.com/microsoft/go-crypto-winnative v0.0.0-20240109184443-a968e40d3103
golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d
golang.org/x/net v0.12.1-0.20231027154334-5ca955b1789c
)
diff --git a/src/go.sum b/src/go.sum
index a9054cd98bd29f..4839faec6628bd 100644
index 5f729bd90aeeeb..a19607ce2355f6 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -1,5 +1,7 @@
github.com/microsoft/go-crypto-openssl v0.2.8 h1:16B6DVeBCimOAG0B92PSySOnVDq6Qr/siI3TyyMHXoI=
github.com/microsoft/go-crypto-openssl v0.2.8/go.mod h1:xOSmQnWz4xvNB2+KQN2g2UUwMG9vqDHBk9nk/NdmyRw=
+github.com/microsoft/go-crypto-winnative v0.0.0-20230502061212-6eb98854418e h1:BB2UybwbUjtxG2OFs6KnKi8AOlk9rjH7ekjkbW+vHA0=
+github.com/microsoft/go-crypto-winnative v0.0.0-20230502061212-6eb98854418e/go.mod h1:fveERXKbeK+XLmOyU24caKnIT/S5nniAX9XCRHfnrM4=
github.com/microsoft/go-crypto-openssl v0.2.9-0.20240110181346-cf2e349f6f4f h1:HRNz2SIk2d4O4KVVzzrLNvwefELKnlAeKMgS5RMPZ9A=
github.com/microsoft/go-crypto-openssl v0.2.9-0.20240110181346-cf2e349f6f4f/go.mod h1:xOSmQnWz4xvNB2+KQN2g2UUwMG9vqDHBk9nk/NdmyRw=
+github.com/microsoft/go-crypto-winnative v0.0.0-20240109184443-a968e40d3103 h1:KQsPPal3pKvKzAPTaR7sEriaqrHmRWw0dWG/7E5FNNk=
+github.com/microsoft/go-crypto-winnative v0.0.0-20240109184443-a968e40d3103/go.mod h1:fveERXKbeK+XLmOyU24caKnIT/S5nniAX9XCRHfnrM4=
golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d h1:LiA25/KWKuXfIq5pMIBq1s5hz3HQxhJJSu/SUGlD+SM=
golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
golang.org/x/net v0.12.1-0.20231027154334-5ca955b1789c h1:d+VvAxu4S13DWtf73R5eY//VaCk3aUcVdyYjM1SX7zw=
Expand Down
Loading

0 comments on commit 5b6ff83

Please sign in to comment.