From 35b396d2ade7df63cf0fa26309d30462a66b4244 Mon Sep 17 00:00:00 2001 From: microsoft-golang-bot Date: Mon, 22 Apr 2024 12:39:55 +0000 Subject: [PATCH 1/2] Update submodule to latest master (7f76c00f): internal/reflectlite: remove unused mapType --- go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go b/go index 2e064cf1444..7f76c00fc56 160000 --- a/go +++ b/go @@ -1 +1 @@ -Subproject commit 2e064cf14441460290fd25d9d61f02a9d0bae671 +Subproject commit 7f76c00fc5678fa782708ba8fece63750cb89d03 From 8189dcd7babe711e24ec3e0107a8617e7d2d6093 Mon Sep 17 00:00:00 2001 From: qmuntal Date: Mon, 22 Apr 2024 14:57:58 +0200 Subject: [PATCH 2/2] fix conflicts --- patches/0002-Add-crypto-backend-foundation.patch | 2 +- patches/0004-Add-OpenSSL-crypto-backend.patch | 10 +++++----- patches/0005-Add-CNG-crypto-backend.patch | 10 +++++----- patches/0006-Vendor-crypto-backends.patch | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/patches/0002-Add-crypto-backend-foundation.patch b/patches/0002-Add-crypto-backend-foundation.patch index 35b6374091b..4d55cd8fde2 100644 --- a/patches/0002-Add-crypto-backend-foundation.patch +++ b/patches/0002-Add-crypto-backend-foundation.patch @@ -1627,8 +1627,8 @@ index 59c0fdde558387..78a6e35e47383c 100644 < crypto/internal/boring/bbig + < crypto/internal/backend/bbig < crypto/rand + < crypto/internal/mlkem768 < crypto/ed25519 - < encoding/asn1 diff --git a/src/net/http/client_test.go b/src/net/http/client_test.go index 569b58ca6225c9..8e692fd60a095b 100644 --- a/src/net/http/client_test.go diff --git a/patches/0004-Add-OpenSSL-crypto-backend.patch b/patches/0004-Add-OpenSSL-crypto-backend.patch index 972eff942c4..6cbc381b481 100644 --- a/patches/0004-Add-OpenSSL-crypto-backend.patch +++ b/patches/0004-Add-OpenSSL-crypto-backend.patch @@ -722,8 +722,8 @@ index 5ea6c94dd243e8..2beaccb4bf11e2 100644 require ( + github.com/golang-fips/openssl/v2 v2.0.2 - golang.org/x/crypto v0.21.0 - golang.org/x/net v0.22.1-0.20240320112724-d73acffdc949 + golang.org/x/crypto v0.22.1-0.20240415215343-5defcc193aab + golang.org/x/net v0.24.1-0.20240405221309-ec05fdcd7114 ) diff --git a/src/go.sum b/src/go.sum index 7d9b29679ec3b9..f5dd98dedf2f66 100644 @@ -732,9 +732,9 @@ index 7d9b29679ec3b9..f5dd98dedf2f66 100644 @@ -1,3 +1,5 @@ +github.com/golang-fips/openssl/v2 v2.0.2 h1:jWZLvtLF7PfFpSdG13bwBLt9DqPo5wN5SWwICrpwuGY= +github.com/golang-fips/openssl/v2 v2.0.2/go.mod h1:7tuBqX2Zov8Yq5mJ2yzlKhpnxOnWyEzi38AzeWRuQdg= - golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= - golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= - golang.org/x/net v0.22.1-0.20240320112724-d73acffdc949 h1:I5WNFtVW5hWIoi/wTQJWBBusF9HXZuGCgRt60a7T/pA= + golang.org/x/crypto v0.22.1-0.20240415215343-5defcc193aab h1:7X80n3mDJrqepjWApLRTQmLYC+hKHXsvFi/LO2SE324= + golang.org/x/crypto v0.22.1-0.20240415215343-5defcc193aab/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= + golang.org/x/net v0.24.1-0.20240405221309-ec05fdcd7114 h1:0+DQSN4OXt0ivfKIOXFQ+8vsRb1pNvvdl7DZ6AR07OQ= diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go index 7bf1909f92437e..5f1e639335fa02 100644 --- a/src/go/build/deps_test.go diff --git a/patches/0005-Add-CNG-crypto-backend.patch b/patches/0005-Add-CNG-crypto-backend.patch index 0bc7c456352..a2e761fd62d 100644 --- a/patches/0005-Add-CNG-crypto-backend.patch +++ b/patches/0005-Add-CNG-crypto-backend.patch @@ -1106,8 +1106,8 @@ index 2beaccb4bf11e2..f4725710819882 100644 require ( github.com/golang-fips/openssl/v2 v2.0.2 + github.com/microsoft/go-crypto-winnative v0.0.0-20240109184443-a968e40d3103 - golang.org/x/crypto v0.21.0 - golang.org/x/net v0.22.1-0.20240320112724-d73acffdc949 + golang.org/x/crypto v0.22.1-0.20240415215343-5defcc193aab + golang.org/x/net v0.24.1-0.20240405221309-ec05fdcd7114 ) diff --git a/src/go.sum b/src/go.sum index f5dd98dedf2f66..5160110cdb6b7c 100644 @@ -1118,9 +1118,9 @@ index f5dd98dedf2f66..5160110cdb6b7c 100644 github.com/golang-fips/openssl/v2 v2.0.2/go.mod h1:7tuBqX2Zov8Yq5mJ2yzlKhpnxOnWyEzi38AzeWRuQdg= +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.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= - golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= - golang.org/x/net v0.22.1-0.20240320112724-d73acffdc949 h1:I5WNFtVW5hWIoi/wTQJWBBusF9HXZuGCgRt60a7T/pA= + golang.org/x/crypto v0.22.1-0.20240415215343-5defcc193aab h1:7X80n3mDJrqepjWApLRTQmLYC+hKHXsvFi/LO2SE324= + golang.org/x/crypto v0.22.1-0.20240415215343-5defcc193aab/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= + golang.org/x/net v0.24.1-0.20240405221309-ec05fdcd7114 h1:0+DQSN4OXt0ivfKIOXFQ+8vsRb1pNvvdl7DZ6AR07OQ= diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go index 5f1e639335fa02..769b4e4f2c41e2 100644 --- a/src/go/build/deps_test.go diff --git a/patches/0006-Vendor-crypto-backends.patch b/patches/0006-Vendor-crypto-backends.patch index 83d094a6f3c..ebcf43e4322 100644 --- a/patches/0006-Vendor-crypto-backends.patch +++ b/patches/0006-Vendor-crypto-backends.patch @@ -9513,6 +9513,6 @@ index 9c2019873b258a..f7b90390d7fbed 100644 +github.com/microsoft/go-crypto-winnative/internal/bcrypt +github.com/microsoft/go-crypto-winnative/internal/subtle +github.com/microsoft/go-crypto-winnative/internal/sysdll - # golang.org/x/crypto v0.21.0 + # golang.org/x/crypto v0.22.1-0.20240415215343-5defcc193aab ## explicit; go 1.18 golang.org/x/crypto/chacha20