Changeset 525

Timestamp:

12/10/07 17:51:16

Author:

rachel

Message:

Combined GPG tests and OPS tests into one.
Enforced use of --openpgp flag when using gpg.
Added in new tests to be written.

Files:

• openpgpsdk/trunk/tests/Makefile.template (modified) (1 diff)
• openpgpsdk/trunk/tests/test_common.c (modified) (1 diff)
• openpgpsdk/trunk/tests/test_rsa_encrypt.c (modified) (7 diffs)
• openpgpsdk/trunk/tests/test_rsa_signature.c (modified) (13 diffs)
• openpgpsdk/trunk/tests/test_rsa_verify.c (modified) (9 diffs)

openpgpsdk/trunk/tests/Makefile.template

@@ -21 +21 @@
-TESTOBJ= $(TESTSRC:.c=.o)
-
-
-
-
-
+
-
-tests: $(CUNIT_LIB) $(TESTOBJ) $(COMMONTESTOBJ) $(LIBDEPS)
-        $(CC) $(LDFLAGS) -o tests $(TESTOBJ) $(COMMONTESTOBJ) $(LIBS)
-
-tests_gpg: $(CUNIT_LIB) $(GPGTESTOBJ) $(COMMONTESTOBJ) $(LIBDEPS)
-        $(CC) $(LDFLAGS) -o tests_gpg $(GPGTESTOBJ) $(COMMONTESTOBJ) $(LIBS)
-
-$(CUNIT_LIB):

openpgpsdk/trunk/tests/test_common.c

@@ -49 +49 @@
-
-    assert(strlen(dir));
-
+ --openpgp
-
-    setup_test_keys();

openpgpsdk/trunk/tests/test_rsa_encrypt.c

@@ -11 +11 @@
-
-#include "tests.h"
-
-static int do_gpgtest=0;
-
-static char *filename_rsa_noarmour_nopassphrase_singlekey="enc_rsa_noarmour_np_singlekey.txt";
@@ -86 +84 @@
-int init_suite_rsa_encrypt(void)
-    {
-    do_gpgtest=0;
-
-    // Create RSA test files
-
@@ -99 +95 @@
-
-    // Return success
-    return 0;
-    }
-
-int init_suite_rsa_encrypt_gpgtest(void)
-    {
-    init_suite_rsa_encrypt();
-
-    do_gpgtest=1;
-
-    return 0;
-    }
@@ -170 +157 @@
-    char decrypted_file[MAXBUF+1];
-    char *suffix= has_armour ? "asc" : "gpg";
-
+//    
-    int fd_in=0;
-    int fd_out=0;
@@ -197 +184 @@
-        }
-    
-%s.%s",dir,gpgtest
+.%s",dir
-#ifdef WIN32
-    fd_out=open(encrypted_file,O_WRONLY | O_CREAT | O_EXCL | O_BINARY, 0600);
@@ -258 +245 @@
-     */
-
-
-
-
+
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        
-
-
-
+
+
-    }
-
@@ -359 +341 @@
-    }
-
-CU_pSuite suite_rsa_encrypt_GPGtest()
-    {
-    CU_pSuite suite = NULL;
-
-    suite = CU_add_suite("RSA Encryption Suite (GPG interoperability)", init_suite_rsa_encrypt_gpgtest, clean_suite_rsa_encrypt);
-
-    if (!suite)
-            return NULL;
-
-    if (!add_tests(suite))
-        return NULL;
-
-    return suite;
-    }
-
-// EOF

openpgpsdk/trunk/tests/test_rsa_signature.c

