From f51b017258afdfde4ccc94118f8c2f896c83902d Mon Sep 17 00:00:00 2001 From: George Adams Date: Wed, 5 Jun 2024 17:26:40 +0100 Subject: [PATCH] regen patch files to fix conflicts --- patches/0004-Add-OpenSSL-crypto-backend.patch | 14 +++++++------- patches/0005-Add-CNG-crypto-backend.patch | 14 +++++++------- patches/0006-Vendor-crypto-backends.patch | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/patches/0004-Add-OpenSSL-crypto-backend.patch b/patches/0004-Add-OpenSSL-crypto-backend.patch index 356673b55c0..c3df0486f71 100644 --- a/patches/0004-Add-OpenSSL-crypto-backend.patch +++ b/patches/0004-Add-OpenSSL-crypto-backend.patch @@ -714,7 +714,7 @@ index c83a7272c9f01f..a0548a7f9179c5 100644 package x509 diff --git a/src/go.mod b/src/go.mod -index 0141668dc3f6f4..87e9c5ffbbffd2 100644 +index b38dee7e6ddc28..46820be2075592 100644 --- a/src/go.mod +++ b/src/go.mod @@ -3,6 +3,7 @@ module std @@ -722,19 +722,19 @@ index 0141668dc3f6f4..87e9c5ffbbffd2 100644 require ( + github.com/golang-fips/openssl/v2 v2.0.2 - golang.org/x/crypto v0.22.1-0.20240415215343-5defcc193aab - golang.org/x/net v0.24.1-0.20240405221309-ec05fdcd7114 + golang.org/x/crypto v0.23.1-0.20240603234054-0b431c7de36a + golang.org/x/net v0.25.1-0.20240603202750-6249541f2a6c ) diff --git a/src/go.sum b/src/go.sum -index 564f8b30a5b183..354008e0265c80 100644 +index c5eab7d4b2f93b..733bad46e50c77 100644 --- a/src/go.sum +++ b/src/go.sum @@ -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.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= + golang.org/x/crypto v0.23.1-0.20240603234054-0b431c7de36a h1:37MIv+iGfwMYzWJECGyrPCtd5nuqcciRUeJfkNCkCf0= + golang.org/x/crypto v0.23.1-0.20240603234054-0b431c7de36a/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= + golang.org/x/net v0.25.1-0.20240603202750-6249541f2a6c h1:CR/7/SLUhIJw6g675eeoDiwggElO2MV9rGkNYjqi8GM= diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go index 68d3b0578d18b1..15f4bb124b8528 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 583032a7372..3e76b5d918f 100644 --- a/patches/0005-Add-CNG-crypto-backend.patch +++ b/patches/0005-Add-CNG-crypto-backend.patch @@ -1123,7 +1123,7 @@ index a0548a7f9179c5..ae6117a1554b7f 100644 package x509 diff --git a/src/go.mod b/src/go.mod -index 87e9c5ffbbffd2..4b362696c57e8a 100644 +index 46820be2075592..68ae41a4cf5bc1 100644 --- a/src/go.mod +++ b/src/go.mod @@ -4,6 +4,7 @@ go 1.23 @@ -1131,11 +1131,11 @@ index 87e9c5ffbbffd2..4b362696c57e8a 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.22.1-0.20240415215343-5defcc193aab - golang.org/x/net v0.24.1-0.20240405221309-ec05fdcd7114 + golang.org/x/crypto v0.23.1-0.20240603234054-0b431c7de36a + golang.org/x/net v0.25.1-0.20240603202750-6249541f2a6c ) diff --git a/src/go.sum b/src/go.sum -index 354008e0265c80..cecd373aab5a04 100644 +index 733bad46e50c77..04b9ef21ca2cc6 100644 --- a/src/go.sum +++ b/src/go.sum @@ -1,5 +1,7 @@ @@ -1143,9 +1143,9 @@ index 354008e0265c80..cecd373aab5a04 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.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= + golang.org/x/crypto v0.23.1-0.20240603234054-0b431c7de36a h1:37MIv+iGfwMYzWJECGyrPCtd5nuqcciRUeJfkNCkCf0= + golang.org/x/crypto v0.23.1-0.20240603234054-0b431c7de36a/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= + golang.org/x/net v0.25.1-0.20240603202750-6249541f2a6c h1:CR/7/SLUhIJw6g675eeoDiwggElO2MV9rGkNYjqi8GM= diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go index 15f4bb124b8528..82b38763d02d6c 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 ebcf43e4322..546ef1a07c7 100644 --- a/patches/0006-Vendor-crypto-backends.patch +++ b/patches/0006-Vendor-crypto-backends.patch @@ -9498,7 +9498,7 @@ index 00000000000000..1722410e5af193 + return getSystemDirectory() + "\\" + dll +} diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt -index 9c2019873b258a..f7b90390d7fbed 100644 +index 2868749b894fb2..c91ea7f76a892a 100644 --- a/src/vendor/modules.txt +++ b/src/vendor/modules.txt @@ -1,3 +1,14 @@ @@ -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.22.1-0.20240415215343-5defcc193aab + # golang.org/x/crypto v0.23.1-0.20240603234054-0b431c7de36a ## explicit; go 1.18 golang.org/x/crypto/chacha20