Changeset 373

Timestamp:

02/21/06 10:33:23

Author:

ben

Message:

Start handling symmetric encryption.

Files:

• openpgpsdk/trunk/examples/packet-dump.c (modified) (2 diffs)
• openpgpsdk/trunk/include/openpgpsdk/crypto.h (modified) (1 diff)
• openpgpsdk/trunk/include/openpgpsdk/packet.h (modified) (4 diffs)
• openpgpsdk/trunk/src/packet-parse.c (modified) (4 diffs)
• openpgpsdk/trunk/src/packet-show.c (modified) (1 diff)
• openpgpsdk/trunk/src/symmetric.c (modified) (1 diff)

openpgpsdk/trunk/examples/packet-dump.c

@@ -431 +431 @@
-        break;
-
-
+_HEADER
-        print_tagname("SYMMETRIC ENCRYPTED DATA");
+        break;
+
+    case OPS_PTAG_CT_SE_IP_DATA_HEADER:
+        print_tagname("SYMMETRIC ENCRYPTED INTEGRITY PROTECTED DATA HEADER");
+        printf("Version: %d\n",content->se_ip_data_header.version);
+        break;
+
+    case OPS_PTAG_CT_SE_IP_DATA_BODY:
+        print_tagname("SYMMETRIC ENCRYPTED INTEGRITY PROTECTED DATA BODY");
+        printf("  data body length=%d\n",
+               content->se_data_body.length);
+        printf("    data=");
+        hexdump(content->se_data_body.data,
+                content->se_data_body.length);
+        printf("\n");
-        break;
-
@@ -921 +936 @@
-        print_hexdump("key ID",content->pk_session_key.key_id,
-                      sizeof content->pk_session_key.key_id);
-
+
+
-        switch(content->pk_session_key.algorithm)
-            {

openpgpsdk/trunk/include/openpgpsdk/crypto.h

@@ -82 +82 @@
-unsigned ops_key_size(ops_symmetric_algorithm_t alg);
-
-
+
+
-
-void ops_decrypt_any(ops_decrypt_t *decrypt,ops_symmetric_algorithm_t alg);

openpgpsdk/trunk/include/openpgpsdk/packet.h

@@ -137 +137 @@
-    OPS_PTAG_CT_RESERVED3               =16,    /*!< reserved */
-    OPS_PTAG_CT_USER_ATTRIBUTE          =17,    /*!< User Attribute Packet */
-K
+E
-    OPS_PTAG_CT_MDC                     =19,    /*!< Modification Detection Code Packet */
-
@@ -200 +200 @@
-    OPS_PTAG_CT_SE_DATA_HEADER          =0x300+11,
-    OPS_PTAG_CT_SE_DATA_BODY            =0x300+12,
+    OPS_PTAG_CT_SE_IP_DATA_HEADER       =0x300+13,
+    OPS_PTAG_CT_SE_IP_DATA_BODY         =0x300+14,
-
-    /* commands to the callback */
@@ -834 +836 @@
-    char                       **passphrase; /* point somewhere that gets filled in to work around constness of content */
-    } ops_secret_key_passphrase_t;
+
+typedef enum
+    {
+    OPS_SE_IP_V1=1
+    } ops_se_ip_version_t;
+
+typedef struct
+    {
+    ops_se_ip_version_t         version;
+    } ops_se_ip_data_header_t;
+
+typedef struct
+    {
+    unsigned                    length;
+    unsigned char               data[8192];
+    } ops_se_data_body_t;
-
-/** ops_parser_union_content_t */
@@ -881 +899 @@
-    ops_pk_session_key_t        pk_session_key;
-    ops_secret_key_passphrase_t secret_key_passphrase;
+    ops_se_ip_data_header_t     se_ip_data_header;
+    ops_se_data_body_t          se_data_body;
-    } ops_parser_content_union_t;
-

openpgpsdk/trunk/src/packet-parse.c

@@ -633 +633 @@
-    case OPS_PTAG_CT_ARMOUR_TRAILER:
-    case OPS_PTAG_CT_SIGNATURE_HEADER:
-
+
+
+
-        break;
-
@@ -2106 +2108 @@
-    }
-
+// XXX: make this static?
+int ops_decrypt_data(ops_content_tag_t tag,ops_region_t *region,
+                     ops_parse_info_t *pinfo)
+    {
+    int r=1;
+    ops_decrypt_t *decrypt=ops_parse_get_decrypt(pinfo);
+
+    if(decrypt)
+        {
+        ops_reader_push_decrypt(pinfo,decrypt,region);
+        r=ops_parse(pinfo);
+        ops_reader_pop_decrypt(pinfo);
+        }
+    else
+        {
+        ops_parser_content_t content;
+
+        while(region->length_read < region->length)
+            {
+            unsigned l=region->length-region->length_read;
+
+            if(l > sizeof C.se_data_body.data)
+                l=sizeof C.se_data_body.data;
+
+            if(!limited_read(C.se_data_body.data,l,region,pinfo))
+                return 0;
+
+            C.se_data_body.length=l;
+
+            CBP(pinfo,tag,&content);
+            }
+        }
+
+    return r;
+    }
+
-static int parse_se_data(ops_region_t *region,ops_parse_info_t *parse_info)
-    {
@@ -2111 +2149 @@
-
-    /* there's no info to go with this, so just announce it */
-
+_HEADER
-
-    /* The content of an encrypted data packet is more OpenPGP packets
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -2243 +2298 @@
-        break;
-
+    case OPS_PTAG_CT_SE_IP_DATA:
+        r=parse_se_ip_data(&region,parse_info);
+        break;
+
-    default:
-        format_error(&content,"Format error (unknown content tag %d)",

openpgpsdk/trunk/src/packet-show.c

@@ -39 +39 @@
-    { OPS_PTAG_CT_RESERVED3,            "reserved" },
-    { OPS_PTAG_CT_USER_ATTRIBUTE,       "User Attribute" },
-K
+E
-    { OPS_PTAG_CT_MDC,                  "Modification Detection Code" },
-    { (int) NULL,               (char *)NULL }, /* this is the end-of-array marker */

openpgpsdk/trunk/src/symmetric.c

@@ -130 +130 @@
-    
-    ops_reader_pop(pinfo);
-    }
-
-int ops_decrypt_data(ops_region_t *region,ops_parse_info_t *pinfo)
-    {
-    int r;
-
-    ops_reader_push_decrypt(pinfo,ops_parse_get_decrypt(pinfo),region);
-    r=ops_parse(pinfo);
-    ops_reader_pop_decrypt(pinfo);
-
-    return r;
-    }
-