@@ -18 +18 @@
-
-static int debug=0;
-static int do_gpgtest=0;
-
-static char *filename_rsa_noarmour_nopassphrase="ops_rsa_signed_noarmour_nopassphrase.txt";
@@ -24 +23 @@
-static char *filename_rsa_armour_nopassphrase="ops_rsa_signed_armour_nopassphrase.txt";
-static char *filename_rsa_armour_passphrase="ops_rsa_signed_armour_passphrase.txt";
+static char *filename_rsa_clearsign_nopassphrase="ops_rsa_signed_clearsign_nopassphrase.txt";
+static char *filename_rsa_clearsign_passphrase="ops_rsa_signed_clearsign_passphrase.txt";
-
-/* Signature suite initialization.
@@ -32 +33 @@
-int init_suite_rsa_signature(void)
-    {
-    do_gpgtest=0;
-
-    // Create test files
-
@@ -40 +39 @@
-    create_testfile(filename_rsa_armour_nopassphrase);
-    create_testfile(filename_rsa_armour_passphrase);
+    create_testfile(filename_rsa_clearsign_nopassphrase);
+    create_testfile(filename_rsa_clearsign_passphrase);
-
-    // Return success
@@ -45 +46 @@
-    }
-
-init_suite_rsa_signature_gpgtest
-
-init_suite_rsa_signature
-
-do_gpgtest=1
+clean_suite_rsa_signature
+
+ops_finish
+
+reset_vars()
-
-    return 0;
-    }
-
-
-
-
-
-
-
-
-
-
-
+
-    {
-    unsigned char keyid[OPS_KEY_ID_SIZE];
@@ -71 +63 @@
-    char myfile[MAXBUF+1];
-    char signed_file[MAXBUF+1];
-
+
+
-    int fd_in=0;
-    int fd_out=0;
@@ -106 +99 @@
-    // OPS code armours signatures by default
-
-
+//    
-    
-    // set up signature
@@ -189 +182 @@
-    // Set up armour/passphrase options
-    
-
+//    
-        ops_reader_push_dearmour(pinfo,ops_false,ops_false,ops_false);
-    //    current_passphrase=has_passphrase ? passphrase : nopassphrase;
@@ -200 +193 @@
-    
-    // Tidy up
-
+//    
-        ops_reader_pop_dearmour(pinfo);
-    
@@ -217 +210 @@
-    }
-
-
-
+
+
+
+
+
-    int armour=0;
-    assert(pub_keyring.nkeys);
@@ -229 +225 @@
-    test_rsa_signature(armour,filename_rsa_noarmour_nopassphrase, alpha_skey, OPS_HASH_SHA512);
-#endif
-
-
-
-
+
+
+
+
+
+
+
-    int armour=0;
-    assert(pub_keyring.nkeys);
-    test_rsa_signature(armour,filename_rsa_noarmour_passphrase, bravo_skey, OPS_HASH_SHA1);
-
-
-
-
+
+
+
+
+
+
+
-    int armour=1;
-    assert(pub_keyring.nkeys);
-    test_rsa_signature(armour,filename_rsa_armour_nopassphrase, alpha_skey, OPS_HASH_SHA1);
-
-
-
-
+
+
+
+
+
+
+
-    int armour=1;
-    assert(pub_keyring.nkeys);
-    test_rsa_signature(armour,filename_rsa_armour_passphrase, bravo_skey, OPS_HASH_SHA1);
+#endif
+    }
+
+static void test_rsa_signature_clearsign_nopassphrase(void)
+    {
+    assert(pub_keyring.nkeys);
+    test_rsa_signature_clearsign(filename_rsa_armour_nopassphrase, alpha_skey, OPS_HASH_SHA1);
+    }
+
+static void test_rsa_signature_clearsign_passphrase(void)
+    {
+    assert(pub_keyring.nkeys);
+    test_rsa_signature_clearsign(filename_rsa_armour_passphrase, bravo_skey, OPS_HASH_SHA1);
-    }
-
@@ -262 +280 @@
-    // add tests to suite
-    
-#ifdef TBD
-    if (NULL == CU_add_test(suite, "Unarmoured, no passphrase", test_rsa_signature_noarmour_nopassphrase))
-            return NULL;
@@ -268 +285 @@
-    if (NULL == CU_add_test(suite, "Unarmoured, passphrase", test_rsa_signature_noarmour_passphrase))
-            return NULL;
-#endif /*TBD*/
-    
-    if (NULL == CU_add_test(suite, "Armoured, no passphrase", test_rsa_signature_armour_nopassphrase))
-            return NULL;
-    
-#ifdef TBD
-    if (NULL == CU_add_test(suite, "Armoured, passphrase", test_rsa_signature_armour_passphrase))
-            return NULL;
-
+
+
+
+
+
+
-    
-    return suite;
-}
-
-CU_pSuite suite_rsa_signature_GPGtest()
-{
-    CU_pSuite suite = NULL;
-
-    suite = CU_add_suite("RSA Signature Suite (GPG interop)", init_suite_rsa_signature_gpgtest, clean_suite_rsa_signature);
-
-    if (!suite)
-            return NULL;
-
-    // add tests to suite
-    
-#ifdef TBD
-    if (NULL == CU_add_test(suite, "Unarmoured, no passphrase", test_rsa_signature_noarmour_nopassphrase))
-            return NULL;
-    
-    if (NULL == CU_add_test(suite, "Unarmoured, passphrase", test_rsa_signature_noarmour_passphrase))
-            return NULL;
-#endif /*TBD*/
-    
-    if (NULL == CU_add_test(suite, "Armoured, no passphrase", test_rsa_signature_armour_nopassphrase))
-            return NULL;
-    
-    if (NULL == CU_add_test(suite, "Armoured, passphrase", test_rsa_signature_armour_passphrase))
-            return NULL;
-    
-    
-    return suite;
-}
-
-// EOF

