Changeset 547

Timestamp:

02/29/08 17:13:59

Author:

rachel

Message:

Added tests for additional compression algorithm.
Change to src directory structure.

Files:

• openpgpsdk/trunk/tests/test_common.c (modified) (1 diff)
• openpgpsdk/trunk/tests/test_crypt_mpi.c (modified) (3 diffs)
• openpgpsdk/trunk/tests/test_packet_types.c (modified) (1 diff)
• openpgpsdk/trunk/tests/test_rsa_decrypt.c (modified) (6 diffs)
• openpgpsdk/trunk/tests/test_rsa_signature.c (modified) (2 diffs)
• openpgpsdk/trunk/tests/test_rsa_verify.c (modified) (1 diff)
• openpgpsdk/trunk/tests/tests.c (modified) (1 diff)
• openpgpsdk/trunk/tests/tests_gpg.c (deleted)

openpgpsdk/trunk/tests/test_common.c

@@ -11 +11 @@
-#include "openpgpsdk/readerwriter.h"
-#include "openpgpsdk/std_print.h"
-// \todo remove the need for this
-#include "../src/advanced/parse_local.h"
-
-#include "tests.h"

openpgpsdk/trunk/tests/test_crypt_mpi.c

@@ -6 +6 @@
-#include "openpgpsdk/types.h"
-#include "openpgpsdk/keyring.h"
-advanced
+lib
-#include "openpgpsdk/packet.h"
-#include "openpgpsdk/create.h"
-
-//static char secring[MAXBUF+1];
-//static char pubring[MAXBUF+1];
-static const ops_key_data_t *pubkey;
-static const ops_key_data_t *seckey;
@@ -17 +15 @@
-int init_suite_crypt_mpi(void)
-    {
-#ifdef XXX
-    static char keydetails[MAXBUF+1];
-    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";
-    
-    // Create temp directory
-    if (!mktmpdir())
-        return 1;
-
-    /*
-     * Create a RSA keypair with no passphrase
-     */
-
-    snprintf(keydetails,sizeof keydetails,"%s/%s",dir,"keydetails.alpha");
-
-    if ((fd=open(keydetails,O_WRONLY | O_CREAT | O_EXCL | O_BINARY, 0600))<0)
-        {
-        fprintf(stderr,"Can't create key details\n");
-        return 1;
-        }
-
-    write(fd,rsa_nopass,strlen(rsa_nopass));
-    close(fd);
-
-    snprintf(cmd,sizeof cmd,"gpg --quiet --no-tty --homedir=%s --gen-key --expert --batch %s",dir,keydetails);
-    system(cmd);
-
-    // Initialise OPS 
-    ops_init();
-
-    // read keyrings
-    snprintf(pubring,sizeof pubring,"%s/pubring.gpg", dir);
-    ops_keyring_read(&pub_keyring,pubring);
-
-    snprintf(secring,sizeof secring,"%s/secring.gpg", dir);
-    ops_keyring_read(&sec_keyring,secring);
-
-    char keyid[]="Alpha (RSA, no passphrase) <alpha@test.com>";
-#endif
-    pubkey=ops_keyring_find_key_by_userid(&pub_keyring,alpha_user_id);
-    //    seckey=ops_keyring_find_key_by_userid(&sec_keyring,keyid);
-    seckey=ops_keyring_find_key_by_userid(&sec_keyring,alpha_user_id);
-
@@ -68 +25 @@
-    {
-        
-#ifdef XXX
-    char cmd[MAXBUF+1];
-    /* Close OPS */
-    
-    ops_keyring_free(&pub_keyring);
-    ops_keyring_free(&sec_keyring);
-#endif
-
-    ops_finish();
-

openpgpsdk/trunk/tests/test_packet_types.c

@@ -10 +10 @@
-#include "openpgpsdk/readerwriter.h"
-#include "openpgpsdk/random.h"
-advanced
+lib
-
-#include <openssl/aes.h>

openpgpsdk/trunk/tests/test_rsa_decrypt.c

@@ -11 +11 @@
-#include "openpgpsdk/std_print.h"
-
-/* 
-These include files are needed by callback.
-To be removed when callback gets added to main body of code
-*/
-#include "../src/advanced/parse_local.h"
-#include "../src/advanced/keyring_local.h"
-
-static char *filename_rsa_noarmour_nopassphrase="gpg_rsa_enc_noarmour_nopassphrase.txt";
-
@@ -28 +21 @@
-static char *nopassphrase="";
-static char *current_passphrase=NULL;
+
+/* \todo add support for bzip2
+static char *algos[]={ "zip", "zlib", "bzip2" };
+static int n_algos=3;
+*/
+
+static char *algos[]={ "zip", "zlib" };
+static int n_algos=2;
-
-static ops_parse_cb_return_t
@@ -189 +190 @@
-
-    int level=0;
+    int alg=0;
-    for (level=0; level<=MAX_COMPRESS_LEVEL; level++)
-        {
-
-
-
-
-
-
-
-
-
-
+
-            {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-
-
-
+
+
+
+
-            }
-        }
@@ -270 +274 @@
-
-    ops_memory_init(mem_literal_data,0);
-
-
+
-    CU_ASSERT(rtn==1);
-
@@ -365 +368 @@
-    char filename[MAXBUF+1];
-    int level=0;
+    int alg=0;
-    for (level=1; level<=MAX_COMPRESS_LEVEL; level++)
-        {
-
-
-
-
+
+
+
+
+
+
+
-        }
-    }
@@ -380 +387 @@
-    char filename[MAXBUF+1];
-    int level=0;
+    int alg=0;
-    for (level=1; level<=MAX_COMPRESS_LEVEL; level++)
-        {
-
-
-
-
+
+
+
+
+
+
+
-        }
-    }

openpgpsdk/trunk/tests/test_rsa_signature.c

@@ -13 +13 @@
-
-// \todo change this once we know it works
-advanced
+lib
-
-#include "tests.h"
@@ -310 +310 @@
-    // Do the verification
-    
-
-
+
-    CU_ASSERT(rtn==1);
-    

openpgpsdk/trunk/tests/test_rsa_verify.c

@@ -13 +13 @@
-
-// \todo change this once we know it works
-advanced
+lib
-
-#include "tests.h"

openpgpsdk/trunk/tests/tests.c

@@ -10 +10 @@
-#include "CUnit/Basic.h"
-#include "openpgpsdk/readerwriter.h"
-// \todo remove the need for this
-#include "../src/advanced/parse_local.h"
-
-#include "tests.h"