Changeset 529

Timestamp:

01/30/08 14:10:41

Author:

rachel

Message:

Added tests for armoured decryption

Files:

• openpgpsdk/trunk/tests/test_rsa_decrypt.c (modified) (5 diffs)

openpgpsdk/trunk/tests/test_rsa_decrypt.c

@@ -167 +167 @@
-        }
-
-
-
-snprintf(cmd,MAXBUF,"gpg --quiet --no-tty --openpgp --encrypt --personal-cipher-preferences='CAST5' --armor --homedir=%s --recipient Alpha %s/%s", dir, dir, filename_rsa_armour_nopassphrase);
-if (system(cmd))
-{
-return 1;
-    }
-
-MAXBUF,"gpg --quiet --no-tty --openpgp --encrypt --s2k-cipher-algo CAST5 --homedir=%s
-
-
-
-
-
-snprintf(cmd,MAXBUF,"gpg --quiet --no-tty --openpgp --encrypt --s2k-cipher-algo CAST5 --armor --homedir=%s --recipient Bravo %s/%s", dir, dir, filename_rsa_armour_passphrase);
-if (system(cmd))
-    {
-return 1;
-}
-
-
+
+
+if (system(cmd))
+    {
+return 1;
+}
+
+// No armour, passphrase
+sizeof cmd,"gpg --quiet --no-tty --homedir=%s --force-mdc --compress-level 0 --personal-cipher-preferences='CAST5' --encrypt
+
+
+
+
+
+// Armour, passphrase
+snprintf(cmd,sizeof cmd,"gpg --quiet --no-tty --homedir=%s --force-mdc --compress-level 0 --personal-cipher-preferences='CAST5' --encrypt --armor --recipient Bravo %s/%s", dir, dir, filename_rsa_armour_passphrase);
+if (system(cmd))
+{
+return 1;
+
+
-    // Return success
-    return 0;
@@ -308 +308 @@
-//
-
-#ifdef TODO
-static void test_rsa_decrypt_armour_nopassphrase(void)
-    {
@@ -329 +328 @@
-    test_rsa_decrypt(armour,passphrase,filename_rsa_armour_passphrase,NULL);
-    }
-#endif
-
-static void test_todo(void)
-    {
-    CU_FAIL("Test TODO: IDEA");
-    CU_FAIL("Test TODO: Armoured decryption (with&without passphrase)");
-    CU_FAIL("Test TODO: Decryption with multiple keys in same keyring");
-    CU_FAIL("Test TODO: Decryption with multiple keys where some are not in my keyring");
@@ -340 +337 @@
-    }
-
+static int add_tests(CU_pSuite suite)
+    {
+    // add tests to suite
+    
+    if (NULL == CU_add_test(suite, "Unarmoured, no passphrase (Default)", test_rsa_decrypt_noarmour_nopassphrase))
+            return 0;
+    
+    if (NULL == CU_add_test(suite, "Unarmoured, no passphrase (CAST5)", test_rsa_decrypt_noarmour_nopassphrase_cast5))
+            return 0;
+    
+    if (NULL == CU_add_test(suite, "Unarmoured, no passphrase (AES128)", test_rsa_decrypt_noarmour_nopassphrase_aes128))
+            return 0;
+    
+    if (NULL == CU_add_test(suite, "Unarmoured, no passphrase (AES256)", test_rsa_decrypt_noarmour_nopassphrase_aes256))
+            return 0;
+    
+    if (NULL == CU_add_test(suite, "Unarmoured, no passphrase (3DES)", test_rsa_decrypt_noarmour_nopassphrase_3des))
+            return 0;
+    
+    if (NULL == CU_add_test(suite, "Unarmoured, passphrase", test_rsa_decrypt_noarmour_passphrase))
+            return 0;
+    
+    if (NULL == CU_add_test(suite, "Armoured, no passphrase", test_rsa_decrypt_armour_nopassphrase))
+            return 0;
+    
+    if (NULL == CU_add_test(suite, "Armoured, passphrase", test_rsa_decrypt_armour_passphrase))
+            return 0;
+    
+    if (NULL == CU_add_test(suite, "Tests to be implemented", test_todo))
+            return 0;
+    
+    return 1;
+    }
+
-CU_pSuite suite_rsa_decrypt()
-{
@@ -348 +379 @@
-            return NULL;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    return suite;
-}