Changeset 620

Timestamp:

09/09/08 11:12:43

Author:

rachel

Message:

Added test to verify armoured message with no headers is OK.
Enforce strict checking of armoured messages.

Files:

• openpgpsdk/trunk/include/openpgpsdk/armour.h (modified) (1 diff)
• openpgpsdk/trunk/src/lib/crypto.c (modified) (1 diff)
• openpgpsdk/trunk/src/lib/keyring.c (modified) (2 diffs)
• openpgpsdk/trunk/src/lib/packet-print.c (modified) (1 diff)
• openpgpsdk/trunk/src/lib/reader_armoured.c (modified) (2 diffs)
• openpgpsdk/trunk/src/lib/validate.c (modified) (1 diff)
• openpgpsdk/trunk/tests/test_rsa_decrypt.c (modified) (1 diff)
• openpgpsdk/trunk/tests/test_rsa_encrypt.c (modified) (1 diff)
• openpgpsdk/trunk/tests/test_rsa_signature.c (modified) (4 diffs)
• openpgpsdk/trunk/tests/test_rsa_verify.c (modified) (8 diffs)

openpgpsdk/trunk/include/openpgpsdk/armour.h

@@ -28 +28 @@
-unsigned ops_crc24(unsigned checksum,unsigned char c);
-
-
-
-
-
+
-
-void ops_reader_pop_dearmour(ops_parse_info_t *parse_info);

openpgpsdk/trunk/src/lib/crypto.c

@@ -292 +292 @@
-
-    if (use_armour)
-,ops_false,ops_false,ops_false
+
-    
-    // Do it

openpgpsdk/trunk/src/lib/keyring.c

