Split OpenPGP.Crypto out into a seperate package

5 files changed, 5 insertions, 60 deletions

diff --git a/tests/data/encryption-sym-aes256.gpg b/tests/data/encryption-sym-aes256.gpg
deleted file mode 100644
index 264ae11..0000000
--- a/tests/data/encryption-sym-aes256.gpg
+++ /dev/null
@@ -1 +0,0 @@
-�
     ��'6*�W`�V
�LE���Q�jNp(Y3��N*�?���!�M��*�*ۈ;�
hL�2�+��!x�̄�&&\J{q���<16.�-�D      ޿���
\ No newline at end of file
diff --git a/tests/data/encryption-sym-cast5.gpg b/tests/data/encryption-sym-cast5.gpg
deleted file mode 100644
index 2c552ac..0000000
--- a/tests/data/encryption-sym-cast5.gpg
+++ /dev/null
diff --git a/tests/data/encryption.gpg b/tests/data/encryption.gpg
deleted file mode 100644
index 9781572..0000000
--- a/tests/data/encryption.gpg
+++ /dev/null
diff --git a/tests/data/msg1.asc b/tests/data/msg1.asc
deleted file mode 100644
index 832d3bb..0000000
--- a/tests/data/msg1.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP MESSAGE-----
-Version: OpenPrivacy 0.99
-
-yDgBO22WxBHv7O8X7O/jygAEzol56iUKiXmV+XmpCtmpqQUKiQrFqclFqUDBovzS
-vBSFjNSiVHsuAA==
-=njUN
------END PGP MESSAGE-----
diff --git a/tests/suite.hs b/tests/suite.hs
index 7ea5e57..ad7a8f2 100644
--- a/tests/suite.hs
+++ b/tests/suite.hs
@@ -7,9 +7,7 @@ import Test.HUnit hiding (Test)
 import Data.Word
 import Data.Binary
 import qualified Data.OpenPGP as OpenPGP
-import qualified Data.OpenPGP.Crypto as OpenPGP
 import qualified Data.ByteString.Lazy as LZ
-import qualified Data.ByteString.Lazy.UTF8 as LZ (fromString)
 
 instance Arbitrary OpenPGP.HashAlgorithm where
         arbitrary = elements [OpenPGP.MD5, OpenPGP.SHA1, OpenPGP.SHA256, OpenPGP.SHA384, OpenPGP.SHA512]
@@ -18,8 +16,8 @@ testSerialization :: FilePath -> Assertion
 testSerialization fp = do
         bs <- LZ.readFile $ "tests/data/" ++ fp
         nullShield "First" (decode bs) (\firstpass ->
-                        nullShield "Second" (decode $ encode firstpass) (\secondpass ->
-                                assertEqual ("for " ++ fp) firstpass secondpass
+                        nullShield "Second" (decode $ encode firstpass) (
+                                assertEqual ("for " ++ fp) firstpass
                         )
                 )
         where
@@ -27,38 +25,12 @@ testSerialization fp = do
                 assertFailure $ pass ++ " pass of " ++ fp ++ " decoded to nothing."
         nullShield _ m f = f m
 
-testFingerprint :: FilePath -> String -> Assertion
-testFingerprint fp kf = do
-        bs <- LZ.readFile $ "tests/data/" ++ fp
-        let (OpenPGP.Message [packet]) = decode bs
-        assertEqual ("for " ++ fp) kf (OpenPGP.fingerprint packet)
-
-testVerifyMessage :: FilePath -> FilePath -> Assertion
-testVerifyMessage keyring message = do
-        keys <- fmap decode $ LZ.readFile $ "tests/data/" ++ keyring
-        m <- fmap decode $ LZ.readFile $ "tests/data/" ++ message
-        let verification = OpenPGP.verify keys m 0
-        assertEqual (keyring ++ " for " ++ message) True verification
-
-prop_sign_and_verify :: OpenPGP.Message -> String -> OpenPGP.HashAlgorithm -> String -> String -> Bool
-prop_sign_and_verify secring kid halgo filename msg =
-        let
-                m = OpenPGP.LiteralDataPacket {
-                        OpenPGP.format = 'u',
-                        OpenPGP.filename = filename,
-                        OpenPGP.timestamp = 12341234,
-                        OpenPGP.content = LZ.fromString msg
-                }
-                sig = OpenPGP.sign secring (OpenPGP.Message [m]) halgo kid 12341234
-        in
-                OpenPGP.verify secring (OpenPGP.Message [m,sig]) 0
-
 prop_s2k_count :: Word8 -> Bool
 prop_s2k_count c =
         c == OpenPGP.encode_s2k_count (OpenPGP.decode_s2k_count c)
 
-tests :: OpenPGP.Message -> [Test]
-tests secring =
+tests :: [Test]
+tests =
         [
                 testGroup "Serialization" [
                         testCase "000001-006.public_key" (testSerialization "000001-006.public_key"),
@@ -148,29 +120,10 @@ tests secring =
                         testCase "uncompressed-ops-dsa.gpg" (testSerialization "uncompressed-ops-dsa.gpg"),
                         testCase "uncompressed-ops-rsa.gpg" (testSerialization "uncompressed-ops-rsa.gpg")
                 ],
-                testGroup "Fingerprint" [
-                        testCase "000001-006.public_key" (testFingerprint "000001-006.public_key" "421F28FEAAD222F856C8FFD5D4D54EA16F87040E"),
-                        testCase "000016-006.public_key" (testFingerprint "000016-006.public_key" "AF95E4D7BAC521EE9740BED75E9F1523413262DC"),
-                        testCase "000027-006.public_key" (testFingerprint "000027-006.public_key" "1EB20B2F5A5CC3BEAFD6E5CB7732CF988A63EA86"),
-                        testCase "000035-006.public_key" (testFingerprint "000035-006.public_key" "CB7933459F59C70DF1C3FBEEDEDC3ECF689AF56D")
-                ],
-                testGroup "Message verification" [
-                        --testCase "uncompressed-ops-dsa" (testVerifyMessage "pubring.gpg" "uncompressed-ops-dsa.gpg"),
-                        --testCase "uncompressed-ops-dsa-sha384" (testVerifyMessage "pubring.gpg" "uncompressed-ops-dsa-sha384.txt.gpg"),
-                        testCase "uncompressed-ops-rsa" (testVerifyMessage "pubring.gpg" "uncompressed-ops-rsa.gpg"),
-                        testCase "compressedsig" (testVerifyMessage "pubring.gpg" "compressedsig.gpg"),
-                        testCase "compressedsig-zlib" (testVerifyMessage "pubring.gpg" "compressedsig-zlib.gpg"),
-                        testCase "compressedsig-bzip2" (testVerifyMessage "pubring.gpg" "compressedsig-bzip2.gpg")
-                ],
-                testGroup "Signing" [
-                        testProperty "Crypto signatures verify" (prop_sign_and_verify secring "FEF8AFA0F661C3EE")
-                ],
                 testGroup "S2K count" [
                         testProperty "S2K count encode reverses decode" prop_s2k_count
                 ]
         ]
 
 main :: IO ()
-main = do
-        secring <- fmap decode $ LZ.readFile "tests/data/secring.gpg"
-        defaultMain (tests secring)
+main = defaultMain tests