update hashTag functions to use PrepareVerify

openpgp/packet/public_key.go

@@ -849,7 +849,11 @@
 // VerifyKeyHashTag returns nil iff sig appears to be a plausible signature over this
 // primary key and subkey, based solely on its HashTag.
 func (pk *PublicKey) VerifyKeyHashTag(signed *PublicKey, sig *Signature) error {
-	h, err := keySignatureHash(pk, signed, sig.Hash)
+	preparedHash, err := sig.PrepareVerify()
+	if err != nil {
+		return err
+	}
+	h, err := keySignatureHash(pk, signed, preparedHash)
 	if err != nil {
 		return err
 	}
@@ -898,15 +902,19 @@
 func keyRevocationHash(pk signingKey, hashFunc hash.Hash) (err error) {
 	return pk.SerializeForHash(hashFunc)
 }
 
 // VerifyRevocationHashTag returns nil iff sig appears to be a plausible signature
 // over this public key, based solely on its HashTag.
 func (pk *PublicKey) VerifyRevocationHashTag(sig *Signature) (err error) {
-	h, err := keyRevocationHash(pk, sig.Hash)
+	preparedHash, err := sig.PrepareVerify()
 	if err != nil {
 		return err
 	}
-	return VerifyHashTag(h, sig)
+	err = keyRevocationHash(pk, preparedHash)
+	if err != nil {
+		return err
+	}
+	return VerifyHashTag(preparedHash, sig)
 }
 
 // VerifyRevocationSignature returns nil iff sig is a valid signature, made by this
@@ -960,7 +968,7 @@
 	return nil
 }
 
 // directKeySignatureHash returns a Hash of the message that needs to be signed.
 func directKeySignatureHash(pk *PublicKey, h hash.Hash) (err error) {
 	return pk.SerializeForHash(h)
 }
@@ -968,11 +976,15 @@
 // VerifyUserIdHashTag returns nil iff sig appears to be a plausible signature over this
 // public key and UserId, based solely on its HashTag
 func (pk *PublicKey) VerifyUserIdHashTag(id string, sig *Signature) (err error) {
-	h, err := userIdSignatureHash(id, pk, sig.Hash)
+	preparedHash, err := sig.PrepareVerify()
 	if err != nil {
 		return err
 	}
-	return VerifyHashTag(h, sig)
+	err = userIdSignatureHash(id, pk, preparedHash)
+	if err != nil {
+		return err
+	}
+	return VerifyHashTag(preparedHash, sig)
 }
 
 // VerifyUserIdSignature returns nil iff sig is a valid signature, made by this