diff options
| author | cui fliter <imcusg@gmail.com> | 2022-10-04 14:41:15 +0000 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2022-10-05 02:52:14 +0000 |
| commit | 4161e89ecf1b4f3413a75e017ee689d0c5a3192a (patch) | |
| tree | 40f20cfa85e475fed9a98c777c8e07d38158086c | |
| parent | eccd6366d1be82f8df741718dcdd586eea618221 (diff) | |
| download | go-x-crypto-4161e89ecf1b4f3413a75e017ee689d0c5a3192a.tar.xz | |
all: replace bytes.Compare with bytes.Equal
Change-Id: I911366b91ff2a1d02d7de202a166d876fb873142
GitHub-Last-Rev: f50e00376856fb9da36bb98ed0cdfd96c2f3b304
GitHub-Pull-Request: golang/crypto#233
Reviewed-on: https://go-review.googlesource.com/c/crypto/+/438536
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Run-TryBot: Ian Lance Taylor <iant@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
| -rw-r--r-- | pkcs12/crypto.go | 2 | ||||
| -rw-r--r-- | ssh/agent/client.go | 2 | ||||
| -rw-r--r-- | ssh/certs.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkcs12/crypto.go b/pkcs12/crypto.go index 484ca51..96f4a1a 100644 --- a/pkcs12/crypto.go +++ b/pkcs12/crypto.go @@ -117,7 +117,7 @@ func pbDecrypt(info decryptable, password []byte) (decrypted []byte, err error) } ps := decrypted[len(decrypted)-psLen:] decrypted = decrypted[:len(decrypted)-psLen] - if bytes.Compare(ps, bytes.Repeat([]byte{byte(psLen)}, psLen)) != 0 { + if !bytes.Equal(ps, bytes.Repeat([]byte{byte(psLen)}, psLen)) { return nil, ErrDecryption } diff --git a/ssh/agent/client.go b/ssh/agent/client.go index eb6bc71..a2fa36f 100644 --- a/ssh/agent/client.go +++ b/ssh/agent/client.go @@ -731,7 +731,7 @@ func (c *client) insertCert(s interface{}, cert *ssh.Certificate, comment string if err != nil { return err } - if bytes.Compare(cert.Key.Marshal(), signer.PublicKey().Marshal()) != 0 { + if !bytes.Equal(cert.Key.Marshal(), signer.PublicKey().Marshal()) { return errors.New("agent: signer and cert have different public key") } diff --git a/ssh/certs.go b/ssh/certs.go index 4600c20..fc04d03 100644 --- a/ssh/certs.go +++ b/ssh/certs.go @@ -251,7 +251,7 @@ type algorithmOpenSSHCertSigner struct { // private key is held by signer. It returns an error if the public key in cert // doesn't match the key used by signer. func NewCertSigner(cert *Certificate, signer Signer) (Signer, error) { - if bytes.Compare(cert.Key.Marshal(), signer.PublicKey().Marshal()) != 0 { + if !bytes.Equal(cert.Key.Marshal(), signer.PublicKey().Marshal()) { return nil, errors.New("ssh: signer and cert have different public key") } |
