Refactoring.

1 files changed, 2 insertions, 54 deletions

diff --git a/Data/OpenPGP/Util/Sign.hs b/Data/OpenPGP/Util/Sign.hs
index ef7d16b..e492f95 100644
--- a/Data/OpenPGP/Util/Sign.hs
+++ b/Data/OpenPGP/Util/Sign.hs
@@ -17,28 +17,8 @@ import qualified Crypto.Random as Vincent
 import qualified Crypto.PubKey.DSA as Vincent.DSA
 import qualified Crypto.PubKey.RSA as Vincent.RSA
 import qualified Crypto.PubKey.RSA.PKCS15 as Vincent.RSA
-import Crypto.PubKey.HashDescr as Vincent
-
-import Crypto.Hash.MD5 as MD5
-import Crypto.Hash.SHA1 as SHA1
-import Crypto.Hash.SHA256 as SHA256
-import Crypto.Hash.SHA384 as SHA384
-import Crypto.Hash.SHA512 as SHA512
-import Crypto.Hash.SHA224 as SHA224
-import Crypto.Hash.RIPEMD160 as RIPEMD160
-
-hashAlgoDesc OpenPGP.MD5       = Vincent.hashDescrMD5
-hashAlgoDesc OpenPGP.SHA1      = Vincent.hashDescrSHA1
-hashAlgoDesc OpenPGP.RIPEMD160 = Vincent.hashDescrRIPEMD160
-hashAlgoDesc OpenPGP.SHA256    = Vincent.hashDescrSHA256
-hashAlgoDesc OpenPGP.SHA384    = Vincent.hashDescrSHA384
-hashAlgoDesc OpenPGP.SHA512    = Vincent.hashDescrSHA512
-hashAlgoDesc OpenPGP.SHA224    = Vincent.hashDescrSHA224
-hashAlgoDesc _ =
-       error "Unsupported HashAlgorithm in hashAlgoDesc"
-
-find_key :: OpenPGP.Message -> String -> Maybe OpenPGP.Packet
-find_key = OpenPGP.find_key fingerprint
+
+import Data.OpenPGP.Util.Base
 
 
 privateDSAkey :: OpenPGP.Packet -> Vincent.DSA.PrivateKey
@@ -58,38 +38,6 @@ privateRSAkey k =
     q = keyParam 'q' k
     pubkey = rsaKey k
 
-rsaKey :: OpenPGP.Packet -> Vincent.RSA.PublicKey
-rsaKey k =
-    Vincent.RSA.PublicKey (integerBytesize n) n (keyParam 'e' k)
-    where
-    n = keyParam 'n' k
-
-integerBytesize :: Integer -> Int
-integerBytesize i = fromIntegral $ LZ.length (encode (OpenPGP.MPI i)) - 2
-
-
-toStrictBS :: LZ.ByteString -> BS.ByteString
-toStrictBS = BS.concat . LZ.toChunks
-
-toLazyBS :: BS.ByteString -> LZ.ByteString
-toLazyBS = LZ.fromChunks . (:[])
-
-
-keyParam :: Char -> OpenPGP.Packet -> Integer
-keyParam c k = fromJustMPI $ lookup c (OpenPGP.key k)
-fromJustMPI :: Maybe OpenPGP.MPI -> Integer
-fromJustMPI (Just (OpenPGP.MPI x)) = x
-fromJustMPI _ = error "Not a Just MPI, Data.OpenPGP.CryptoAPI"
-
-hashBySymbol OpenPGP.MD5 = MD5.hashlazy
-hashBySymbol OpenPGP.SHA1 = SHA1.hashlazy
-hashBySymbol OpenPGP.SHA256 = SHA256.hashlazy
-hashBySymbol OpenPGP.SHA384 = SHA384.hashlazy
-hashBySymbol OpenPGP.SHA512 = SHA512.hashlazy
-hashBySymbol OpenPGP.SHA224 = SHA224.hashlazy
-hashBySymbol OpenPGP.RIPEMD160 = RIPEMD160.hashlazy
-
-
 
 
 -- | Make a signature