@@ -564 +564 @@
-
-    if (armour)
-, ops_false, ops_false, ops_false
+
-
-    if ( ops_parse_and_accumulate(keyring,pinfo) == 0 ) {
@@ -628 +628 @@
-
-    if (armour)
-, ops_false, ops_false, ops_false
+
-
-    if ( ops_parse_and_accumulate(keyring,pinfo) == 0 ) 

openpgpsdk/trunk/src/lib/packet-print.c

@@ -1806 +1806 @@
-
-    if(armour)
-,ops_true,ops_true,ops_true
+
-
-    ops_parse_and_print_errors(pinfo);

openpgpsdk/trunk/src/lib/reader_armoured.c

@@ -994 +994 @@
- * \brief Pushes dearmouring reader onto stack
- * \param parse_info Usual structure containing information about to how to do the parse
- * \param without_gap Allow headers in armoured data that are not separated from the data by a blank line
- * \param no_gap Allow no blank line at the start of armoured data
- * \param trailing_whitespace Allow armoured data to have trailing whitespace where we strictly would not expect it
- * \sa ops_reader_pop_dearmour()
- */
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-    dearmour_arg_t *arg;
@@ -1008 +1020 @@
-    arg=ops_mallocz(sizeof *arg);
-    arg->seen_nl=ops_true;
+/*
-    arg->allow_headers_without_gap=without_gap;
-    arg->allow_no_gap=no_gap;
-    arg->allow_trailing_whitespace=trailing_whitespace;
-
+
-    arg->expect_sig=ops_false;
-    arg->got_sig=ops_false;

openpgpsdk/trunk/src/lib/validate.c

@@ -609 +609 @@
-
-    if (armoured)
-,ops_false,ops_false,ops_false
+
-    
-    // Do the verification

openpgpsdk/trunk/tests/test_rsa_decrypt.c

@@ -155 +155 @@
-
-    if (has_armour)
-,ops_false,ops_false,ops_false
+
-    
-    // setup for writing parsed data to mem_out

openpgpsdk/trunk/tests/test_rsa_encrypt.c

@@ -150 +150 @@
-    // other setup
-    if (use_armour)
-,ops_false,ops_false,ops_false
+
-
-    // do it

openpgpsdk/trunk/tests/test_rsa_signature.c

@@ -148 +148 @@
-    // Must de-armour because it's clearsigned
-    
-,ops_false,ops_false,ops_false
+
-    
-    // Do the verification
@@ -252 +252 @@
-    // Must de-armour because it's clearsigned
-    
-,ops_false,ops_false,ops_false
+
-    
-    // Do the verification
@@ -342 +342 @@
-    
-    if (use_armour)
-,ops_false,ops_false,ops_false
+
-    
-    // Do the verification
@@ -407 +407 @@
-    
-    if (use_armour)
-,ops_false,ops_false,ops_false
+
-    
-    // Do the verification

openpgpsdk/trunk/tests/test_rsa_verify.c

@@ -59 +59 @@
-
-static int num_malformed=0;
+static int num_wellformed=0;
-
-typedef ops_parse_cb_return_t (*ops_callback)(const ops_parser_content_t *, ops_parse_cb_info_t *);
@@ -70 +71 @@
-    snprintf(filename,maxlen,"malformed_%d.txt",i);
-    }
+
+static void make_filename_wellformed(char* filename, int maxlen, const int i)
+    {
+    snprintf(filename,maxlen,"wellformed_%d.txt",i);
+    }
+
+static void create_wellformed_testfiles()
+    {
+    int i=0;
+    int fd=0;
+    char* wellformed[]=
+        {
+        // no headers
+        "-----BEGIN PGP SIGNED MESSAGE-----\n\nmessage to encrypt\n-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v1.4.6 (GNU/Linux)\n\niJwEAQECAAYFAkiup4kACgkQr5tWFB2nA4mpVwP8DeeMDFrp7ICHYleyW/UmBIQH\ndXuviEA9WK/BUyHVKxLOyciAw18vm1rKJE9Q30GUrFkPvaOV6XZXZMDBXY/CQixT\nHjKRoFapgbzA5hqDeLjjkJ59hjS5jmsOrdyIebOVrF7YaSRji15uAeeIzBQ0lClZ\nupkvjuuc6o0RoS/+otk=\n=itEi\n-----END PGP SIGNATURE-----\n",
+        };
+    num_wellformed=sizeof (wellformed)/sizeof(char *);
+    for (i=0; i<num_wellformed; i++)
+        {
+        char fullname[MAXBUF];
+        char filename[MAXBUF];
+        make_filename_wellformed(filename,MAXBUF,i);
+        snprintf(fullname,MAXBUF,"%s/%s.asc",dir,filename);
+        if ((fd=open(fullname,O_WRONLY | O_CREAT, 0600)) < 0)
+            {
+            fprintf(stderr,"create_wellformed_testfiles: cannot open file %s for writing\n", fullname);
+            return;
+            }
+        write(fd,wellformed[i],strlen(wellformed[i]));
+        close(fd);
+        }
+}
-
-static void create_malformed_testfiles()
@@ -102 +134 @@
-        "-----BEGIN PGP SIGNED MESSAGE-----\nUnknown: Header\n\nmessage to encrypt\n-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v1.4.6 (GNU/Linux)\n\niJwEAQECAAYFAkiup4kACgkQr5tWFB2nA4mpVwP8DeeMDFrp7ICHYleyW/UmBIQH\ndXuviEA9WK/BUyHVKxLOyciAw18vm1rKJE9Q30GUrFkPvaOV6XZXZMDBXY/CQixT\nHjKRoFapgbzA5hqDeLjjkJ59hjS5jmsOrdyIebOVrF7YaSRji15uAeeIzBQ0lClZ\nupkvjuuc6o0RoS/+otk=\n=itEi\n-----END PGP SIGNATURE-----\n",
-        // bad armour trailer
-
+
+
+
-    };
-    num_malformed=sizeof (malformed)/sizeof(char *);
@@ -139 +173 @@
-
-    create_malformed_testfiles();
+    create_wellformed_testfiles();
-
-    // Now sign the test files with GPG
@@ -310 +345 @@
-
-    if (has_armour)
-,ops_false,ops_false,ops_false
+
-    
-    // Do the verification
@@ -378 +413 @@
-    if (errstack)
-        {
+        CU_ASSERT(ops_has_error(errstack,expected_errcode));
-        if  (!ops_has_error(errstack,expected_errcode))
+            {
+            printf("\nfilename=%s: errstack->errcode=0x%2x\n", filename, errstack->errcode);
+            ops_print_errors(errstack);
+            }
+        }
+    CU_ASSERT(rtn==0);
+
+    // clean up
+    ops_parse_info_delete(pinfo);
+    }
+
+static void test_rsa_verify_wellformed(const int has_armour, const char *filename, ops_callback callback)
+    {
+    int rtn=0;
+    ops_parse_info_t *pinfo=NULL;
+    ops_callback cb=NULL;
+    ops_error_t* errstack=NULL;
+
+    cb = callback==NULL ? callback_verify : callback;
+
+    // setup
+    pinfo=ops_parse_info_new();
+
+    // parse
+    rtn=test_rsa_verify(has_armour, filename, cb, pinfo);
+
+    // handle result - should fail with UNKNOWN SIGNER but not BAD FORMAT
+    errstack=ops_parse_info_get_errors(pinfo);
+
+    CU_ASSERT(errstack!=NULL);
+
+    // print out errors if we have actually got a different error
+    // to the one expected
+    if (errstack)
+        {
+        CU_ASSERT(ops_has_error(errstack,OPS_E_V_UNKNOWN_SIGNER));
+        CU_ASSERT(!ops_has_error(errstack,OPS_E_R_BAD_FORMAT));
+        if  (ops_has_error(errstack,OPS_E_R_BAD_FORMAT)
+             || !ops_has_error(errstack,OPS_E_V_UNKNOWN_SIGNER))
-            {
-            printf("\nfilename=%s: errstack->errcode=0x%2x\n", filename, errstack->errcode);
@@ -538 +613 @@
-    }
-
+static void test_rsa_verify_clearsign_fail_wellformed_msg(void)
+    {
+    int i=0;
+    int armour=1;
+    assert(pub_keyring.nkeys);
+
+    for (i=0; i<num_wellformed; i++)
+        {
+        char filename[MAXBUF];
+        make_filename_wellformed(filename,MAXBUF,i);
+        test_rsa_verify_wellformed(armour,filename,NULL);
+        }
+    }
+
-CU_pSuite suite_rsa_verify()
-{
@@ -583 +672 @@
-            return NULL;
-
+    if (NULL == CU_add_test(suite, "Clearsign: should not get BAD FORMAT on wellformed message", test_rsa_verify_clearsign_fail_wellformed_msg))
+            return NULL;
+
-    return suite;
-}