Changeset 488

Timestamp:

08/20/07 16:42:50

Author:

rachel

Message:

Finally managed to get GPG to produce SE IP packets (secret: don't use --openpgp)
Minor refactoring.

Files:

• openpgpsdk/trunk/tests/test_crypto.c (modified) (6 diffs)
• openpgpsdk/trunk/tests/test_packet_types.c (modified) (8 diffs)
• openpgpsdk/trunk/tests/test_rsa_decrypt.c (modified) (11 diffs)
• openpgpsdk/trunk/tests/test_rsa_encrypt.c (modified) (3 diffs)
• openpgpsdk/trunk/tests/tests.c (modified) (10 diffs)
• openpgpsdk/trunk/tests/tests.h (modified) (2 diffs)

openpgpsdk/trunk/tests/test_crypto.c

@@ -12 +12 @@
-#include "openpgpsdk/readerwriter.h"
-#include "../src/advanced/parse_local.h"
+#include <openssl/cast.h>
-#include <openssl/aes.h>
-#include <openssl/cast.h>
-#include <openssl/sha.h>
-*/
-
+
-#include "tests.h"
-
@@ -95 +95 @@
-    }
-
-
+256
-    {
-    // Used for trying low-level OpenSSL tests
@@ -113 +113 @@
-    ops_encrypt_init(&crypt);
-
-    // Why does aes encrypt/decrypt work??
-    //    crypt=&crypt_aes;
-
-    unsigned char *in=ops_mallocz(crypt.blocksize);
-    unsigned char *out=ops_mallocz(crypt.blocksize);
@@ -121 +118 @@
-
-    snprintf((char *)in,crypt.blocksize,"hello");
-
+
-    printf("\n");
-    printf("in:\t0x%.2x 0x%.2x 0x%.2x 0x%.2x   0x%.2x 0x%.2x 0x%.2x 0x%.2x\n", 
@@ -127 +124 @@
-    printf("in:\t%c    %c    %c    %c      %c    %c    %c    %c\n", 
-           in[0], in[1], in[2], in[3], in[4], in[5], in[6], in[7]);
-        */
-
-    crypt.block_encrypt(&crypt, out, in);
-
-
+    
+
-    printf("out:\t0x%.2x 0x%.2x 0x%.2x 0x%.2x   0x%.2x 0x%.2x 0x%.2x 0x%.2x\n", 
-           out[0], out[1], out[2], out[3], out[4], out[5], out[6], out[7]);
-    printf("out:\t%c    %c    %c    %c      %c    %c    %c    %c\n", 
-           out[0], out[1], out[2], out[3], out[4], out[5], out[6], out[7]);
-
+
-
-    crypt.block_decrypt(&crypt, out2, out);
-
-
+
-    printf("out2:\t0x%.2x 0x%.2x 0x%.2x 0x%.2x   0x%.2x 0x%.2x 0x%.2x 0x%.2x\n", 
-           out2[0], out2[1], out2[2], out2[3], out2[4], out2[5], out2[6], out2[7]);
-    printf("out2:\t%c    %c    %c    %c      %c    %c    %c    %c\n", 
-           out2[0], out2[1], out2[2], out2[3], out2[4], out2[5], out2[6], out2[7]);
-
+
-    CU_ASSERT(memcmp((char *)in, (char *)out2, strlen((char *)in))==0);
-
@@ -279 +274 @@
-    // add tests to suite
-    
-", test_cfb_aes
+ 256", test_cfb_aes256
-            return NULL;
-

openpgpsdk/trunk/tests/test_packet_types.c

@@ -21 +21 @@
-static size_t sz_encrypted_pk_sk=0;
-
-suite
+local
-
-/* 
@@ -208 +208 @@
-
-    // cleanup
-suite
+local
-    ops_teardown_memory_read(pinfo,mem);
-    free (in);
@@ -255 +255 @@
-
-    // cleanup
-suite
+local
-    ops_teardown_memory_read(pinfo,mem);
-    free (in);
@@ -304 +304 @@
-
-        // clean up
-suite
+local
-    ops_teardown_memory_read(pinfo,mem);
-        }
@@ -369 +369 @@
-
-    // cleanup
-suite
+local
-    ops_teardown_memory_read(pinfo,mem);
-    ops_memory_free(mem_ldt);
-    }
-
-encrypted_pk_sk
+pk_session_key
-    {
-    ops_pk_session_key_t *encrypted_pk_session_key;
@@ -403 +403 @@
-
-    // cleanup
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-CU_pSuite suite_packet_types()
@@ -429 +464 @@
-            return NULL;
-
-encrypted_pk_sk
+pk_session_key
-            return NULL;
-
@@ -435 +470 @@
-}
-
-suite
+local
-    {
-    if (literal_data)

openpgpsdk/trunk/tests/test_rsa_decrypt.c

@@ -18 +18 @@
-#include "../src/advanced/keyring_local.h"
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-static char *nopassphrase="";
-static char *passphrase="hello";
@@ -55 +52 @@
-    ops_parser_content_union_t* content=(ops_parser_content_union_t *)&content_->content;
-    static ops_boolean_t skipping;
-
-
-
+//    
+//    
+//    
-
-    OPS_USED(cbinfo);
@@ -83 +80 @@
-
-    case OPS_PTAG_CT_PK_SESSION_KEY:
-
-
-
-
-
-
-
-
-
+
+
-
-    case OPS_PARSER_CMD_GET_SECRET_KEY:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-    case OPS_PARSER_CMD_GET_SK_PASSPHRASE:
-
-
-
-
-
-
-
+
+
-
-    case OPS_PTAG_CT_LITERAL_DATA_BODY:
+        /*
-        text=ops_mallocz(content->literal_data_body.length+1);
-        memcpy(text,content->literal_data_body.data,content->literal_data_body.length);
+        */
+        return callback_literal_data(content_,cbinfo);
-                break;
-
-    case OPS_PARSER_PTAG:
-    case OPS_PTAG_CT_ARMOUR_HEADER:
-    case OPS_PTAG_CT_ARMOUR_TRAILER:
@@ -150 +106 @@
-    case OPS_PTAG_CT_SE_IP_DATA_BODY:
-    case OPS_PTAG_CT_SE_IP_DATA_HEADER:
+    case OPS_PTAG_CT_SE_DATA_BODY:
+    case OPS_PTAG_CT_SE_DATA_HEADER:
+
-        // Ignore these packets 
-        // They're handled in ops_parse_one_packet()
@@ -156 +115 @@
-
-    default:
-
-
-
+
+
+
+
-        }
-
@@ -171 +131 @@
-int init_suite_rsa_decrypt(void)
-    {
-#ifdef XXX
-    int fd=0;
-    char cmd[MAXBUF+1];
-    char *rsa_nopass="Key-Type: RSA\nKey-Usage: encrypt, sign\nName-Real: Alpha\nName-Comment: RSA, no passphrase\nName-Email: alpha@test.com\nKey-Length: 1024\n";
-    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 1;
-
-    // Create RSA test files
@@ -188 +140 @@
-    create_testfile(filename_rsa_armour_passphrase);
-
+    // Restrict list of algorithms used
+   
+    //    snprintf(cmd,MAXBUF,"gpg --homedir=%s --default-preference-list \"CAST5\"", dir);
+    //    if (system(cmd))
+    //        return -1;
+
+    // Now encrypt the test files with GPG
+    // Note:: To make it do SE_IP packets, do NOT use --openpgp and DO use --force-mdc
+    snprintf(cmd,MAXBUF,"gpg --homedir=%s --cipher-algo \"CAST5\" --force-mdc --compress-level 0 --quiet --encrypt --recipient Alpha %s/%s", dir, dir, filename_rsa_noarmour_nopassphrase);
+    if (system(cmd))
+        {
+        return 1;
+        }
+
+    snprintf(cmd,MAXBUF,"gpg --openpgp --quiet --encrypt --personal-cipher-preferences='CAST5' --armor --homedir=%s --recipient Alpha %s/%s", dir, dir, filename_rsa_armour_nopassphrase);
+    if (system(cmd))
+        {
+        return 1;
+        }
+    
+    snprintf(cmd,MAXBUF,"gpg --openpgp --quiet --encrypt --s2k-cipher-algo CAST5 --homedir=%s --recipient Bravo %s/%s", dir, dir, filename_rsa_noarmour_passphrase);
+    if (system(cmd))
+        {
+        return 1;
+        }
+
+    snprintf(cmd,MAXBUF,"gpg --openpgp --quiet --encrypt --s2k-cipher-algo CAST5 --armor --homedir=%s --recipient Bravo %s/%s", dir, dir, filename_rsa_armour_passphrase);
+    if (system(cmd))
+        {
+        return 1;
+        }
+
+#ifdef XXX
+    int fd=0;
+    char *rsa_nopass="Key-Type: RSA\nKey-Usage: encrypt, sign\nName-Real: Alpha\nName-Comment: RSA, no passphrase\nName-Email: alpha@test.com\nKey-Length: 1024\n";
+    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 1;
+
-    /*
-     * Create a RSA keypair with no passphrase
@@ -203 +196 @@
-    close(fd);
-
-
+openpgp --
-    system(cmd);
-
-    // Now encrypt the test file with GPG
-    snprintf(cmd,MAXBUF,"gpg --quiet --encrypt --homedir=%s --recipient Alpha %s/%s", dir, dir, filename_rsa_noarmour_nopassphrase);
-    if (system(cmd))
-        {
-        return 1;
-        }
-
-    // Now encrypt and ascii-armour the test file with GPG
-    snprintf(cmd,MAXBUF,"gpg --quiet --encrypt --armor --homedir=%s --recipient Alpha %s/%s", dir, dir, filename_rsa_armour_nopassphrase);
-    if (system(cmd))
-        {
-        return 1;
-        }
-    
-    /*
-     * Create a RSA keypair with passphrase
@@ -234 +213 @@
-    close(fd);
-
-
+openpgp --
-    system(cmd);
-
-    // Now encrypt the test file with GPG
-    snprintf(cmd,MAXBUF,"gpg --quiet --encrypt --homedir=%s --recipient Bravo %s/%s", dir, dir, filename_rsa_noarmour_passphrase);
-    if (system(cmd))
-        {
-        return 1;
-        }
-
-    // Now encrypt and ascii-armour the test file with GPG
-    snprintf(cmd,MAXBUF,"gpg --quiet --encrypt --armor --homedir=%s --recipient Bravo %s/%s", dir, dir, filename_rsa_armour_passphrase);
-    if (system(cmd))
-        {
-        return 1;
-        }
-
-    // Initialise OPS 
@@ -299 +265 @@
-    fd=open(encfile,O_RDONLY);
-    if(fd < 0)
-       
-       
-       
-       
+        
+        
+        
+        
-    
-    // Set decryption reader and handling options
@@ -313 +279 @@
-
-    if (has_armour)
-       
+        
-    current_passphrase=has_passphrase ? passphrase : nopassphrase;
-    

openpgpsdk/trunk/tests/test_rsa_encrypt.c

@@ -12 +12 @@
-#include "tests.h"
-
-
-
+enc_
+enc_
-
-static ops_parse_cb_return_t
@@ -20 +20 @@
-    ops_parser_content_union_t* content=(ops_parser_content_union_t *)&content_->content;
-    static ops_boolean_t skipping;
-
+//    
-    //    const ops_key_data_t *keydata=NULL;
-    //    const ops_secret_key_t *secret;
@@ -48 +48 @@
-
-    case OPS_PTAG_CT_PK_SESSION_KEY:
-
-
-
-
-
-
-
-
-
+
-
-    case OPS_PARSER_CMD_GET_SECRET_KEY:

openpgpsdk/trunk/tests/tests.c

@@ -26 +26 @@
-size_t sz_literal_data=0;
-char *alpha_user_id="Alpha (RSA, no passphrase) <alpha@test.com>";
+char *bravo_user_id="Bravo (RSA, passphrase) <bravo@test.com>";
+
+const ops_key_data_t *decrypter=NULL;
-
-void setup_test_keys()
@@ -35 +38 @@
-
-    char *rsa_nopass="Key-Type: RSA\nKey-Usage: encrypt, sign\nName-Real: Alpha\nName-Comment: RSA, no passphrase\nName-Email: alpha@test.com\nKey-Length: 1024\n";
+    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())
@@ -47 +52 @@
-    if ((fd=open(keydetails,O_WRONLY | O_CREAT | O_EXCL, 0600))<0)
-        {
-
+Alpha 
-        return;
-        }
@@ -54 +59 @@
-    close(fd);
-
-
+openpgp --
-    system(cmd);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    snprintf(keyring_name,MAXBUF,"%s/pubring.gpg", dir);
@@ -110 +135 @@
-        }
-
-
+
+
+
+
+
+
-    if (NULL == suite_rsa_decrypt()) 
-        {
-        CU_cleanup_registry();
-        return CU_get_error();
-        }
-    */
-
-    if (NULL == suite_rsa_encrypt()) 
-        {
-        CU_cleanup_registry();
@@ -231 +254 @@
-    const ops_key_data_t *keydata=NULL;
-    const ops_secret_key_t *secret;
-    /*
-    static const ops_key_data_t *decrypt_key;
-    */
-
-    OPS_USED(cbinfo);
@@ -252 +272 @@
-        passphrase=NULL;
-        pc.content.secret_key_passphrase.passphrase=&passphrase;
-        //        pc.content.secret_key_passphrase.secret_key=&(keydata->key.skey);
-        pc.content.secret_key_passphrase.secret_key=ops_get_secret_key_from_data(keydata);
-
@@ -300 +319 @@
-        /*
-          Doing this so the test can be automated.
-          Will move this into separate stacked callback later
-        */
-        *(content->secret_key_passphrase.passphrase)=ops_malloc_passphrase(no_passphrase);
@@ -342 +360 @@
-    }
- 
+ops_parse_cb_return_t
+callback_pk_session_key(const ops_parser_content_t *content_,ops_parse_cb_info_t *cbinfo)
+    {
+    ops_parser_content_union_t* content=(ops_parser_content_union_t *)&content_->content;
+    
+    OPS_USED(cbinfo);
+
+    //    ops_print_packet(content_);
+    
+    // Read data from packet into static buffer
+    switch(content_->tag)
+        {
+    case OPS_PTAG_CT_PK_SESSION_KEY:
+                //      printf ("OPS_PTAG_CT_PK_SESSION_KEY\n");
+        if(decrypter)
+            break;
+
+        decrypter=ops_keyring_find_key_by_id(&sec_keyring,
+                                             content->pk_session_key.key_id);
+        if(!decrypter)
+            break;
+        break;
+
+    default:
+        return callback_general(content_,cbinfo);
+        }
+
+    return OPS_RELEASE_MEMORY;
+    }
+
-void reset_vars()
-    {
@@ -349 +397 @@
-        literal_data=NULL;
-        sz_literal_data=0;
+        }
+    if (decrypter)
+        {
+        //        free (decrypter);
+        decrypter=NULL;
-        }
-    }

openpgpsdk/trunk/tests/tests.h

@@ -29 +29 @@
-ops_parse_cb_return_t
-callback_literal_data(const ops_parser_content_t *content_,ops_parse_cb_info_t *cbinfo);
+ops_parse_cb_return_t
+callback_pk_session_key(const ops_parser_content_t *content_,ops_parse_cb_info_t *cbinfo);
-
-void reset_vars();
@@ -38 +40 @@
-size_t sz_literal_data;
-char* alpha_user_id;
+char* bravo_user_id;
+const ops_key_data_t *decrypter;
-#endif
-