hOpenPGP 0.10.1 → 0.10.2

raw patch · 3 files changed

+10/−10 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Codec/Encryption/OpenPGP/Serialize.hs +1/−1
• Data/Conduit/OpenPGP/Keyring.hs +7/−7
• hOpenPGP.cabal +2/−2

@@ -218,7 +218,7 @@                        return $ SigSubPacket crit (PreferredKeyServer pks)             | pt == 25 = do                        primacy <- get-                       return $ SigSubPacket crit (PreferredKeyServer primacy)+                       return $ SigSubPacket crit (PrimaryUserId primacy)             | pt == 26 = do                        url <- getByteString (l - 1)                        return $ SigSubPacket crit (PolicyURL url)

@@ -59,8 +59,8 @@                        ((UAts, Just (TK pkp Nothing revs uids uats subs)), PublicKeyPkt p) -> ((Revs, Just (TK p Nothing [] [] [] [])), [TK pkp Nothing revs uids uats subs])                        ((Subs, Just (TK pkp Nothing revs uids uats subs)), PublicSubkeyPkt p) -> ((Subs, Just (TK pkp Nothing revs uids uats (subs ++ [(PublicSubkeyPkt p, SigVOther 0 B.empty, Nothing)]))), [])                        ((Subs, Just (TK pkp Nothing revs uids uats subs)), SignaturePkt sp) -> case sType sp of-                                                                                SubkeyBindingSig -> ((Subs, Just (TK pkp Nothing revs uids uats (setBSig sp subs))), [])-                                                                                SubkeyRevocationSig -> ((Subs, Just (TK pkp Nothing revs uids uats (setRSig sp subs))), [])+                                                                                Just SubkeyBindingSig -> ((Subs, Just (TK pkp Nothing revs uids uats (setBSig sp subs))), [])+                                                                                Just SubkeyRevocationSig -> ((Subs, Just (TK pkp Nothing revs uids uats (setRSig sp subs))), [])                                                                                 _ -> dropOrError intolerant s $ "Unexpected subkey sig: " ++ show (fst s) ++ "/" ++ show i                        ((Subs, Just (TK pkp Nothing revs uids uats subs)), PublicKeyPkt p) -> ((Revs, Just (TK p Nothing [] [] [] [])), [TK pkp Nothing revs uids uats subs])                        ((Revs, Just (TK pkp mska revs uids uats subs)), SignaturePkt sp) -> ((Revs, Just (TK pkp mska (revs ++ [sp]) uids uats subs)), [])@@ -77,8 +77,8 @@                        ((UAts, Just (TK pkp mska revs uids uats subs)), SecretKeyPkt p ss) -> ((Revs, Just (TK p (Just ss) [] [] [] [])), [TK pkp mska revs uids uats subs])                        ((Subs, Just (TK pkp mska revs uids uats subs)), SecretSubkeyPkt p ss) -> ((Subs, Just (TK pkp mska revs uids uats (subs ++ [(SecretSubkeyPkt p ss, SigVOther 0 B.empty, Nothing)]))), [])                        ((Subs, Just (TK pkp mska revs uids uats subs)), SignaturePkt sp) -> case sType sp of-                                                                                SubkeyBindingSig -> ((Subs, Just (TK pkp mska revs uids uats (setBSig sp subs))), [])-                                                                                SubkeyRevocationSig -> ((Subs, Just (TK pkp mska revs uids uats (setRSig sp subs))), [])+                                                                                Just SubkeyBindingSig -> ((Subs, Just (TK pkp mska revs uids uats (setBSig sp subs))), [])+                                                                                Just SubkeyRevocationSig -> ((Subs, Just (TK pkp mska revs uids uats (setRSig sp subs))), [])                                                                                 _ -> dropOrError intolerant s $ "Unexpected subkey sig: " ++ show (fst s) ++ "/" ++ show i                        ((Subs, Just (TK pkp mska revs uids uats subs)), SecretKeyPkt p sk) -> ((Revs, Just (TK p (Just sk) [] [] [] [])), [TK pkp mska revs uids uats subs])                        ((_,_), TrustPkt _) -> (s, [])@@ -87,9 +87,9 @@         addUAtSig s uats = init uats ++ [(\(u, us) -> (u, us ++ [s])) (last uats)]         setBSig s subs = init subs ++ [(\(p, _, r) -> (p, s, r)) (last subs)]         setRSig s subs = init subs ++ [(\(p, b, _) -> (p, b, Just s)) (last subs)]-        sType (SigV3 st _ _ _ _ _ _) = st-        sType (SigV4 st _ _ _ _ _ _) = st-        sType _ = error "This should never happen."+        sType (SigV3 st _ _ _ _ _ _) = Just st+        sType (SigV4 st _ _ _ _ _ _) = Just st+        sType _ = Nothing -- this includes v2 sigs, which don't seem to be specified in the RFCs but exist in the wild         dropOrError :: Bool -> (Phase, Maybe TK) -> String -> ((Phase, Maybe TK), [TK])         dropOrError True _ e = error e         dropOrError False s _ = (s, [])

@@ -1,5 +1,5 @@ Name:                hOpenPGP-Version:             0.10.1+Version:             0.10.2 Synopsis:            native Haskell implementation of OpenPGP (RFC4880) Description:         native Haskell implementation of OpenPGP (RFC4880) Homepage:            http://floss.scru.org/hOpenPGP/@@ -233,4 +233,4 @@ source-repository this   type:     git   location: git://git.debian.org/users/clint/hOpenPGP.git-  tag:      v0.10.1+  tag:      v0.10.2