Changeset 568

Timestamp:

07/21/08 11:24:55

Author:

rachel

Message:

Implemented high-level function ops_sign_mem and corresponding test.

Files:

• openpgpsdk/trunk/include/openpgpsdk/create.h (modified) (1 diff)
• openpgpsdk/trunk/include/openpgpsdk/readerwriter.h (modified) (1 diff)
• openpgpsdk/trunk/include/openpgpsdk/signature.h (modified) (1 diff)
• openpgpsdk/trunk/src/lib/adv_create.c (modified) (1 diff)
• openpgpsdk/trunk/src/lib/adv_readerwriter.c (modified) (2 diffs)
• openpgpsdk/trunk/src/lib/std_keyring.c (modified) (1 diff)
• openpgpsdk/trunk/src/lib/std_signature.c (modified) (5 diffs)
• openpgpsdk/trunk/tests/test_packet_types.c (modified) (6 diffs)
• openpgpsdk/trunk/tests/test_rsa_signature.c (modified) (3 diffs)
• openpgpsdk/trunk/tests/tests.c (modified) (4 diffs)

openpgpsdk/trunk/include/openpgpsdk/create.h

@@ -106 +106 @@
-
-ops_memory_t* ops_write_buf_from_file(const char *filename);
-
+, const ops_boolean_t overwrite
-
-ops_boolean_t ops_write_symmetrically_encrypted_data(const unsigned char *data, 

openpgpsdk/trunk/include/openpgpsdk/readerwriter.h

@@ -51 +51 @@
-// memory reading
-void ops_setup_memory_read(ops_parse_info_t **pinfo, ops_memory_t *mem,
+                           void* arg,
-                              ops_parse_cb_return_t callback(const ops_parser_content_t *, ops_parse_cb_info_t *));
-void ops_teardown_memory_read(ops_parse_info_t *pinfo, ops_memory_t *mem);

openpgpsdk/trunk/include/openpgpsdk/signature.h

@@ -70 +70 @@
-void ops_sign_buf_as_cleartext(const char* input, const size_t len, ops_memory_t** output, const ops_secret_key_t *skey);
-void ops_sign_file(const char* input_filename, const char* output_filename, const ops_secret_key_t *skey, const ops_boolean_t use_armour, const ops_boolean_t overwrite);
+ops_memory_t * ops_sign_mem(const void* input, const int input_len, const ops_sig_type_t sig_type,  const ops_secret_key_t *skey, const ops_boolean_t use_armour);
-
-#endif

openpgpsdk/trunk/src/lib/adv_create.c

@@ -1384 +1384 @@
-    }
-
-
+, const ops_boolean_t overwrite
-    {
-    int fd=0;
-    size_t n=0;
-
+
+
+
+
+
+
+
-#ifdef WIN32
-
-
-
+
-#endif
+    fd=open(filename,flags, 0600);
-    if (fd < 0)
-        {

openpgpsdk/trunk/src/lib/adv_readerwriter.c

@@ -39 +39 @@
-
-void ops_setup_memory_read(ops_parse_info_t **pinfo, ops_memory_t *mem,
-
+
+
-    {
-    /*
@@ -46 +47 @@
-
-    *pinfo=ops_parse_info_new();
-NULL
+arg
-    ops_reader_set_memory(*pinfo,
-                          ops_memory_get_data(mem),

openpgpsdk/trunk/src/lib/std_keyring.c

@@ -181 +181 @@
-    ops_parse_options(pinfo,OPS_PTAG_SS_ALL,OPS_PARSE_PARSED);
-
-
+NULL, 
-
-    ops_reader_push_dearmour(pinfo,ops_false,ops_false,ops_true);

openpgpsdk/trunk/src/lib/std_signature.c

@@ -33 +33 @@
-    ops_create_info_t *cinfo=NULL;
-    unsigned char buf[MAXBUF];
-
+//
-
-    // open file to sign
@@ -47 +47 @@
-        }
-    
+    // set up output file
-    snprintf(signed_file,sizeof signed_file,"%s.%s",filename,suffix);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    // set up signature
-    sig=ops_create_signature_new();
-    ops_signature_start_cleartext_signature(sig,skey,OPS_HASH_SHA1,OPS_SIG_BINARY);
-
-    // set up output file
-    cinfo=ops_create_info_new();
-    ops_writer_set_fd(cinfo,fd_out); 
-    ops_writer_push_clearsigned(cinfo,sig);
-
@@ -92 +75 @@
-    ops_writer_switch_to_armoured_signature(cinfo);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-
@@ -141 +125 @@
-
-    ops_write_signature(sig,&skey->public_key,skey,cinfo);
+
+    // the calling function must free signed_cleartext
-    ops_writer_close(cinfo);
+    ops_create_info_delete(cinfo);
-    }
-
@@ -231 +218 @@
-    }
-
+ops_memory_t* ops_sign_mem(const void* input, const int input_len, const ops_sig_type_t sig_type, const ops_secret_key_t *skey, const ops_boolean_t use_armour)
+    {
+    // \todo allow choice of hash algorithams
+    // enforce use of SHA1 for now
+
+    unsigned char keyid[OPS_KEY_ID_SIZE];
+    ops_create_signature_t *sig=NULL;
+
+    ops_create_info_t *cinfo=NULL;
+    ops_memory_t *mem=ops_memory_new();
+
+    ops_hash_algorithm_t hash_alg=OPS_HASH_SHA1;
+    //    ops_sig_type_t sig_type=OPS_SIG_BINARY;
+    ops_literal_data_type_t ld_type;
+    ops_hash_t* hash=NULL;
+
+    // setup literal data packet type
+    if (sig_type==OPS_SIG_BINARY)
+        ld_type=OPS_LDT_BINARY;
+    else
+        ld_type=OPS_LDT_TEXT;
+
+    // set up signature
+    sig=ops_create_signature_new();
+    ops_signature_start_message_signature(sig, skey, hash_alg, sig_type);
+
+    // setup writer
+    ops_setup_memory_write(&cinfo, &mem, input_len);
+
+    //  set armoured/not armoured here
+    if (use_armour)
+        ops_writer_push_armoured_message(cinfo);
+
+    if (debug)
+        { fprintf(stderr, "** Writing out one pass sig\n"); } 
+
+    // write one_pass_sig
+    ops_write_one_pass_sig(skey, hash_alg, sig_type, cinfo);
+
+    // hash file contents
+    hash=ops_signature_get_hash(sig);
+    hash->add(hash, input, input_len);
+    
+    // output file contents as Literal Data packet
+
+    if (debug)
+        { fprintf(stderr,"** Writing out data now\n"); }
+
+    ops_write_literal_data_from_buf(input, input_len, ld_type, cinfo);
+
+    if (debug)
+        { fprintf(stderr,"** After Writing out data now\n");}
+
+    // add subpackets to signature
+    // - creation time
+    // - key id
+
+    // \todo add creation time
+    ops_signature_add_creation_time(sig,time(NULL));
+
+    ops_keyid(keyid,&skey->public_key);
+    ops_signature_add_issuer_key_id(sig,keyid);
+
+    ops_signature_hashed_subpackets_end(sig);
+
+    // write out sig
+    ops_write_signature(sig,&skey->public_key,skey,cinfo);
+
+    // tidy up
+    ops_writer_close(cinfo);
+    ops_create_signature_delete(sig);
+
+    return mem;
+    }
+
-// EOF

openpgpsdk/trunk/tests/test_packet_types.c

@@ -153 +153 @@
-
-    // setup for reading from this mem
-
+NULL,
-
-    // setup for writing parsed data to mem_out
@@ -202 +202 @@
-
-    // setup for reading from this mem
-
+NULL,
-
-    // setup for writing parsed data to 2nd mem
@@ -289 +289 @@
-
-    // setup for reading from this compressed packet
-
+NULL,
-
-    // setup for writing parsed data to mem_out
@@ -348 +348 @@
-
-        // Read back and verify contents
-
+NULL,
-        ops_parse_options(pinfo,OPS_PTAG_SS_ALL,OPS_PARSE_PARSED);
-        rtn=ops_parse(pinfo);
@@ -402 +402 @@
-
-    // setup for reading from this mem
-
+NULL,
-
-    // setup for writing parsed data to 2nd mem
@@ -455 +455 @@
-
-    // setup for read
-
+NULL,
-
-    // read

openpgpsdk/trunk/tests/test_rsa_signature.c

@@ -156 +156 @@
-    ops_memory_t *input=NULL;
-    ops_memory_t *output=NULL;
+    ops_boolean_t overwrite;
-
-    // setup filenames 
@@ -171 +172 @@
-
-    // write to file
-
+
+
-
-    /*
@@ -336 +338 @@
-    }
-
+static void test_rsa_signature_sign_memory(const int use_armour, const void* input, const int input_len, const ops_secret_key_t *skey)
+    {
+    int rtn=0;
+    ops_memory_t* mem=NULL;
+    ops_parse_info_t *pinfo=NULL;
+    validate_data_cb_arg_t validate_arg;
+    ops_validate_result_t* result=ops_mallocz(sizeof (ops_validate_result_t));
+    
+
+    // filenames
+
+    mem=ops_sign_mem(input, input_len, OPS_SIG_TEXT, skey, use_armour);
+
+    /*
+     * Validate output
+     */
+
+    if (debug)
+        {
+        fprintf(stderr,"\n***\n*** Starting to parse for validation\n***\n");
+        }
+    
+    ops_write_file_from_buf("/tmp/memory.asc", ops_memory_get_data(mem), ops_memory_get_length(mem),ops_true);
+
+    // Set verification reader and handling options
+    
+    ops_setup_memory_read(&pinfo, mem, &validate_arg, callback_verify);
+    
+    memset(&validate_arg,'\0',sizeof validate_arg);
+    validate_arg.result=result;
+    validate_arg.keyring=&pub_keyring;
+    validate_arg.rarg=ops_reader_get_arg_from_pinfo(pinfo);
+    
+    ops_parse_options(pinfo,OPS_PTAG_SS_ALL,OPS_PARSE_PARSED);
+    pinfo->rinfo.accumulate=ops_true;
+    
+    // Set up armour/passphrase options
+    
+    if (use_armour)
+        ops_reader_push_dearmour(pinfo,ops_false,ops_false,ops_false);
+    
+    // Do the verification
+    
+    rtn=ops_parse_and_print_errors(pinfo);
+    CU_ASSERT(rtn==1);
+    
+    // Tidy up
+    if (use_armour)
+        ops_reader_pop_dearmour(pinfo);
+    
+    ops_parse_info_delete(pinfo);
+    ops_memory_free(mem);
+    ops_validate_result_free(result);
+    }
+
-static void test_rsa_signature_noarmour_nopassphrase(void)
-    {
+    unsigned char testdata[MAXBUF];
-    int armour=0;
-    assert(pub_keyring.nkeys);
-    test_rsa_signature_sign(armour,filename_rsa_noarmour_nopassphrase, alpha_skey);
+    create_testdata("test_rsa_signature_noarmour_nopassphrase",testdata, MAXBUF);
+    test_rsa_signature_sign_memory(armour,testdata,MAXBUF, alpha_skey);
-    }
-
-static void test_rsa_signature_noarmour_passphrase(void)
-    {
+    unsigned char testdata[MAXBUF];
-    int armour=0;
-    assert(pub_keyring.nkeys);
-    test_rsa_signature_sign(armour,filename_rsa_noarmour_passphrase, bravo_skey);
+
+    create_testdata("test_rsa_signature_noarmour_passphrase",testdata, MAXBUF);
+    test_rsa_signature_sign_memory(armour,testdata,MAXBUF, bravo_skey);
-    }
-
-static void test_rsa_signature_armour_nopassphrase(void)
-    {
+    unsigned char testdata[MAXBUF];
-    int armour=1;
-    assert(pub_keyring.nkeys);
-    test_rsa_signature_sign(armour,filename_rsa_armour_nopassphrase, alpha_skey);
+
+    create_testdata("test_rsa_signature_armour_nopassphrase",testdata, MAXBUF);
+    test_rsa_signature_sign_memory(armour,testdata,MAXBUF, alpha_skey);
-    }
-
-static void test_rsa_signature_armour_passphrase(void)
-    {
+    unsigned char testdata[MAXBUF];
+
-    int armour=1;
-    assert(pub_keyring.nkeys);
-    test_rsa_signature_sign(armour,filename_rsa_armour_passphrase, bravo_skey);
+
+    create_testdata("test_rsa_signature_armour_passphrase",testdata, MAXBUF);
+    test_rsa_signature_sign_memory(armour,testdata,MAXBUF, bravo_skey);
-    }
-

openpgpsdk/trunk/tests/tests.c

@@ -24 +24 @@
-        return CU_get_error();
-        }
-
+
-    if (NULL == suite_crypto())
-        {
@@ -51 +51 @@
-        return CU_get_error();
-        }
-
+
-    if (NULL == suite_rsa_signature()) 
-        {
@@ -58 +58 @@
-        return CU_get_error();
-        }
-
+
-    if (NULL == suite_rsa_verify()) 
-        {
@@ -79 +79 @@
-        return CU_get_error();
-        }
+#endif
-
-    // Run tests