Some fixes for signature verification

2 files changed, 23 insertions, 5 deletions

diff --git a/Data/OpenPGP/Crypto.hs b/Data/OpenPGP/Crypto.hs
index c213651..f9d1074 100644
--- a/Data/OpenPGP/Crypto.hs
+++ b/Data/OpenPGP/Crypto.hs
@@ -40,13 +40,16 @@ find_key (OpenPGP.Message (x@(OpenPGP.PublicKeyPacket {}):xs)) keyid =
         find_key_ x xs keyid
 find_key (OpenPGP.Message (x@(OpenPGP.SecretKeyPacket {}):xs)) keyid =
         find_key_ x xs keyid
+find_key (OpenPGP.Message (_:xs)) keyid =
+        find_key (OpenPGP.Message xs) keyid
 find_key _ _ = Nothing
 
 find_key_ :: OpenPGP.Packet -> [OpenPGP.Packet] -> String -> Maybe OpenPGP.Packet
-find_key_ x xs keyid =
-        if thisid == keyid then Just x else find_key (OpenPGP.Message xs) keyid
-        where thisid = reverse $
-                take (length keyid) (reverse (fingerprint x))
+find_key_ x xs keyid
+        | thisid == keyid = Just x
+        | otherwise = find_key (OpenPGP.Message xs) keyid
+        where
+        thisid = reverse $ take (length keyid) (reverse (fingerprint x))
 
 keyfield_as_octets :: OpenPGP.Packet -> Char -> [Word8]
 keyfield_as_octets k f =
@@ -65,7 +68,7 @@ emsa_pkcs1_v1_5_hash_padding _ =
 
 hash :: OpenPGP.HashAlgorithm -> [Word8] -> [Word8]
 hash OpenPGP.MD5 = MD5.hash
-hash OpenPGP.SHA1 = reverse . drop 2 . LZ.unpack . encode . OpenPGP.MPI . SHA1.toInteger . SHA1.hash
+hash OpenPGP.SHA1 = drop 2 . LZ.unpack . encode . OpenPGP.MPI . SHA1.toInteger . SHA1.hash
 hash OpenPGP.SHA256 = SHA256.hash
 hash OpenPGP.SHA384 = SHA384.hash
 hash OpenPGP.SHA512 = SHA512.hash
diff --git a/tests/suite.hs b/tests/suite.hs
index 59b9c03..d1b232c 100644
--- a/tests/suite.hs
+++ b/tests/suite.hs
@@ -29,6 +29,13 @@ testFingerprint fp kf = do
         let (OpenPGP.Message [packet]) = decode bs
         assertEqual ("for " ++ fp) kf (OpenPGP.fingerprint packet)
 
+testVerifyMessage :: FilePath -> FilePath -> Assertion
+testVerifyMessage keyring message = do
+        keys <- fmap decode $ LZ.readFile $ "tests/data/" ++ keyring
+        m <- fmap decode $ LZ.readFile $ "tests/data/" ++ message
+        let verification = OpenPGP.verify keys m 0
+        assertEqual (keyring ++ " for " ++ message) True verification
+
 prop_s2k_count :: Word8 -> Bool
 prop_s2k_count c =
         c == OpenPGP.encode_s2k_count (OpenPGP.decode_s2k_count c)
@@ -130,6 +137,14 @@ tests =
                         testCase "000027-006.public_key" (testFingerprint "000027-006.public_key" "1EB20B2F5A5CC3BEAFD6E5CB7732CF988A63EA86"),
                         testCase "000035-006.public_key" (testFingerprint "000035-006.public_key" "CB7933459F59C70DF1C3FBEEDEDC3ECF689AF56D")
                 ],
+                testGroup "Message verification group" [
+                        --testCase "uncompressed-ops-dsa" (testVerifyMessage "pubring.gpg" "uncompressed-ops-dsa.gpg"),
+                        --testCase "uncompressed-ops-dsa-sha384" (testVerifyMessage "pubring.gpg" "uncompressed-ops-dsa-sha384.txt.gpg"),
+                        testCase "uncompressed-ops-rsa" (testVerifyMessage "pubring.gpg" "uncompressed-ops-rsa.gpg"),
+                        testCase "compressedsig" (testVerifyMessage "pubring.gpg" "compressedsig.gpg"),
+                        testCase "compressedsig-zlib" (testVerifyMessage "pubring.gpg" "compressedsig-zlib.gpg"),
+                        testCase "compressedsig-bzip2" (testVerifyMessage "pubring.gpg" "compressedsig-bzip2.gpg")
+                ],
                 testGroup "S2K count" [
                         testProperty "S2K count encode reverses decode" prop_s2k_count
                 ]