diff options
Diffstat (limited to 'src/crypto/rsa')
-rw-r--r-- | src/crypto/rsa/boring.go | 25 | ||||
-rw-r--r-- | src/crypto/rsa/boring_test.go | 45 | ||||
-rw-r--r-- | src/crypto/rsa/rsa.go | 5 |
3 files changed, 38 insertions, 37 deletions
diff --git a/src/crypto/rsa/boring.go b/src/crypto/rsa/boring.go index 362e9307f8..fc2842fb34 100644 --- a/src/crypto/rsa/boring.go +++ b/src/crypto/rsa/boring.go @@ -10,18 +10,13 @@ import ( "crypto/internal/boring" "crypto/internal/boring/bbig" "math/big" - "sync/atomic" "unsafe" ) // Cached conversions from Go PublicKey/PrivateKey to BoringCrypto. // -// A new 'boring atomic.Value' field in both PublicKey and PrivateKey -// serves as a cache for the most recent conversion. The cache is an -// atomic.Value because code might reasonably set up a key and then -// (thinking it immutable) use it from multiple goroutines simultaneously. -// The first operation initializes the cache; if there are multiple simultaneous -// first operations, they will do redundant work but not step on each other. +// The first operation on a PublicKey or PrivateKey makes a parallel +// BoringCrypto key and saves it in pubCache or privCache. // // We could just assume that once used in a sign/verify/encrypt/decrypt operation, // a particular key is never again modified, but that has not been a @@ -36,8 +31,16 @@ type boringPub struct { orig PublicKey } +var pubCache boring.Cache +var privCache boring.Cache + +func init() { + pubCache.Register() + privCache.Register() +} + func boringPublicKey(pub *PublicKey) (*boring.PublicKeyRSA, error) { - b := (*boringPub)(atomic.LoadPointer(&pub.boring)) + b := (*boringPub)(pubCache.Get(unsafe.Pointer(pub))) if b != nil && publicKeyEqual(&b.orig, pub) { return b.key, nil } @@ -49,7 +52,7 @@ func boringPublicKey(pub *PublicKey) (*boring.PublicKeyRSA, error) { return nil, err } b.key = key - atomic.StorePointer(&pub.boring, unsafe.Pointer(b)) + pubCache.Put(unsafe.Pointer(pub), unsafe.Pointer(b)) return key, nil } @@ -59,7 +62,7 @@ type boringPriv struct { } func boringPrivateKey(priv *PrivateKey) (*boring.PrivateKeyRSA, error) { - b := (*boringPriv)(atomic.LoadPointer(&priv.boring)) + b := (*boringPriv)(privCache.Get(unsafe.Pointer(priv))) if b != nil && privateKeyEqual(&b.orig, priv) { return b.key, nil } @@ -83,7 +86,7 @@ func boringPrivateKey(priv *PrivateKey) (*boring.PrivateKeyRSA, error) { return nil, err } b.key = key - atomic.StorePointer(&priv.boring, unsafe.Pointer(b)) + privCache.Put(unsafe.Pointer(priv), unsafe.Pointer(b)) return key, nil } diff --git a/src/crypto/rsa/boring_test.go b/src/crypto/rsa/boring_test.go index 1373da9937..6223244283 100644 --- a/src/crypto/rsa/boring_test.go +++ b/src/crypto/rsa/boring_test.go @@ -13,13 +13,10 @@ import ( "crypto" "crypto/rand" "encoding/asn1" - "reflect" "runtime" "runtime/debug" "sync" - "sync/atomic" "testing" - "unsafe" ) func TestBoringASN1Marshal(t *testing.T) { @@ -27,28 +24,12 @@ func TestBoringASN1Marshal(t *testing.T) { if err != nil { t.Fatal(err) } - // This used to fail, because of the unexported 'boring' field. - // Now the compiler hides it [sic]. _, err = asn1.Marshal(k.PublicKey) if err != nil { t.Fatal(err) } } -func TestBoringDeepEqual(t *testing.T) { - k, err := GenerateKey(rand.Reader, 128) - if err != nil { - t.Fatal(err) - } - k.boring = nil // probably nil already but just in case - k2 := *k - k2.boring = unsafe.Pointer(k) // anything not nil, for this test - if !reflect.DeepEqual(k, &k2) { - // compiler should be hiding the boring field from reflection - t.Fatalf("DeepEqual compared boring fields") - } -} - func TestBoringVerify(t *testing.T) { // Check that signatures that lack leading zeroes don't verify. key := &PublicKey{ @@ -73,6 +54,28 @@ func TestBoringVerify(t *testing.T) { } } +func BenchmarkBoringVerify(b *testing.B) { + // Check that signatures that lack leading zeroes don't verify. + key := &PublicKey{ + N: bigFromHex("c4fdf7b40a5477f206e6ee278eaef888ca73bf9128a9eef9f2f1ddb8b7b71a4c07cfa241f028a04edb405e4d916c61d6beabc333813dc7b484d2b3c52ee233c6a79b1eea4e9cc51596ba9cd5ac5aeb9df62d86ea051055b79d03f8a4fa9f38386f5bd17529138f3325d46801514ea9047977e0829ed728e68636802796801be1"), + E: 65537, + } + + hash := fromHex("019c5571724fb5d0e47a4260c940e9803ba05a44") + + // signature is one byte shorter than key.N. + sig := fromHex("5edfbeb6a73e7225ad3cc52724e2872e04260d7daf0d693c170d8c4b243b8767bc7785763533febc62ec2600c30603c433c095453ede59ff2fcabeb84ce32e0ed9d5cf15ffcbc816202b64370d4d77c1e9077d74e94a16fb4fa2e5bec23a56d7a73cf275f91691ae1801a976fcde09e981a2f6327ac27ea1fecf3185df0d56") + + b.ReportAllocs() + + for i := 0; i < b.N; i++ { + err := VerifyPKCS1v15(key, crypto.SHA1, hash, sig) + if err == nil { + b.Fatalf("sha1: expected verification error") + } + } +} + func TestBoringGenerateKey(t *testing.T) { k, err := GenerateKey(rand.Reader, 2048) // 2048 is smallest size BoringCrypto might kick in for if err != nil { @@ -103,8 +106,8 @@ func TestBoringFinalizers(t *testing.T) { // about 30 iterations. defer debug.SetGCPercent(debug.SetGCPercent(10)) for n := 0; n < 200; n++ { - // Clear the underlying BoringCrypto object. - atomic.StorePointer(&k.boring, nil) + // Clear the underlying BoringCrypto object cache. + privCache.Clear() // Race to create the underlying BoringCrypto object. // The ones that lose the race are prime candidates for diff --git a/src/crypto/rsa/rsa.go b/src/crypto/rsa/rsa.go index e084be15cc..c941124fb2 100644 --- a/src/crypto/rsa/rsa.go +++ b/src/crypto/rsa/rsa.go @@ -34,7 +34,6 @@ import ( "io" "math" "math/big" - "unsafe" ) var bigZero = big.NewInt(0) @@ -44,8 +43,6 @@ var bigOne = big.NewInt(1) type PublicKey struct { N *big.Int // modulus E int // public exponent - - boring unsafe.Pointer } // Any methods implemented on PublicKey might need to also be implemented on @@ -109,8 +106,6 @@ type PrivateKey struct { // Precomputed contains precomputed values that speed up private // operations, if available. Precomputed PrecomputedValues - - boring unsafe.Pointer } // Public returns the public key corresponding to priv. |