Resolve patches: nearby line change

microsoft · Oct 27, 2023 · 82ecded · 82ecded
1 parent a7163bb
commit 82ecded
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/patches/0004-Add-OpenSSL-crypto-backend.patch b/patches/0004-Add-OpenSSL-crypto-backend.patch
@@ -706,7 +706,7 @@ index c83a7272c9f01f..a0548a7f9179c5 100644
  package x509
 
 diff --git a/src/go.mod b/src/go.mod
-index 7116fd3d724946..7543d20c516759 100644
+index 003d6a96a90ccf..9007bbea016970 100644
 --- a/src/go.mod
 +++ b/src/go.mod
 @@ -3,6 +3,7 @@ module std
@@ -715,18 +715,18 @@ index 7116fd3d724946..7543d20c516759 100644
  require (
 +	github.com/golang-fips/openssl/v2 v2.0.0-rc.3.0.20231017103527-08f07a7a41c3
  	golang.org/x/crypto v0.14.1-0.20231011220222-8779cbd1c995
- 	golang.org/x/net v0.17.1-0.20231011215812-d23d9bc54922
+ 	golang.org/x/net v0.17.1-0.20231025180729-4c7a5b64f145
  )
 diff --git a/src/go.sum b/src/go.sum
-index bcaeab575880dc..a2bd8ff5e7e285 100644
+index 22519d7febbfbc..e0259476a377c2 100644
 --- a/src/go.sum
 +++ b/src/go.sum
 @@ -1,3 +1,5 @@
 +github.com/golang-fips/openssl/v2 v2.0.0-rc.3.0.20231017103527-08f07a7a41c3 h1:EUdE8vQSqj5vTtLHwomurgliWNAO5A7GpCfUa0S1AtU=
 +github.com/golang-fips/openssl/v2 v2.0.0-rc.3.0.20231017103527-08f07a7a41c3/go.mod h1:7tuBqX2Zov8Yq5mJ2yzlKhpnxOnWyEzi38AzeWRuQdg=
  golang.org/x/crypto v0.14.1-0.20231011220222-8779cbd1c995 h1:fwu25/DhiXr/++jtzz2gHfC/FL/FimAGVxczaK4pjR8=
  golang.org/x/crypto v0.14.1-0.20231011220222-8779cbd1c995/go.mod h1:aSyBXtGhRzSMdne9jbl3+PPMVS0IgOWF6Llc+HB5uUU=
- golang.org/x/net v0.17.1-0.20231011215812-d23d9bc54922 h1:5dPkjItO/mhqL4dWOB/ERHdeNKAe0YXhUnCOLpn/nwI=
+ golang.org/x/net v0.17.1-0.20231025180729-4c7a5b64f145 h1:b50rfQxeg+jm4ud87SAQt4escws56zdE+/rT1oKU4oU=
 diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
 index f10ecff5168acc..79d02564926b37 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
@@ -1087,7 +1087,7 @@ index a0548a7f9179c5..ae6117a1554b7f 100644
  package x509
 
 diff --git a/src/go.mod b/src/go.mod
-index 7543d20c516759..20516381c7c818 100644
+index 9007bbea016970..25b6931f65a635 100644
 --- a/src/go.mod
 +++ b/src/go.mod
 @@ -4,6 +4,7 @@ go 1.22
@@ -1096,10 +1096,10 @@ index 7543d20c516759..20516381c7c818 100644
  	github.com/golang-fips/openssl/v2 v2.0.0-rc.3.0.20231017103527-08f07a7a41c3
 +	github.com/microsoft/go-crypto-winnative v0.0.0-20231013074141-ebaf9de20b54
  	golang.org/x/crypto v0.14.1-0.20231011220222-8779cbd1c995
- 	golang.org/x/net v0.17.1-0.20231011215812-d23d9bc54922
+ 	golang.org/x/net v0.17.1-0.20231025180729-4c7a5b64f145
  )
 diff --git a/src/go.sum b/src/go.sum
-index a2bd8ff5e7e285..a6327968ba387c 100644
+index e0259476a377c2..9ca88aa880198d 100644
 --- a/src/go.sum
 +++ b/src/go.sum
 @@ -1,5 +1,7 @@
@@ -1109,7 +1109,7 @@ index a2bd8ff5e7e285..a6327968ba387c 100644
 +github.com/microsoft/go-crypto-winnative v0.0.0-20231013074141-ebaf9de20b54/go.mod h1:fveERXKbeK+XLmOyU24caKnIT/S5nniAX9XCRHfnrM4=
  golang.org/x/crypto v0.14.1-0.20231011220222-8779cbd1c995 h1:fwu25/DhiXr/++jtzz2gHfC/FL/FimAGVxczaK4pjR8=
  golang.org/x/crypto v0.14.1-0.20231011220222-8779cbd1c995/go.mod h1:aSyBXtGhRzSMdne9jbl3+PPMVS0IgOWF6Llc+HB5uUU=
- golang.org/x/net v0.17.1-0.20231011215812-d23d9bc54922 h1:5dPkjItO/mhqL4dWOB/ERHdeNKAe0YXhUnCOLpn/nwI=
+ golang.org/x/net v0.17.1-0.20231025180729-4c7a5b64f145 h1:b50rfQxeg+jm4ud87SAQt4escws56zdE+/rT1oKU4oU=
 diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
 index 79d02564926b37..f66f834ca76528 100644
 --- a/src/go/build/deps_test.go