Changeset 610

Timestamp:

09/01/08 13:31:54

Author:

rachel

Message:

Add more tests for malformed PGP armoured messages.
Implemented better checking for malformed PGP armoured messages.

Files:

• openpgpsdk/trunk/include/openpgpsdk/errors.h (modified) (3 diffs)
• openpgpsdk/trunk/include/openpgpsdk/packet-parse.h (modified) (1 diff)
• openpgpsdk/trunk/src/lib/errors.c (modified) (1 diff)
• openpgpsdk/trunk/src/lib/reader_armoured.c (modified) (12 diffs)
• openpgpsdk/trunk/src/lib/validate.c (modified) (1 diff)
• openpgpsdk/trunk/tests/test_rsa_verify.c (modified) (3 diffs)

openpgpsdk/trunk/include/openpgpsdk/errors.h

@@ -30 +30 @@
-
-/** error codes */
-adv_
+
-typedef enum 
-    {
@@ -43 +43 @@
-    OPS_E_R_EARLY_EOF           =OPS_E_R+2,
-    OPS_E_R_BAD_FORMAT          =OPS_E_R+3, // For example, malformed armour
-
+
+
-
-    /* writer errors */
@@ -66 +67 @@
-    OPS_E_V=0x5000, /* general validation error */
-    OPS_E_V_BAD_SIGNATURE       =OPS_E_V+1,
-
+
+
-
-    /* Algorithm support errors */

openpgpsdk/trunk/include/openpgpsdk/packet-parse.h

@@ -78 +78 @@
-typedef struct ops_reader_info ops_reader_info_t;
-typedef struct ops_crypt_info ops_crypt_info_t;
-
-/*
-typedef ops_reader_ret_t ops_reader_t(unsigned char *dest,
-                                      unsigned *plength,
-                                      ops_reader_flags_t flags,
-                                      ops_error_t **errors,
-                                      ops_reader_info_t *rinfo,
-                                      ops_parse_cb_info_t *cbinfo);
-*/
-
-/*

openpgpsdk/trunk/src/lib/errors.c

@@ -67 +67 @@
-    ERRNAME(OPS_E_V),
-    ERRNAME(OPS_E_V_BAD_SIGNATURE),
+    ERRNAME(OPS_E_V_NO_SIGNATURE),
-    ERRNAME(OPS_E_V_UNKNOWN_SIGNER),
-

openpgpsdk/trunk/src/lib/reader_armoured.c

@@ -36 +36 @@
-#include <openpgpsdk/hash.h>
-#include <openpgpsdk/packet-parse.h>
+#include "parse_local.h"
-
-#include <string.h>
@@ -42 +43 @@
-#include <openpgpsdk/final.h>
-
-//
+
-
-#define CRC24_POLY 0x1864cfbL
@@ -57 +58 @@
-        AT_TRAILER_NAME,
-        } state;
+
+    enum
+        {
+        NONE=0,
+        BEGIN_PGP_MESSAGE,
+        BEGIN_PGP_PUBLIC_KEY_BLOCK,
+        BEGIN_PGP_PRIVATE_KEY_BLOCK,
+        BEGIN_PGP_MULTI,
+        BEGIN_PGP_SIGNATURE,
+
+        END_PGP_MESSAGE,
+        END_PGP_PUBLIC_KEY_BLOCK,
+        END_PGP_PRIVATE_KEY_BLOCK,
+        END_PGP_MULTI,
+        END_PGP_SIGNATURE,
+
+        BEGIN_PGP_SIGNED_MESSAGE
+        } lastseen;
+
-    ops_parse_info_t *parse_info;
-    ops_boolean_t seen_nl:1;
@@ -73 +93 @@
-                                                 strictly expect it */
-
+    // it is an error to get a cleartext message without a sig
+    ops_boolean_t expect_sig:1;
+    ops_boolean_t got_sig:1;
+
-    // base64 stuff
-    unsigned buffered;
@@ -101 +125 @@
-    }
-    
+static void set_lastseen_headerline(dearmour_arg_t* arg, char* buf, ops_error_t **errors)
+    {
+    char* begin_msg="BEGIN PGP MESSAGE";
+    char* begin_public="BEGIN PGP PUBLIC KEY BLOCK";
+    char* begin_private="BEGIN PGP PRIVATE KEY BLOCK";
+    char* begin_multi="BEGIN PGP MESSAGE, PART ";
+    char* begin_sig="BEGIN PGP SIGNATURE";
+
+    char* end_msg="END PGP MESSAGE";
+    char* end_public="END PGP PUBLIC KEY BLOCK";
+    char* end_private="END PGP PRIVATE KEY BLOCK";
+    char* end_multi="END PGP MESSAGE, PART ";
+    char* end_sig="END PGP SIGNATURE";
+
+    char* begin_signed_msg="BEGIN PGP SIGNED MESSAGE";
+
+    int prev=arg->lastseen;
+
+    if (!strncmp(buf,begin_msg,strlen(begin_msg)))
+        arg->lastseen=BEGIN_PGP_MESSAGE;
+    if (!strncmp(buf,begin_public,strlen(begin_public)))
+        arg->lastseen=BEGIN_PGP_PUBLIC_KEY_BLOCK;
+    if (!strncmp(buf,begin_private,strlen(begin_private)))
+        arg->lastseen=BEGIN_PGP_PRIVATE_KEY_BLOCK;
+    if (!strncmp(buf,begin_multi,strlen(begin_multi)))
+        arg->lastseen=BEGIN_PGP_MULTI;
+    if (!strncmp(buf,begin_sig,strlen(begin_sig)))
+        arg->lastseen=BEGIN_PGP_SIGNATURE;
+
+    if (!strncmp(buf,end_msg,strlen(end_msg)))
+        arg->lastseen=END_PGP_MESSAGE;
+    if (!strncmp(buf,end_public,strlen(end_public)))
+        arg->lastseen=END_PGP_PUBLIC_KEY_BLOCK;
+    if (!strncmp(buf,end_private,strlen(end_private)))
+        arg->lastseen=END_PGP_PRIVATE_KEY_BLOCK;
+    if (!strncmp(buf,end_multi,strlen(end_multi)))
+        arg->lastseen=END_PGP_MULTI;
+    if (!strncmp(buf,end_sig,strlen(end_sig)))
+        arg->lastseen=END_PGP_SIGNATURE;
+
+    if (!strncmp(buf,begin_signed_msg,strlen(begin_signed_msg)))
+        arg->lastseen=BEGIN_PGP_SIGNED_MESSAGE;
+
+    if (debug)
+        printf("set header: buf=%s, arg->lastseen=%d, prev=%d\n", buf, arg->lastseen, prev);
+
+    switch (arg->lastseen) 
+        {
+    case NONE:
+        OPS_ERROR_1(errors,OPS_E_R_BAD_FORMAT,"Unrecognised Header Line %s", buf);
+        break;
+
+    case END_PGP_MESSAGE:
+        if (prev!=BEGIN_PGP_MESSAGE)
+            OPS_ERROR(errors,OPS_E_R_BAD_FORMAT,"Got END PGP MESSAGE, but not after BEGIN");
+        break;
+
+    case END_PGP_PUBLIC_KEY_BLOCK:
+        if (prev!=BEGIN_PGP_PUBLIC_KEY_BLOCK)
+            OPS_ERROR(errors,OPS_E_R_BAD_FORMAT,"Got END PGP PUBLIC KEY BLOCK, but not after BEGIN");
+        break;
+
+    case END_PGP_PRIVATE_KEY_BLOCK:
+        if (prev!=BEGIN_PGP_PRIVATE_KEY_BLOCK)
+            OPS_ERROR(errors,OPS_E_R_BAD_FORMAT,"Got END PGP PRIVATE KEY BLOCK, but not after BEGIN");
+        break;
+
+    case BEGIN_PGP_MULTI:
+    case END_PGP_MULTI:
+            OPS_ERROR(errors,OPS_E_R_UNSUPPORTED,"Multi-part messages are not yet supported");
+        break;
+
+    case END_PGP_SIGNATURE:
+        if (prev!=BEGIN_PGP_SIGNATURE)
+            OPS_ERROR(errors,OPS_E_R_BAD_FORMAT,"Got END PGP SIGNATURE, but not after BEGIN");
+        break;
+
+    case BEGIN_PGP_MESSAGE:
+    case BEGIN_PGP_PUBLIC_KEY_BLOCK:
+    case BEGIN_PGP_PRIVATE_KEY_BLOCK:
+    case BEGIN_PGP_SIGNATURE:
+    case BEGIN_PGP_SIGNED_MESSAGE:
+        break;
+        }
+    }
+
-static int read_char(dearmour_arg_t *arg,ops_error_t **errors,
-                     ops_reader_info_t *rinfo,
@@ -308 +418 @@
-                hash->add(hash,(unsigned char *)"\r",1);
-            hash->add(hash,body->data,body->length);
+            if (debug)
+                { fprintf(stderr,"Got body:\n%s\n",body->data); }
-            CB(cbinfo,OPS_PTAG_CT_SIGNED_CLEARTEXT_BODY,&content);
-            body->length=0;
@@ -316 +428 @@
-        if(body->length == sizeof body->data)
-            {
+            if (debug)
+                { fprintf(stderr,"Got body (2):\n%s\n",body->data); }
-            CB(cbinfo,OPS_PTAG_CT_SIGNED_CLEARTEXT_BODY,&content);
-            body->length=0;
@@ -685 +799 @@
-                 return -1;
-
+             set_lastseen_headerline(arg,buf,errors);
+
-             if(!strcmp(buf,"BEGIN PGP SIGNED MESSAGE"))
-                 {
-                 ops_dup_headers(&content.content.signed_cleartext_header.headers,&arg->headers);
-                 CB(cbinfo,OPS_PTAG_CT_SIGNED_CLEARTEXT_HEADER,&content);
-
-                 ret=process_dash_escaped(arg,errors,rinfo,cbinfo);
-                 if(ret <= 0)
@@ -754 +869 @@
-             buf[n]='\0';
-
+             set_lastseen_headerline(arg,buf,errors);
+
-             /* Consume trailing '-' */
-             for(count=1 ; count < 5 ; ++count)
@@ -777 +894 @@
-             if(!strncmp(buf,"BEGIN ",6))
-                 {
+                 set_lastseen_headerline(arg,buf,errors);
-                 if((ret=parse_headers(arg,errors,rinfo,cbinfo)) <= 0)
-                     return ret;
@@ -823 +941 @@
-    arg->allow_trailing_whitespace=trailing_whitespace;
-
+    arg->expect_sig=ops_false;
+    arg->got_sig=ops_false;
+
-    ops_reader_push(parse_info,armoured_data_reader,armoured_data_destroyer,arg);
-    }
@@ -831 +952 @@
-void ops_reader_pop_dearmour(ops_parse_info_t *pinfo)
-    {
-//    dearmour_arg_t *arg=ops_reader_get_arg(ops_parse_get_rinfo(parse_
-//    
+dearmour_arg_t *arg=ops_reader_get_arg(ops_parse_get_rinfo(p
+
-    ops_reader_pop(pinfo);
-    }

openpgpsdk/trunk/src/lib/validate.c

@@ -351 +351 @@
-    const ops_keydata_t *signer;
-    ops_boolean_t valid=ops_false;
-    //    unsigned len=0;
-    //    unsigned char *data=NULL;
-    ops_memory_t* mem=NULL;
-

openpgpsdk/trunk/tests/test_rsa_verify.c

@@ -83 +83 @@
-                        "-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA1\n\nmessage to encrypt\n-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v1.4.6 (GNU/Linux)\n",
-                        // no signature
-
+
+
+
+
+
+
+
+
+
+
-    };
-    num_malformed=sizeof (malformed)/sizeof(char *);
@@ -296 +305 @@
-
-    rtn=ops_parse(pinfo);
+    
-
-    if (debug)
@@ -351 +361 @@
-    // handle result - should fail
-    errstack=ops_parse_info_get_errors(pinfo);
+
-    // we are expecting one and only one error
-    // print out errors if we have actually got a different error