openpgpsdk/trunk/tests/test_rsa_verify.c

@@ -16 +16 @@
-#include "tests.h"
-
-static int do_gpgtest=0;
-
-#ifndef ATTRIBUTE_UNUSED
-
@@ -28 +26 @@
-#endif /* ATTRIBUTE_UNUSED */
-
+static char *filename_rsa_armour_nopassphrase="gpg_signed_armour_nopassphrase.txt";
+static char *filename_rsa_armour_passphrase="gpg_signed_armour_passphrase.txt";
+
-static char *filename_rsa_noarmour_nopassphrase="gpg_signed_noarmour_nopassphrase.txt";
-
-
-
-
-
+
+
+
+
-
-/* Signature verification suite initialization.
@@ -43 +43 @@
-    char cmd[MAXBUF+1];
-
-    do_gpgtest=0;
-
-    // Create SIGNED test files
-
+    create_testfile(filename_rsa_armour_nopassphrase);
+    create_testfile(filename_rsa_armour_passphrase);
+
-    create_testfile(filename_rsa_noarmour_nopassphrase);
-    create_testfile(filename_rsa_armour_nopassphrase);
-    create_testfile(filename_rsa_noarmour_passphrase);
-    create_testfile(filename_rsa_armour_passphrase);
-
-    // Now sign the test files with GPG
@@ -59 +58 @@
-        { return 1; }
-
-
+openpgp --
-             gpgcmd, alpha_name, dir, filename_rsa_armour_nopassphrase);
-    if (system(cmd))
-        { return 1; }
-
-
+openpgp --
-             gpgcmd, bravo_name, bravo_passphrase, dir, filename_rsa_noarmour_passphrase);
-    if (system(cmd))
-        { return 1; }
-
-
+openpgp --
-             gpgcmd, bravo_name, bravo_passphrase, dir, filename_rsa_armour_passphrase);
-    if (system(cmd))
@@ -78 +77 @@
-     */
-
-
+
+
-
-    // and sign them
-
-    snprintf(cmd,MAXBUF,"%s --openpgp --compress-level 0 --clearsign --local-user %s --armor %s/%s",
-
+
+
+
+
+
+
-    if (system(cmd))
-        { return 1; }
-
-    // Return success
-    return 0;
-    }
-
-int init_suite_rsa_verify_gpgtest(void)
-    {
-    init_suite_rsa_verify();
-
-    do_gpgtest=1;
-
-    return 0;
-    }
@@ -176 +172 @@
-    }
-
-
+static 
-    {
-    //    int clearsign=0;
@@ -187 +183 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    int armour=0;
-    int passphrase=1;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-    int armour=1;
-    int passphrase=1;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-CU_pSuite suite_rsa_verify()
@@ -232 +239 @@
-    // add tests to suite
-    
-
+
+
+
+
+
+
+
+
+
+
-            return NULL;
-    
@@ -238 +254 @@
-            return NULL;
-    
-    /*
-    if (NULL == CU_add_test(suite, "Unarmoured, passphrase", test_rsa_verify_noarmour_passphrase))
-            return NULL;
-
+
-    return suite;
-}
-
-CU_pSuite suite_rsa_verify_GPGtest()
-{
-    CU_pSuite suite = NULL;
-
-    suite = CU_add_suite("RSA Verification Suite (GPG interop)", init_suite_rsa_verify_gpgtest, clean_suite_rsa_verify);
-    if (!suite)
-            return NULL;
-
-    // add tests to suite
-    
-    if (NULL == CU_add_test(suite, "Clearsigned, armoured, no passphrase", test_rsa_verify_clearsign_armour_nopassphrase))
-            return NULL;
-    
-    if (NULL == CU_add_test(suite, "Unarmoured, no passphrase", test_rsa_verify_noarmour_nopassphrase))
-            return NULL;
-
-    /*
-    if (NULL == CU_add_test(suite, "Unarmoured, passphrase", test_rsa_verify_noarmour_passphrase))
-            return NULL;
-    */
-    return suite;
-}
-
-// EOF