fix:wrong import fix

microsoft · Dec 20, 2024 · 0dc0c5a · 0dc0c5a
1 parent 18eaed4
commit 0dc0c5a
Showing 1 changed file with 11 additions and 20 deletions.
diff --git a/patches/0002-Add-crypto-backend-foundation.patch b/patches/0002-Add-crypto-backend-foundation.patch
@@ -23,7 +23,7 @@ Subject: [PATCH] Add crypto backend foundation
  src/crypto/ed25519/boring.go                  |  71 ++++++
  src/crypto/ed25519/ed25519.go                 |  73 ++++++
  src/crypto/ed25519/notboring.go               |  16 ++
- src/crypto/hkdf/hkdf.go                       |  22 +-
+ src/crypto/hkdf/hkdf.go                       |  14 ++
  src/crypto/hkdf/hkdf_test.go                  |   2 +-
  src/crypto/hmac/hmac.go                       |   2 +-
  src/crypto/hmac/hmac_test.go                  |   2 +-
@@ -75,7 +75,7 @@ Subject: [PATCH] Add crypto backend foundation
  src/hash/notboring_test.go                    |   9 +
  src/net/smtp/smtp_test.go                     |  72 ++++--
  src/runtime/runtime_boring.go                 |   5 +
- 71 files changed, 1174 insertions(+), 87 deletions(-)
+ 71 files changed, 1170 insertions(+), 83 deletions(-)
  create mode 100644 src/crypto/dsa/boring.go
  create mode 100644 src/crypto/dsa/notboring.go
  create mode 100644 src/crypto/ed25519/boring.go
@@ -813,60 +813,51 @@ index 00000000000000..b0cdd44d81c753
 +	panic("boringcrypto: not available")
 +}
 diff --git a/src/crypto/hkdf/hkdf.go b/src/crypto/hkdf/hkdf.go
-index 7cfbe2c60de356..925b839b73cb0c 100644
+index 7cfbe2c60de356..78139ed6170da5 100644
 --- a/src/crypto/hkdf/hkdf.go
 +++ b/src/crypto/hkdf/hkdf.go
-@@ -11,8 +11,9 @@
+@@ -11,6 +11,7 @@
  package hkdf
 
  import (
--	"crypto/internal/fips140/hkdf"
 +	boring "crypto/internal/backend"
+ 	"crypto/internal/fips140/hkdf"
  	"crypto/internal/fips140only"
-+	"cryto/hkdf"
  	"errors"
- 	"hash"
- )
-@@ -27,7 +28,10 @@ func Extract[H hash.Hash](h func() H, secret, salt []byte) ([]byte, error) {
+@@ -27,6 +28,9 @@ func Extract[H hash.Hash](h func() H, secret, salt []byte) ([]byte, error) {
  	if err := checkFIPS140Only(h, secret); err != nil {
  		return nil, err
  	}
--	return hkdf.Extract(h, secret, salt), nil
 +	if boring.Enabled && boring.SupportsHKDF() {
 +		return boring.ExtractHKDF(func() hash.Hash { return h() }, secret, salt)
 +	}
-+	return hkdf.Extract(h, secret, salt)
+ 	return hkdf.Extract(h, secret, salt), nil
  }
 
- // Expand derives a key from the given hash, key, and optional context info,
-@@ -47,7 +51,10 @@ func Expand[H hash.Hash](h func() H, pseudorandomKey []byte, info string, keyLen
+@@ -47,6 +51,9 @@ func Expand[H hash.Hash](h func() H, pseudorandomKey []byte, info string, keyLen
  		return nil, errors.New("hkdf: requested key length too large")
  	}
 
--	return hkdf.Expand(h, pseudorandomKey, info, keyLength), nil
 +	if boring.Enabled && boring.SupportsHKDF() {
 +		return boring.ExpandHKDF(func() hash.Hash { return h() }, pseudorandomKey, []byte(info), keyLength)
 +	}
-+	return hkdf.Expand(h, pseudorandomKey, info, keyLength)
+ 	return hkdf.Expand(h, pseudorandomKey, info, keyLength), nil
  }
 
- // Key derives a key from the given hash, secret, salt and context info,
-@@ -63,7 +70,14 @@ func Key[Hash hash.Hash](h func() Hash, secret, salt []byte, info string, keyLen
+@@ -63,6 +70,13 @@ func Key[Hash hash.Hash](h func() Hash, secret, salt []byte, info string, keyLen
  		return nil, errors.New("hkdf: requested key length too large")
  	}
 
--	return hkdf.Key(h, secret, salt, info, keyLength), nil
 +	if boring.Enabled && boring.SupportsHKDF() {
 +		pseudorandomKey, err := boring.ExtractHKDF(func() hash.Hash { return h() }, secret, salt)
 +		if err != nil {
 +			return nil, err
 +		}
 +		return boring.ExpandHKDF(func() hash.Hash { return h() }, pseudorandomKey, []byte(info), keyLength)
 +	}
-+	return hkdf.Key(h, secret, salt, info, keyLength)
+ 	return hkdf.Key(h, secret, salt, info, keyLength), nil
  }
 
- func checkFIPS140Only[H hash.Hash](h func() H, key []byte) error {
 diff --git a/src/crypto/hkdf/hkdf_test.go b/src/crypto/hkdf/hkdf_test.go
 index 201b440289bb2d..4ed4960ff35b66 100644
 --- a/src/crypto/hkdf/hkdf_test.go