1 files changed, 8 insertions, 3 deletions

diff --git a/vendor/golang.org/x/crypto/openpgp/packet/public_key.go b/vendor/golang.org/x/crypto/openpgp/packet/public_key.go
index ead2623..fcd5f52 100644
--- a/vendor/golang.org/x/crypto/openpgp/packet/public_key.go
+++ b/vendor/golang.org/x/crypto/openpgp/packet/public_key.go
@@ -244,7 +244,12 @@ func NewECDSAPublicKey(creationTime time.Time, pub *ecdsa.PublicKey) *PublicKey
         }
 
         pk.ec.p.bytes = elliptic.Marshal(pub.Curve, pub.X, pub.Y)
-        pk.ec.p.bitLength = uint16(8 * len(pk.ec.p.bytes))
+
+        // The bit length is 3 (for the 0x04 specifying an uncompressed key)
+        // plus two field elements (for x and y), which are rounded up to the
+        // nearest byte. See https://tools.ietf.org/html/rfc6637#section-6
+        fieldBytes := (pub.Curve.Params().BitSize + 7) & ^7
+        pk.ec.p.bitLength = uint16(3 + fieldBytes + fieldBytes)
 
         pk.setFingerPrintAndKeyId()
         return pk
@@ -515,7 +520,7 @@ func (pk *PublicKey) VerifySignature(signed hash.Hash, sig *Signature) (err erro
         switch pk.PubKeyAlgo {
         case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
                 rsaPublicKey, _ := pk.PublicKey.(*rsa.PublicKey)
-                err = rsa.VerifyPKCS1v15(rsaPublicKey, sig.Hash, hashBytes, sig.RSASignature.bytes)
+                err = rsa.VerifyPKCS1v15(rsaPublicKey, sig.Hash, hashBytes, padToKeySize(rsaPublicKey, sig.RSASignature.bytes))
                 if err != nil {
                         return errors.SignatureError("RSA verification failure")
                 }
@@ -566,7 +571,7 @@ func (pk *PublicKey) VerifySignatureV3(signed hash.Hash, sig *SignatureV3) (err
         switch pk.PubKeyAlgo {
         case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
                 rsaPublicKey := pk.PublicKey.(*rsa.PublicKey)
-                if err = rsa.VerifyPKCS1v15(rsaPublicKey, sig.Hash, hashBytes, sig.RSASignature.bytes); err != nil {
+                if err = rsa.VerifyPKCS1v15(rsaPublicKey, sig.Hash, hashBytes, padToKeySize(rsaPublicKey, sig.RSASignature.bytes)); err != nil {
                         return errors.SignatureError("RSA verification failure")
                 }
                 return