Changeset 523

Timestamp:

12/10/07 15:43:20

Author:

rachel

Message:

Signature/verification now interoperates with GPG

Files:

• openpgpsdk/trunk/tests/test_common.c (modified) (8 diffs)
• openpgpsdk/trunk/tests/test_rsa_signature.c (modified) (6 diffs)
• openpgpsdk/trunk/tests/test_rsa_verify.c (modified) (12 diffs)
• openpgpsdk/trunk/tests/tests.c (modified) (1 diff)
• openpgpsdk/trunk/tests/tests.h (modified) (2 diffs)
• openpgpsdk/trunk/tests/tests_gpg.c (modified) (3 diffs)

openpgpsdk/trunk/tests/test_common.c

@@ -16 +16 @@
-
-char dir[MAXBUF+1];
+char gpgcmd[MAXBUF+1];
-ops_keyring_t pub_keyring;
-ops_keyring_t sec_keyring;
@@ -39 +40 @@
-const ops_key_data_t *decrypter=NULL;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-    char keydetails[MAXBUF+1];
@@ -49 +64 @@
-    char *rsa_pass="Key-Type: RSA\nKey-Usage: encrypt, sign\nName-Real: Bravo\nName-Comment: RSA, passphrase\nName-Email: bravo@test.com\nPassphrase: hello\nKey-Length: 1024\n";
-
-    // Create temp directory
-    if (!mktmpdir())
-        return;
-
-    /*
-     * Create a RSA keypair with no passphrase
@@ -72 +83 @@
-    close(fd);
-
-gpg --quiet --no-tty --openpgp --quiet --gen-key --s2k-cipher-algo \"AES\" --expert --homedir=%s --batch %s",dir
+%s --openpgp --gen-key --s2k-cipher-algo \"AES\" --expert --batch %s",gpgcmd
-    system(cmd);
-
@@ -94 +105 @@
-    close(fd);
-
-gpg --quiet --no-tty --openpgp --quiet --gen-key --s2k-cipher-algo \"AES\" --expert --homedir=%s --batch %s",dir
+%s --openpgp --gen-key --s2k-cipher-algo \"AES\" --expert --batch %s",gpgcmd
-    system(cmd);
-    
@@ -249 +260 @@
-callback_general(const ops_parser_content_t *content_,ops_parse_cb_info_t *cbinfo)
-    {
+    int debug=0;
+
-    ops_parser_content_union_t* content=(ops_parser_content_union_t *)&content_->content;
-    
@@ -262 +275 @@
-        
-    case OPS_PARSER_PACKET_END:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        break;
-
@@ -428 +456 @@
- 
-ops_parse_cb_return_t
+callback_verify(const ops_parser_content_t *content_,ops_parse_cb_info_t *cbinfo)
+    {
+    /*
+    int debug=0;
+
+    if (debug)
+        { ops_print_packet(content_); }
+    */
+    switch(content_->tag)
+        {
+    case OPS_PTAG_RAW_SS:
+    case OPS_PTAG_SS_CREATION_TIME:
+    case OPS_PTAG_SS_ISSUER_KEY_ID:
+        // \todo should free memory?
+        return OPS_KEEP_MEMORY;
+        
+    case OPS_PTAG_CT_ONE_PASS_SIGNATURE:
+    case OPS_PTAG_CT_ARMOUR_HEADER:
+    case OPS_PTAG_CT_ARMOUR_TRAILER:
+        break;
+        
+    case OPS_PTAG_CT_SIGNATURE:
+    case OPS_PTAG_CT_SIGNED_CLEARTEXT_HEADER:
+    case OPS_PTAG_CT_SIGNED_CLEARTEXT_BODY:
+    case OPS_PTAG_CT_SIGNED_CLEARTEXT_TRAILER:
+    case OPS_PTAG_CT_SIGNATURE_HEADER:
+    case OPS_PTAG_CT_SIGNATURE_FOOTER:
+    case OPS_PTAG_CT_LITERAL_DATA_HEADER:
+    case OPS_PTAG_CT_LITERAL_DATA_BODY:
+        return callback_data_signature(content_, cbinfo);
+
+    default:
+        return callback_general(content_,cbinfo);
+        }
+
+    return OPS_RELEASE_MEMORY;
+    }
+
+ops_parse_cb_return_t
-callback_pk_session_key(const ops_parser_content_t *content_,ops_parse_cb_info_t *cbinfo)
-    {

openpgpsdk/trunk/tests/test_rsa_signature.c

@@ -25 +25 @@
-static char *filename_rsa_armour_passphrase="ops_rsa_signed_armour_passphrase.txt";
-
-static ops_parse_cb_return_t
-callback_verify(const ops_parser_content_t *content_,ops_parse_cb_info_t *cbinfo);
-
-/* Signature suite initialization.
- * Create temporary directory.
@@ -79 +76 @@
-    int rtn=0;
-    ops_create_info_t *cinfo=NULL;
+    unsigned char buf[MAXBUF];
-    
-    // open file to sign
@@ -123 +121 @@
-    for (;;)
-        {
-        unsigned char buf[MAXBUF];
-        int n=0;
-    
@@ -140 +137 @@
-    ops_keyid(keyid,&skey->public_key);
-    ops_signature_add_issuer_key_id(sig,keyid);
+
-    ops_signature_hashed_subpackets_end(sig);
-    ops_write_signature(sig,(ops_public_key_t *)&skey->public_key,(ops_secret_key_t *)skey,cinfo);
@@ -145 +143 @@
-    close(fd_out);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // open signed file
-#ifdef WIN32
-    
+
-#else
-    
+
-#endif
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    {
-    // Check signature with GPG
-
-    snprintf(cmd,MAXBUF,"gpg --quiet --no-tty --verify --quiet --homedir %s %s", dir
-    
-    
-    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// Check signature with GPG
+{
+
+snprintf(cmd,MAXBUF,"%s --verify %s", gpgcmd
+
+
+
-    }
-
@@ -309 +310 @@
-}
-
-static ops_parse_cb_return_t
-callback_verify(const ops_parser_content_t *content_,ops_parse_cb_info_t *cbinfo)
-    {
-    int debug=0;
-
-    if (debug)
-        { ops_print_packet(content_); }
-
-    switch(content_->tag)
-        {
-    case OPS_PTAG_RAW_SS:
-    case OPS_PTAG_SS_CREATION_TIME:
-    case OPS_PTAG_SS_ISSUER_KEY_ID:
-        // \todo should free memory?
-        return OPS_KEEP_MEMORY;
-        
-    case OPS_PTAG_CT_ONE_PASS_SIGNATURE:
-    case OPS_PTAG_CT_ARMOUR_HEADER:
-    case OPS_PTAG_CT_ARMOUR_TRAILER:
-        break;
-        
-    case OPS_PTAG_CT_SIGNATURE:
-    case OPS_PTAG_CT_SIGNED_CLEARTEXT_HEADER:
-    case OPS_PTAG_CT_SIGNED_CLEARTEXT_BODY:
-    case OPS_PTAG_CT_SIGNED_CLEARTEXT_TRAILER:
-    case OPS_PTAG_CT_SIGNATURE_HEADER:
-    case OPS_PTAG_CT_SIGNATURE_FOOTER:
-    case OPS_PTAG_CT_LITERAL_DATA_HEADER:
-    case OPS_PTAG_CT_LITERAL_DATA_BODY:
-        return callback_data_signature(content_, cbinfo);
-
-    default:
-        return callback_general(content_,cbinfo);
-        }
-
-    return OPS_RELEASE_MEMORY;
-    }
-
-// EOF

openpgpsdk/trunk/tests/test_rsa_verify.c

@@ -16 +16 @@
-#include "tests.h"
-
+static int do_gpgtest=0;
+
-#ifndef ATTRIBUTE_UNUSED
-
@@ -31 +33 @@
-static char *filename_rsa_armour_passphrase="gpg_signed_armour_passphrase.txt";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-/* Signature verification suite initialization.
@@ -114 +43 @@
-    char cmd[MAXBUF+1];
-
-
+
+
+
-
-    create_testfile(filename_rsa_noarmour_nopassphrase);
@@ -123 +54 @@
-    // Now sign the test files with GPG
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    if (system(cmd))
-        { return 1; }
@@ -147 +91 @@
-    }
-
+int init_suite_rsa_verify_gpgtest(void)
+    {
+    init_suite_rsa_verify();
+
+    do_gpgtest=1;
+
+    return 0;
+    }
+
-int clean_suite_rsa_verify(void)
-    {
@@ -159 +112 @@
-    {
-    char signedfile[MAXBUF+1];
-    //    char testtext[MAXBUF+1];
-    char *suffix= has_armour ? "asc" : "gpg";
-    int fd=0;
@@ -168 +120 @@
-    
-    // open signed file
-
+
+
+
-             protocol==NULL ? "" : protocol,
-
-
+
-#ifdef WIN32
-    fd=open(signedfile,O_RDONLY | O_BINARY);
@@ -192 +145 @@
-    validate_arg.rarg=ops_reader_get_arg_from_pinfo(pinfo);
-
-
+_verify
-    ops_reader_set_fd(pinfo,fd);
-    pinfo->rinfo.accumulate=ops_true;
@@ -225 +178 @@
-void test_rsa_verify_noarmour_nopassphrase(void)
-    {
+    //    int clearsign=0;
-    int armour=0;
-    int passphrase=0;
@@ -233 +187 @@
-    }
-
+void test_rsa_verify_clearsign_armour_nopassphrase(void)
+    {
+    //    int clearsign=1;
+    int armour=1;
+    int passphrase=0;
+    assert(pub_keyring.nkeys);
+
+    test_rsa_verify(armour,passphrase,filename_rsa_clearsign_armour_nopassphrase,NULL);
+    }
+
-#ifdef TBD
-void test_rsa_encrypt_armour_singlekey(void)
@@ -268 +232 @@
-    // 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;
@@ -278 +245 @@
-}
-
+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

openpgpsdk/trunk/tests/tests.c

@@ -19 +19 @@
-
-    mem_literal_data=ops_memory_new();
-_test_keys
+
-
-    if (CUE_SUCCESS != CU_initialize_registry())

openpgpsdk/trunk/tests/tests.h

@@ -38 +38 @@
-// utility functions
-
-
+
+
-void cleanup();
-
@@ -60 +61 @@
-ops_parse_cb_return_t
-callback_data_signature(const ops_parser_content_t *content_,ops_parse_cb_info_t *cbinfo);
+ops_parse_cb_return_t
+callback_verify(const ops_parser_content_t *content_,ops_parse_cb_info_t *cbinfo);
+
-
-void reset_vars();

openpgpsdk/trunk/tests/tests_gpg.c

@@ -19 +19 @@
-
-    mem_literal_data=ops_memory_new();
-_test_keys
+
-
-    if (CUE_SUCCESS != CU_initialize_registry())
@@ -36 +36 @@
-        }
-
-
-
-
+
-        {
-        CU_cleanup_registry();
@@ -44 +42 @@
-        }
-
-
+
+
+
-        {
-        CU_cleanup_registry();