Skip to content

Commit

Permalink
Merge pull request #956 from microsoft/dev/qmuntal/go1.19bp
Browse files Browse the repository at this point in the history
[release-branch.go1.19] Upgrade go-crypto-openssl to v0.2.8
  • Loading branch information
qmuntal authored Jun 22, 2023
2 parents 5a078e0 + 07b3484 commit 49e36e6
Show file tree
Hide file tree
Showing 3 changed files with 135 additions and 79 deletions.
6 changes: 3 additions & 3 deletions patches/0005-Add-OpenSSL-crypto-backend.patch
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ index dc4b1a77d25e96..c9b19f6a5950bb 100644
go 1.19

require (
+ github.com/microsoft/go-crypto-openssl v0.2.6
+ github.com/microsoft/go-crypto-openssl v0.2.8
golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8
golang.org/x/net v0.0.0-20230214200805-d99f623d45a4
)
Expand All @@ -637,8 +637,8 @@ index 18402b8778cc35..409c131ec382d1 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -1,3 +1,5 @@
+github.com/microsoft/go-crypto-openssl v0.2.6 h1:qufiwqJsKT/fKrzAlAA8YPCmSshxBxSqih/4S1VoTIk=
+github.com/microsoft/go-crypto-openssl v0.2.6/go.mod h1:rC+rtBU3m60UCQifBmpWII0VETfu78w6YGZQvVc0rd4=
+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=
golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8 h1:y+mHpWoQJNAHt26Nhh6JP7hvM71IRZureyvZhoVALIs=
golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/net v0.0.0-20230214200805-d99f623d45a4 h1:iaVaPFITmD6a3T5kPUYNWiaNrPvSEl6s+xvx6B9yfR0=
Expand Down
6 changes: 3 additions & 3 deletions patches/0006-Add-CNG-crypto-backend.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1093,7 +1093,7 @@ index c9b19f6a5950bb..0feb6949d71457 100644
@@ -4,6 +4,7 @@ go 1.19

require (
github.com/microsoft/go-crypto-openssl v0.2.6
github.com/microsoft/go-crypto-openssl v0.2.8
+ github.com/microsoft/go-crypto-winnative v0.0.0-20221003180653-84bf0c539a8e
golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8
golang.org/x/net v0.0.0-20230214200805-d99f623d45a4
Expand All @@ -1103,8 +1103,8 @@ index 409c131ec382d1..f747fd8c804806 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -1,5 +1,7 @@
github.com/microsoft/go-crypto-openssl v0.2.6 h1:qufiwqJsKT/fKrzAlAA8YPCmSshxBxSqih/4S1VoTIk=
github.com/microsoft/go-crypto-openssl v0.2.6/go.mod h1:rC+rtBU3m60UCQifBmpWII0VETfu78w6YGZQvVc0rd4=
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-20221003180653-84bf0c539a8e h1:9iYvunmn8z1LIbUG7qtD3O3cuPlbjWY90Vn6ox/divM=
+github.com/microsoft/go-crypto-winnative v0.0.0-20221003180653-84bf0c539a8e/go.mod h1:fveERXKbeK+XLmOyU24caKnIT/S5nniAX9XCRHfnrM4=
golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8 h1:y+mHpWoQJNAHt26Nhh6JP7hvM71IRZureyvZhoVALIs=
Expand Down
Loading

0 comments on commit 49e36e6

Please sign in to comment.