1 files changed, 1 insertions, 39 deletions

diff --git a/Data/OpenPGP/Util/DecryptSecretKey.hs b/Data/OpenPGP/Util/DecryptSecretKey.hs
index a637b29..57dd8c3 100644
--- a/Data/OpenPGP/Util/DecryptSecretKey.hs
+++ b/Data/OpenPGP/Util/DecryptSecretKey.hs
@@ -27,6 +27,7 @@ import qualified Crypto.Cipher.AES as Vincent
 import qualified Crypto.Cipher.Blowfish as Vincent
 
 import qualified Crypto.Cipher.Types as Vincent
+import Data.OpenPGP.Util.Decrypt
 
 #if defined(VERSION_cryptonite)
 import qualified Data.ByteArray as Bytes
@@ -131,18 +132,6 @@ 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 -> 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)
-withS2K' OpenPGP.AES256   s2k s f = f (string2key s2k s :: Vincent.AES256)
-withS2K' OpenPGP.Blowfish s2k s f = f (string2key s2k s :: Vincent.Blowfish128)
-withS2K' OpenPGP.CAST5    s2k s f = f (string2key s2k s :: ThomasToVincent CAST5_128)
-
--- decryption codec for withS2K
-simpleUnCFB :: (Vincent.BlockCipher k) => k -> Vincent.IV k -> LZ.ByteString -> LZ.ByteString
-simpleUnCFB k iv = padThenUnpad k (toLazyBS . Vincent.cfbDecrypt k iv . toStrictBS)
-
 simpleCFB :: forall k g. (Vincent.BlockCipher k, RG g) => g -> k -> LZ.ByteString -> (LZ.ByteString, g)
 simpleCFB g k bs = ( padThenUnpad k (LZ.fromChunks . (ivbs:) . (:[]) . Vincent.cfbEncrypt k iv . toStrictBS) bs
                    , g' )
@@ -158,33 +147,6 @@ simpleCFB g k bs = ( padThenUnpad k (LZ.fromChunks . (ivbs:) . (:[]) . Vincent.c
     _ = Vincent.constEqBytes z iv
 #endif
 
--- Apply a function f to a zero-padded bytestring s to a multiple
--- of the blocksize for cyper k.
--- Then drop the same number of bytes from the result of f.
-padThenUnpad :: (Vincent.BlockCipher k) => k -> (LZ.ByteString -> LZ.ByteString) -> LZ.ByteString -> LZ.ByteString
-padThenUnpad k f s = dropPadEnd (f padded)
-    where
-        dropPadEnd s = LZ.take (LZ.length s - padAmount) s
-        padded = s `LZ.append` LZ.replicate padAmount 0
-        padAmount = blksize - (LZ.length s `mod` blksize)
-        blksize = fromIntegral $ Vincent.blockSize k
-
-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 $ maybe s (\s2k -> OpenPGP.string2key hashBySymbol s2k s) ms2k
-#else
-    cipher = Vincent.cipherInit k
-    Right k = Vincent.makeKey $ toStrictBS $
-        LZ.take ksize $ maybe s (\s2k -> OpenPGP.string2key hashBySymbol s2k s) ms2k
-#endif
-    ksize = case Vincent.cipherKeySize cipher of
-                Vincent.KeySizeFixed n -> fromIntegral n
-                Vincent.KeySizeEnum xs -> error $ "Unknown key size in string2key"
-                Vincent.KeySizeRange min max -> error $ "Unknown key size range in string2key"
-
 catchIO_ :: IO a -> IO a -> IO a
 catchIO_ a h = Exception.catch a (\(_ :: IOException) -> h)