Skip to content

Commit

Permalink
Keep allowing encoding/binary crypto dependency: used by our backends
Browse files Browse the repository at this point in the history
  • Loading branch information
dagood committed May 17, 2024
1 parent d1927c8 commit c9e4895
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions patches/0002-Add-crypto-backend-foundation.patch
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ Subject: [PATCH] Add crypto backend foundation
src/crypto/tls/prf.go | 77 +++++---
src/crypto/tls/prf_test.go | 12 +-
src/crypto/x509/boring_test.go | 5 +
src/go/build/deps_test.go | 3 +
src/go/build/deps_test.go | 4 +
src/net/http/client_test.go | 6 +-
src/net/smtp/smtp_test.go | 72 ++++---
src/runtime/runtime_boring.go | 5 +
52 files changed, 767 insertions(+), 95 deletions(-)
52 files changed, 768 insertions(+), 95 deletions(-)
create mode 100644 src/crypto/ed25519/boring.go
create mode 100644 src/crypto/ed25519/notboring.go
create mode 100644 src/crypto/internal/backend/backend_test.go
Expand Down Expand Up @@ -1602,26 +1602,28 @@ index 33fd0ed52b1ff6..ffc3eeca9dbf95 100644
k, err := rsa.GenerateKey(rand.Reader, size)
if err != nil {
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index ee53b3114031f6..7b0bf71f23b457 100644
index ee53b3114031f6..c3320e0e5c648f 100644
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -431,6 +431,7 @@ var depsRules = `
@@ -431,7 +431,9 @@ var depsRules = `

# CRYPTO is core crypto algorithms - no cgo, fmt, net.
crypto/internal/boring/sig,
+ crypto/internal/boring/fipstls,
crypto/internal/boring/syso,
+ encoding/binary,
golang.org/x/sys/cpu,
hash, embed
@@ -442,6 +443,7 @@ var depsRules = `
< crypto
@@ -442,6 +444,7 @@ var depsRules = `
crypto/cipher,
crypto/internal/boring/bcache
< crypto/internal/boring
+ < crypto/internal/backend
< crypto/boring;

crypto/internal/alias
@@ -479,6 +481,7 @@ var depsRules = `
@@ -479,6 +482,7 @@ var depsRules = `
# CRYPTO-MATH is core bignum-based crypto - no cgo, net; fmt now ok.
CRYPTO, FMT, math/big
< crypto/internal/boring/bbig
Expand Down

0 comments on commit c9e4895

Please sign in to comment.