Changeset 484

Timestamp:

08/10/07 13:07:33

Author:

rachel

Message:

Added explicit test for Encrypted PK Session Key
Some refactoring

Files:

• openpgpsdk/trunk/include/openpgpsdk/std_print.h (modified) (1 diff)
• openpgpsdk/trunk/src/advanced/adv_create.c (modified) (1 diff)
• openpgpsdk/trunk/src/standard/std_print.c (modified) (2 diffs)
• openpgpsdk/trunk/tests/test_packet_types.c (modified) (9 diffs)
• openpgpsdk/trunk/tests/tests.c (modified) (3 diffs)
• openpgpsdk/trunk/tests/tests.h (modified) (1 diff)

openpgpsdk/trunk/include/openpgpsdk/std_print.h

@@ -5 +5 @@
-#define OPS_STD_PRINT_H
-
+#include "openpgpsdk/packet.h"
+#include "openpgpsdk/packet-parse.h"
+#include "openpgpsdk/keyring.h"
+
+void ops_print_pk_session_key(ops_content_tag_t tag,
+                          const ops_pk_session_key_t *key);
-void ops_print_public_key(const ops_key_data_t *key);
-

openpgpsdk/trunk/src/advanced/adv_create.c

@@ -815 +815 @@
-        && ops_write_scalar(pksk->algorithm, 1, info)
-        && ops_write_mpi(pksk->parameters.rsa.encrypted_m, info)
-
+
+
-    }
-

openpgpsdk/trunk/src/standard/std_print.c

@@ -488 +488 @@
-    }
-
-static void 
+void ops_
-                                 const ops_pk_session_key_t *key)
-    {
@@ -1116 +1116 @@
-    case OPS_PTAG_CT_PK_SESSION_KEY:
-    case OPS_PTAG_CT_ENCRYPTED_PK_SESSION_KEY:
-
+ops_
-        break;
-
-    case OPS_PARSER_CMD_GET_SECRET_KEY:
-
+ops_
-                             content->get_secret_key.pk_session_key);
-

openpgpsdk/trunk/tests/test_packet_types.c

