Changeset 466

Timestamp:

04/11/07 17:30:49

Author:

rachel

Message:

More RSA decryption tests.
Decryption with supplied passphrase now working in tests.

Files:

• openpgpsdk/trunk/include/openpgpsdk/keyring.h (modified) (1 diff)
• openpgpsdk/trunk/src/advanced/adv_keyring.c (modified) (3 diffs)
• openpgpsdk/trunk/tests/tests.c (modified) (11 diffs)

openpgpsdk/trunk/include/openpgpsdk/keyring.h

@@ -39 +39 @@
-void ops_keyring_read(ops_keyring_t *keyring,const char *file);
-
+char *ops_malloc_passphrase(char *passphrase);
-char *ops_get_passphrase(void);
-

openpgpsdk/trunk/src/advanced/adv_keyring.c

@@ -88 +88 @@
-    }
-
-
-
-
+
+
-    char *passphrase;
-    size_t n;
-
+    n=strlen(pp);
+    passphrase=malloc(n+1);
+    strcpy(passphrase,pp);
+
+    return passphrase;
+    }
+
+char *ops_get_passphrase(void)
+    {
+    char buffer[1024];
+    size_t n;
+
-    printf("Passphrase: ");
-
+
-    echo_off();
-    fgets(buffer,sizeof buffer,stdin);
@@ -105 +116 @@
-    if(n && buffer[n-1] == '\n')
-        buffer[--n]='\0';
-
-
-
-
+
-    }
-
@@ -131 +139 @@
-    case OPS_PTAG_CT_USER_ID:
-    case OPS_PTAG_CT_SIGNATURE:
+    case OPS_PTAG_CT_SIGNATURE_HEADER:
+    case OPS_PTAG_CT_SIGNATURE_FOOTER:
-    case OPS_PTAG_CT_TRUST:
-        break;

openpgpsdk/trunk/tests/tests.c

@@ -17 +17 @@
-#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"
+
-#define MAXBUF 128
-static char secring[MAXBUF+1];
-static char dir[MAXBUF+1];
-static char file[MAXBUF+1];
-static char keydetails[MAXBUF+1];
-static ops_keyring_t keyring;
-
+
+
+
+
+
+
+
+
-static char* text;
+
+static char *create_testtext(const char *filename)
+    {
+    static char buffer[MAXBUF+1];
+    snprintf(buffer,MAXBUF,"Hello world : %s/%s\n", dir, filename);
+    return &buffer[0];
+    }
+
+static int create_testfile(const char *name)
+    {
+    char filename[MAXBUF+1];
+    char buffer[MAXBUF+1];
+
+    int fd=0;
+    snprintf(filename,MAXBUF,"%s/%s",dir,name);
+    if ((fd=open(filename,O_WRONLY| O_CREAT | O_EXCL, 0600))<0)
+        return 0;
+
+    snprintf(buffer,MAXBUF,create_testtext(name));
+    write(fd,buffer,strlen(buffer));
+    close(fd);
+    return 1;
+    }
-
-static ops_parse_cb_return_t
@@ -32 +68 @@
-    static ops_boolean_t skipping;
-    static const ops_key_data_t *decrypter;
-
+
+
-
-    OPS_USED(cbinfo);
@@ -69 +106 @@
-
-    case OPS_PARSER_CMD_GET_SECRET_KEY:
-
- || !ops_key_is_secret(key
+data
+data || !ops_key_is_secret(keydata
-            return 0;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        break;
-
@@ -135 +207 @@
-int init_suite_rsa_decrypt(void)
-    {
-    char *textfile="testfile.txt";
-    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
@@ -142 +216 @@
-        return 1;
-
-
-
-snprintf(file,MAXBUF,"%s/%s",dir,textfil
-
-if ((fd=open(file,O_WRONLY| O_CREAT | O_EXCL, 0600))<0)
-       return 1
-
-close(fd);
-
-// create new keyrings in that directory
-
-
-
+
+
+create_testfile(filename_rsa_noarmour_nopassphras
+
+create_testfile(filename_rsa_noarmour_passphrase);
+    create_testfile(filename_rsa_armour_passphrase)
+
+/*
+
+ */
+
+
+
-    if ((fd=open(keydetails,O_WRONLY | O_CREAT | O_EXCL, 0600))<0)
-        {
@@ -161 +235 @@
-        }
-
-    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";
-    write(fd,rsa_nopass,strlen(rsa_nopass));
-    close(fd);
-
-
-
-
+
-    system(cmd);
-
-    // Now encrypt the test file with GPG
-encrypt --homedir=%s --recipient Alpha %s 2>&1 > /dev/null", dir, fil
+quiet --encrypt --homedir=%s --recipient Alpha %s/%s", dir, dir, filename_rsa_noarmour_nopassphras
-    if (system(cmd))
-        {
@@ -178 +249 @@
-
-    // Now encrypt and ascii-armour the test file with GPG
-encrypt --armor --homedir=%s --recipient Alpha %s 2>&1 > /dev/null", dir, fil
+quiet --encrypt --armor --homedir=%s --recipient Alpha %s/%s", dir, dir, filename_rsa_armour_nopassphras
-    if (system(cmd))
-        {
-        return 1;
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    snprintf(secring,MAXBUF,"%s/secring.gpg", dir);
-
-    // Initialise OPS and read keyring
-    ops_init();
-    ops_keyring_read(&keyring,secring);
-
@@ -198 +301 @@
-    char cmd[MAXBUF+1];
-        
-       
-
+    
+
-    ops_keyring_free(&keyring);
-    ops_finish();
-
-       
+    
-    snprintf(cmd,MAXBUF,"rm -rf %s", dir);
-    if (system(cmd))
@@ -210 +313 @@
-        return 1;
-        }
-
+
-    return 0;
-    }
-
-
-
-
-
-
-
+
+
-    char encfile[MAXBUF+1];
+    char *suffix= has_armour ? "asc" : "gpg";
-    int fd=0;
-    ops_parse_info_t *pinfo;
-
-read
-.gpg", file
+
+open
+/%s.%s",dir,filename,suffix
-    fd=open(encfile,O_RDONLY);
-    if(fd < 0)
@@ -232 +332 @@
-        exit(2);
-        }
-
-
+
+
+
-    pinfo=ops_parse_info_new();
-    ops_reader_set_fd(pinfo,fd);
-    ops_parse_cb_set(pinfo,callback,NULL);
-
+    // Set up armour/passphrase options
+
+    if (has_armour)
+        ops_reader_push_dearmour(pinfo,ops_false,ops_false,ops_false);
+    current_passphrase=has_passphrase ? passphrase : nopassphrase;
+    
+    // Do the decryption
+
-    ops_parse(pinfo);
-
-
-
+
+
+
+
+
+
-    // File contents should match
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -295 +400 @@
-        return CU_get_error();
-        }
-
+
-    // add tests to suite
-
-ion_unarmoured
+
+_noarmour
-        {
-        CU_cleanup_registry();
-        return CU_get_error();
-        }
-
-ion_armoured
+
+_armour
-        {
-        CU_cleanup_registry();
-        return CU_get_error();
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // Run tests
-    CU_basic_set_mode(CU_BRM_VERBOSE);