Changeset 518

Timestamp:

10/18/07 13:36:34

Author:

rachel

Message:

Added some placeholder tests for ones to be added

Files:

• openpgpsdk/trunk/src/advanced/adv_packet-parse.c (modified) (1 diff)
• openpgpsdk/trunk/tests/test_rsa_decrypt.c (modified) (10 diffs)
• openpgpsdk/trunk/tests/test_rsa_encrypt.c (modified) (8 diffs)
• openpgpsdk/trunk/tests/test_rsa_signature.c (modified) (1 diff)

openpgpsdk/trunk/src/advanced/adv_packet-parse.c

@@ -920 +920 @@
-        break;
-
+ case 0:
+     // nothing to free
+     break;
+     
-    default:
-        assert(0);

openpgpsdk/trunk/tests/test_rsa_decrypt.c

@@ -258 +258 @@
-    }
-
-
+static 
-    {
-    int armour=0;
@@ -265 +265 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    int armour=0;
-    int passphrase=0;
-    test_rsa_decrypt(armour,passphrase,filename_rsa_noarmour_nopassphrase,"3DES");
-
-
-
+
+
+
+
-    {
-    int armour=0;
@@ -289 +284 @@
-
-#ifdef TODO
-
+static 
-    {
-    int armour=1;
@@ -297 +292 @@
-#endif
-
-
+static 
-    {
-    int armour=0;
@@ -304 +299 @@
-    }
-
-
+static 
-    {
-    int armour=0;
@@ -313 +308 @@
-//
-
-
+
+
-    {
-    int armour=1;
@@ -320 +316 @@
-    }
-
-
+static 
-    {
-    int armour=0;
@@ -327 +323 @@
-    }
-
-
+static 
-    {
-    int armour=1;
@@ -333 +329 @@
-    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");
+    CU_FAIL("Test TODO: Decryption with multiple keys where my key is (a) first key in list; (b) last key in list; (c) in the middle of the list");
+    }
-
-CU_pSuite suite_rsa_decrypt()
@@ -356 +362 @@
-            return NULL;
-    
-#ifndef OPENSSL_NO_IDEA
-    /* \todo
-    if (NULL == CU_add_test(suite, "Unarmoured, no passphrase (IDEA)", test_rsa_decrypt_noarmour_nopassphrase_idea))
-            return NULL;
-    */
-#endif
-
-#ifdef TODO
-    if (NULL == CU_add_test(suite, "Armoured, no passphrase (CAST5)", test_rsa_decrypt_armour_nopassphrase_cast5))
-            return NULL;
-    
-    if (NULL == CU_add_test(suite, "Unarmoured, no passphrase (3DES)", test_rsa_decrypt_noarmour_nopassphrase_3des))
-            return NULL;
-    
-
-
-
-
-
-
-
-
-
+
+
+
-    return suite;
-}

openpgpsdk/trunk/tests/test_rsa_encrypt.c

@@ -13 +13 @@
-
-static int do_gpgtest=0;
-
-static char *filename_rsa_noarmour_nopassphrase_singlekey_old="enc_rsa_noarmour_np_singlekey_old.txt";
-static char *filename_rsa_noarmour_passphrase_singlekey_old="enc_rsa_noarmour_pp_singlekey_old.txt";
-
-static char *filename_rsa_noarmour_nopassphrase_singlekey="enc_rsa_noarmour_np_singlekey.txt";
@@ -95 +92 @@
-    create_testfile(filename_rsa_noarmour_nopassphrase_singlekey);
-    create_testfile(filename_rsa_noarmour_passphrase_singlekey);
-    create_testfile(filename_rsa_noarmour_nopassphrase_singlekey_old);
-    create_testfile(filename_rsa_noarmour_passphrase_singlekey_old);
-    create_testfile(filename_rsa_armour_singlekey);
-    /*
@@ -166 +161 @@
-
-    return rtn;
-    }
-
-static void old_test_rsa_encrypt(const int has_armour, const ops_key_data_t *pub_key, const char *filename)
-    {
-    char* testtext=NULL;
-    ops_memory_t *mem_ldt;
-    ops_create_info_t *cinfo_ldt;
-
-    char cmd[MAXBUF+1];
-    char myfile[MAXBUF+1];
-    char encrypted_file[MAXBUF+1];
-    char decrypted_file[MAXBUF+1];
-    char *suffix= has_armour ? "asc" : "gpg";
-    int fd_in=0;
-    int fd_out=0;
-    int rtn=0;
-    ops_create_info_t *cinfo;
-    ops_pk_session_key_t* encrypted_pk_session_key;
-    ops_crypt_t encrypt;
-    unsigned char *iv=NULL;
-    
-    /*
-     * Read from test file and write plaintext to memory
-     * in set of Literal Data packets
-     * \todo optimise using stacked writers
-     */
-
-    // open file to encrypt
-    snprintf(myfile,MAXBUF,"%s/%s",dir,filename);
-#ifdef WIN32
-    fd_in=open(myfile,O_RDONLY | O_BINARY);
-#else
-    fd_in=open(myfile,O_RDONLY);
-#endif
-    if(fd_in < 0)
-        {
-        perror(myfile);
-        exit(2);
-        }
-    
-    snprintf(encrypted_file,MAXBUF,"%s/%s.%s",dir,filename,suffix);
-#ifdef WIN32
-    fd_out=open(encrypted_file,O_WRONLY | O_CREAT | O_EXCL | O_BINARY, 0600);
-#else
-    fd_out=open(encrypted_file,O_WRONLY | O_CREAT | O_EXCL, 0600);
-#endif
-    if(fd_out < 0)
-        {
-        perror(encrypted_file);
-        exit(2);
-        }
-    
-    // write plaintext to memory
-
-    for (;;)
-        {
-            unsigned char buf[MAXBUF];
-            int n=0;
-
-            n=read(fd_in,buf,sizeof(buf));
-            if (!n)
-                    break;
-            assert(n>=0);
-
-        // create a simple literal data packet as the encrypted payload
-        ops_setup_memory_write(&cinfo_ldt,&mem_ldt,n);
-        ops_write_literal_data((unsigned char *)buf, n,
-                           OPS_LDT_BINARY, cinfo_ldt);
-        }
-    close(fd_in);
-
-    /*
-     * Encrypt and write to file
-     */
-
-    // Set encryption writer and handling options
-
-    cinfo=ops_create_info_new();
-    ops_writer_set_fd(cinfo,fd_out); 
-
-    // Create and write encrypted PK session key
-
-    encrypted_pk_session_key=ops_create_pk_session_key(pub_key);
-    ops_write_pk_session_key(cinfo,encrypted_pk_session_key);
-
-    ops_crypt_any(&encrypt, encrypted_pk_session_key->symmetric_algorithm);
-    iv=ops_mallocz(encrypt.blocksize);
-    encrypt.set_iv(&encrypt, iv);
-    encrypt.set_key(&encrypt, &encrypted_pk_session_key->key[0]);
-    ops_encrypt_init(&encrypt);
-
-    /*
-     * write out encrypted packets
-     */
-
-    ops_write_se_ip_pktset( ops_memory_get_data(mem_ldt),
-                          ops_memory_get_length(mem_ldt),
-                          &encrypt, cinfo);
-    close(fd_out);
-
-    /*
-     * Test results
-     */
-
-    if (!do_gpgtest)
-        {
-        // File contents should match - checking with OPS
-
-        testtext=create_testtext(filename);
-        CU_ASSERT(test_rsa_decrypt(encrypted_file,testtext)==1);
-        }
-
-    else
-        {
-        // File contents should match - check with GPG
-
-        char pp[MAXBUF];
-        if (pub_key==alpha_pub_keydata)
-            pp[0]='\0';
-        else if (pub_key==bravo_pub_keydata)
-            snprintf(pp,MAXBUF," --passphrase %s ", bravo_passphrase);
-        snprintf(decrypted_file,MAXBUF,"%s/decrypted_%s",dir,filename);
-        snprintf(cmd,MAXBUF,"gpg --decrypt --output=%s --quiet --homedir %s %s %s",decrypted_file, dir, pp, encrypted_file);
-        //    printf("cmd: %s\n", cmd);
-        rtn=system(cmd);
-        CU_ASSERT(rtn==0);
-        CU_ASSERT(file_compare(myfile,decrypted_file)==0);
-        }
-    }
-
@@ -415 +282 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    {
-    int armour=0;
@@ -433 +288 @@
-    }
-
-
+static 
-    {
-    int armour=0;
@@ -439 +294 @@
-    }
-
+static void test_rsa_encrypt_armour_nopassphrase_singlekey(void)
+    {
+    CU_FAIL("Test TODO: Encrypt with armour/no passphrase/single-key");
-#ifdef TBD
-void test_rsa_encrypt_armour_singlekey(void)
-    {
-    int armour=1;
-    char *user_id="Alpha (RSA, no passphrase) <alpha@test.com>";
@@ -447 +303 @@
-    assert(pub_key);
-    test_rsa_encrypt(armour,pub_key,filename_rsa_armour_singlekey);
-
-
-
-
+
+
+
+
+
+
+
-    int armour=1;
-    int passphrase=1;
-    test_rsa_encrypt(armour,passphrase,filename_rsa_armour_passphrase);
-
-
+
+
+
+
+
+
+
+
+
-
-int add_tests(CU_pSuite suite)
@@ -467 +333 @@
-            return 0;
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    return 1;
-    }

openpgpsdk/trunk/tests/test_rsa_signature.c

@@ -186 +186 @@
-        CU_ASSERT(rtn==1);
-        
+        // Tidy up
+        if (has_armour)
+            ops_reader_pop_dearmour(pinfo);
+        
+        ops_public_key_free(&validate_arg.pkey);
+        if (validate_arg.subkey.version)
+            ops_public_key_free(&validate_arg.subkey);
+        ops_user_id_free(&validate_arg.user_id);
+        ops_user_attribute_free(&validate_arg.user_attribute);
+        ops_parse_info_delete(pinfo);
+        
+        close(fd);
-        }
-    else