@@ -20 +20 @@
-static unsigned char* mdc_data=NULL;
-static size_t sz_mdc_data=0;
+static unsigned char* encrypted_pk_sk=NULL;
+static size_t sz_encrypted_pk_sk=0;
-
-#define MAXBUF 128
-
-static void cleanup();
-//static void print_hash(char* str, unsigned char* data);
-
-/* 
@@ -32 +33 @@
-int init_suite_packet_types(void)
-    {
+    char keydetails[MAXBUF+1];
+    char keyring_name[MAXBUF+1];
+    int fd=0;
+    char cmd[MAXBUF+1];
+
-    // Initialise OPS 
-    ops_init();
+
+    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,MAXBUF,"%s/%s",dir,"keydetails.alpha");
+
+    if ((fd=open(keydetails,O_WRONLY | O_CREAT | O_EXCL, 0600))<0)
+        {
+        fprintf(stderr,"Can't create key details\n");
+        return 1;
+        }
+
+    write(fd,rsa_nopass,strlen(rsa_nopass));
+    close(fd);
+
+    snprintf(cmd,MAXBUF,"gpg --quiet --gen-key --expert --homedir=%s --batch %s",dir,keydetails);
+    system(cmd);
+
+    // read keyrings
+    snprintf(keyring_name,MAXBUF,"%s/pubring.gpg", dir);
+    ops_keyring_read(&pub_keyring,keyring_name);
+
+    // read keyring
+    snprintf(keyring_name,MAXBUF,"%s/secring.gpg", dir);
+    ops_keyring_read(&sec_keyring,keyring_name);
-
-    // Return success
@@ -62 +99 @@
-    case OPS_PTAG_CT_LITERAL_DATA_BODY:
-        sz_literal_data=content->literal_data_body.length;
-        //      literal_data=ops_mallocz(content->literal_data_body.length+1);
-        //        memcpy(literal_data,content->literal_data_body.data,content->literal_data_body.length);
-        literal_data=ops_mallocz(sz_literal_data+1);
-        memcpy(literal_data,content->literal_data_body.data,sz_literal_data);
-        break;
-
-    case OPS_PARSER_PTAG:
-    case OPS_PTAG_CT_LITERAL_DATA_HEADER:
-        // ignore
-        break;
-
-    case OPS_PARSER_ERROR:
-        printf("parse error: %s\n",content->error.error);
-        break;
-
-    case OPS_PARSER_ERRCODE:
-        printf("parse error: %s\n",
-               ops_errcode(content->errcode.errcode));
-        break;
-
-    default:
-
-
-
+
-        }
-
@@ -100 +123 @@
-        //      ops_print_packet(content_);
-
-    // Read data from packet into static buffer
-    switch(content_->tag)
-        {
@@ -110 +132 @@
-                break;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        break;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-    default:
-
-
-
+
-        }
-
@@ -143 +183 @@
-    switch(content_->tag)
-        {
-    case OPS_PARSER_PTAG:
-        // ignore
-        break;
-
-    case OPS_PTAG_CT_LITERAL_DATA_HEADER:
-    case OPS_PTAG_CT_LITERAL_DATA_BODY:
@@ -153 +189 @@
-
-    default:
-
-
-
+
-        }
-
@@ -438 +472 @@
-    }
-
+static void test_ops_encrypted_pk_sk()
+    {
+    char *user_id="Alpha (RSA, no passphrase) <alpha@test.com>";
+    ops_pk_session_key_t *encrypted_pk_session_key;
+    ops_create_info_t *cinfo;
+    ops_parse_info_t *pinfo;
+    ops_memory_t *mem;
+    int rtn=0;
+
+    // setup for write
+    ops_setup_memory_write(&cinfo,&mem,MAXBUF);
+
+    // write
+    const ops_key_data_t *pub_key=ops_keyring_find_key_by_userid(&pub_keyring, user_id);
+    encrypted_pk_session_key=ops_create_pk_session_key(pub_key);
+    ops_write_pk_session_key(cinfo,encrypted_pk_session_key);
+
+    // setup for read
+    ops_setup_memory_read(&pinfo,mem,callback_encrypted_pk_session_key);
+
+    // read
+    rtn=ops_parse(pinfo);
+
+    // test
+    CU_ASSERT(memcmp(encrypted_pk_session_key, encrypted_pk_sk, sz_encrypted_pk_sk)==0);
+
+    // cleanup
+    cleanup();
+    ops_teardown_memory_read(pinfo,mem);
+    }
+
-CU_pSuite suite_packet_types()
-{
@@ -461 +526 @@
-
-    if (NULL == CU_add_test(suite, "Tag 20: Sym. Encrypted Integrity Protected Data packet", test_ops_se_ip))
+            return NULL;
+
+    if (NULL == CU_add_test(suite, "Tag 1: PK Encrypted Session Key packet", test_ops_encrypted_pk_sk))
-            return NULL;
-

openpgpsdk/trunk/tests/tests.c

@@ -8 +8 @@
-#include "CUnit/Basic.h"
-#include "openpgpsdk/readerwriter.h"
+// \todo remove the need for this
+#include "../src/advanced/parse_local.h"
-
-#include "tests.h"
@@ -17 +19 @@
-
-char dir[MAXBUF+1];
+ops_keyring_t pub_keyring;
+ops_keyring_t sec_keyring;
+static char* no_passphrase="";
-
-int main()
@@ -94 +99 @@
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

openpgpsdk/trunk/tests/tests.h

@@ -20 +20 @@
-#define MAXBUF 128
-
+ops_parse_cb_return_t
+callback_general(const ops_parser_content_t *content_,ops_parse_cb_info_t *cbinfo);
+ops_parse_cb_return_t
+callback_cmd_get_secret_key(const ops_parser_content_t *content_,ops_parse_cb_info_t *cbinfo);
+ops_parse_cb_return_t
+callback_cmd_get_secret_key_passphrase(const ops_parser_content_t *content_,ops_parse_cb_info_t *cbinfo);
+
+ops_keyring_t pub_keyring;
+ops_keyring_t sec_keyring;
-#endif
-