From b5453e2f99a4b4f15bff45a19688e7006a3b9d20 Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Tue, 19 May 2020 11:56:49 -0400 Subject: Decrypt v5 secret keys. --- Data/OpenPGP/Util/DecryptSecretKey.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Data') diff --git a/Data/OpenPGP/Util/DecryptSecretKey.hs b/Data/OpenPGP/Util/DecryptSecretKey.hs index 753cef3..219b520 100644 --- a/Data/OpenPGP/Util/DecryptSecretKey.hs +++ b/Data/OpenPGP/Util/DecryptSecretKey.hs @@ -73,10 +73,10 @@ decryptSecretKey :: decryptSecretKey _ k@(OpenPGP.SecretKeyPacket { OpenPGP.symmetric_algorithm = OpenPGP.Unencrypted }) = Just k decryptSecretKey pass k@(OpenPGP.SecretKeyPacket { - OpenPGP.version = 4, OpenPGP.key_algorithm = kalgo, + OpenPGP.version = v, OpenPGP.key_algorithm = kalgo, OpenPGP.s2k = s2k, OpenPGP.symmetric_algorithm = salgo, OpenPGP.key = existing, OpenPGP.encrypted_data = encd - }) | chkF material == LZ.toStrict chk = -- TODO: v5 + }) | chkF material == LZ.toStrict chk && (v==4 || v==5) = fmap (\m -> k { OpenPGP.s2k_useage = 0, OpenPGP.symmetric_algorithm = OpenPGP.Unencrypted, -- cgit v1.2.3