Cv25519 encryption.

1 files changed, 8 insertions, 19 deletions

diff --git a/Data/OpenPGP/Util/DecryptSecretKey.hs b/Data/OpenPGP/Util/DecryptSecretKey.hs
index 1188f3e..a637b29 100644
--- a/Data/OpenPGP/Util/DecryptSecretKey.hs
+++ b/Data/OpenPGP/Util/DecryptSecretKey.hs
@@ -90,7 +90,7 @@ decryptSecretKey pass k@(OpenPGP.SecretKeyPacket {
         | OpenPGP.s2k_useage k == 254 = (20, sha1 . toStrictBS)
         | otherwise = (2, toStrictBS . encode . checksum . toStrictBS)
         -- Words16s are written as 2 bytes in big-endian (network) order
-    decd = withS2K simpleUnCFB salgo s2k (toLazyBS pass) (EncipheredWithIV encd)
+    decd = withS2K simpleUnCFB salgo (Just s2k) (toLazyBS pass) (EncipheredWithIV encd)
 
 #if defined(VERSION_cryptonite)
     sha1 x = Bytes.convert (hash x :: Digest SHA1)
@@ -122,7 +122,7 @@ maybeGet g bs = unsafePerformIO $
 
 withS2K :: (forall k. (Vincent.BlockCipher k) => k -> Vincent.IV k -> LZ.ByteString -> LZ.ByteString)
            -> OpenPGP.SymmetricAlgorithm
-           -> OpenPGP.S2K
+           -> Maybe OpenPGP.S2K
            -> LZ.ByteString -> Enciphered -> LZ.ByteString
 withS2K codec OpenPGP.AES128 s2k s   = withIV $ codec (string2key s2k s :: Vincent.AES128)
 withS2K codec OpenPGP.AES192 s2k s   = withIV $ codec (string2key s2k s :: Vincent.AES192)
@@ -131,7 +131,7 @@ withS2K codec OpenPGP.Blowfish s2k s = withIV $ codec (string2key s2k s :: Vince
 withS2K codec OpenPGP.CAST5 s2k s    = withIV $ codec (string2key s2k s :: ThomasToVincent CAST5_128)
 withS2K codec algo _ _ = error $ "Unsupported symmetric algorithm : " ++ show algo ++ " in Data.OpenPGP.CryptoAPI.withS2K"
 
-withS2K' :: OpenPGP.SymmetricAlgorithm -> OpenPGP.S2K -> LZ.ByteString
+withS2K' :: OpenPGP.SymmetricAlgorithm -> Maybe OpenPGP.S2K -> LZ.ByteString
             -> (forall b. Vincent.BlockCipher b => b -> x) -> x
 withS2K' OpenPGP.AES128   s2k s f = f (string2key s2k s :: Vincent.AES128)
 withS2K' OpenPGP.AES192   s2k s f = f (string2key s2k s :: Vincent.AES192)
@@ -169,27 +169,16 @@ padThenUnpad k f s = dropPadEnd (f padded)
         padAmount = blksize - (LZ.length s `mod` blksize)
         blksize = fromIntegral $ Vincent.blockSize k
 
-{-
-Data/OpenPGP/Util/DecryptSecretKey.hs:172:20:
-    Couldn't match expected type ‘k’
-                with actual type ‘cryptonite-0.15:Crypto.Error.Types.CryptoFailable
-                                    cipher0’
-      ‘k’ is a rigid type variable bound by
-          the type signature for
-            string2key :: Vincent.BlockCipher k =>
-                          OpenPGP.S2K -> LZ.ByteString -> k
-          at Data/OpenPGP/Util/DecryptSecretKey.hs:171:15
--}
-string2key :: (Vincent.BlockCipher k) => OpenPGP.S2K -> LZ.ByteString -> k
-string2key s2k s = cipher
+string2key :: (Vincent.BlockCipher k) => Maybe OpenPGP.S2K -> LZ.ByteString -> k
+string2key ms2k s = cipher
     where
 #if defined(VERSION_cryptonite)
     CryptoPassed cipher = Vincent.cipherInit k
-    k = toStrictBS $ LZ.take ksize $ OpenPGP.string2key hashBySymbol s2k s
+    k = toStrictBS $ LZ.take ksize $ maybe s (\s2k -> OpenPGP.string2key hashBySymbol s2k s) ms2k
 #else
     cipher = Vincent.cipherInit k
     Right k = Vincent.makeKey $ toStrictBS $
-        LZ.take ksize $ OpenPGP.string2key hashBySymbol s2k s
+        LZ.take ksize $ maybe s (\s2k -> OpenPGP.string2key hashBySymbol s2k s) ms2k
 #endif
     ksize = case Vincent.cipherKeySize cipher of
                 Vincent.KeySizeFixed n -> fromIntegral n
@@ -217,7 +206,7 @@ encryptSecretKey passphrase s2k salgo plain = do
         maybeToList $ lookup f (OpenPGP.key plain)
     chk = LZ.fromChunks [ chkF material ]
     decd = LZ.append material chk
-    encd g = fst $ withS2K' salgo s2k (toLazyBS passphrase) (simpleCFB g) decd
+    encd g = fst $ withS2K' salgo (Just s2k) (toLazyBS passphrase) (simpleCFB g) decd
 
     -- If the string-to-key usage octet is zero or 255, then a two-octet
     -- checksum of the plaintext of the algorithm-specific portion (sum