Changeset 109

Timestamp:

05/12/05 15:23:10

Author:

rachel

Message:

SS Notation Data

Files:

• openpgpsdk/trunk/src/packet-decode.c (modified) (2 diffs)
• openpgpsdk/trunk/src/packet-decode.h (modified) (1 diff)
• openpgpsdk/trunk/src/packet-dump.c (modified) (2 diffs)
• openpgpsdk/trunk/src/packet-parse.c (modified) (4 diffs)
• openpgpsdk/trunk/src/packet.h (modified) (4 diffs)

openpgpsdk/trunk/src/packet-decode.c

@@ -75 +75 @@
-    };
-
+bit_map_t ss_notation_data_map_byte0[] =
+    {
+    { 0x80,     "Human-readable" },
+    { (unsigned char) NULL,     (char *) NULL },
+    };
+
+bit_map_t * ss_notation_data_map[] =
+    {
+    ss_notation_data_map_byte0,
+    (bit_map_t *) NULL,
+    };
+
-bit_map_t ss_feature_map_byte0[] =
-    {
@@ -403 +415 @@
-        }
-    return decoded;
+    }
+
+/** char *decode_bit (unsigned char octet, bit_map_t *map)
+ */
+
+char * decode_bit(unsigned char octet, bit_map_t * map)
+    {
+    return(search_bit_map(octet,map));
+    }
+
+/** decoded_t * decode_map (data_t *data, bit_map_t *map)
+*/
+
+decoded_t * decode_map(data_t *data, bit_map_t **map)
+    {
+    decoded_t *decoded=NULL;
+    char *str;
+    int i=0, j=0;
+    unsigned char mask, bit;
+
+     decoded=malloc(sizeof(decoded_t));
+    if (!decoded)
+        return NULL;
+
+    decoded_init(decoded);
+
+    for ( i=0; i < data->len; i++)
+        {
+        for (j=0, mask=0x80; j<8; j++, mask = mask>>1 )
+            {
+            bit = data->contents[i]&mask;
+            if (bit)
+                {
+                str=decode_bit ( bit, map[i] );
+                if (!process_bitmap_str( decoded, str, bit))
+                    return NULL;
+                }
+            }
+        }
+    return decoded;
+    }
+
+decoded_t * decode_ss_notation_data_flags(ops_ss_notation_data_t ss_notation_data)
+    {
+    return(decode_map(&ss_notation_data.flags,ss_notation_data_map));
-    }
-

openpgpsdk/trunk/src/packet-decode.h

@@ -55 +55 @@
-char *decode_single_ss_key_server_prefs(unsigned char octet, bit_map_t *map);
-
+decoded_t *decode_ss_notation_data_flags(ops_ss_notation_data_t ss_notation_data);
+
-/* vim:set textwidth=120: */
-/* vim:set ts=8: */

openpgpsdk/trunk/src/packet-dump.c

@@ -109 +109 @@
-
-    hexdump(data,len);
+    printf("\n");
+    }
+
+static void print_data(char *label, const data_t *data,int indentlevel)
+    {
+    if(label)
+        {
+        indent(indentlevel);
+        printf("%s: len=%d, data=0x", label, data->len);
+        }
+
+    hexdump(data->contents,data->len);
-    printf("\n");
-    }
@@ -373 +385 @@
-        break;
-
+    case OPS_PTAG_SS_NOTATION_DATA:
+        indent(1);
+        printf("Notation Data:\n");
+        print_data("Flags",
+                   &content->ss_notation_data.flags,
+                   2);
+        decoded = decode_ss_notation_data_flags(content->ss_notation_data);
+        print_decoded(NULL,decoded,2);
+        decoded_free(decoded);
+
+        /* xxx - TODO: print out UTF - rachel */
+
+        print_data("Name",
+                   &content->ss_notation_data.name,
+                   2);
+
+        print_data("Value",
+                   &content->ss_notation_data.value,
+                   2);
+
+        break;
+
+
-    case OPS_PTAG_SS_USERDEFINED00:
-    case OPS_PTAG_SS_USERDEFINED01:

openpgpsdk/trunk/src/packet-parse.c

@@ -19 +19 @@
- 
-/**
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-static int read_data(data_t *data, ops_region_t *subregion, ops_parse_options_t *opt)
-    {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    }
-
@@ -476 +492 @@
-        break;
-
+    case OPS_PTAG_SS_NOTATION_DATA:
+        ops_ss_notation_data_free(&c->content.ss_notation_data);
+        break;
+
-    case OPS_PTAG_SS_USERDEFINED00:
-    case OPS_PTAG_SS_USERDEFINED01:
@@ -923 +943 @@
-        break;
-
+    case OPS_PTAG_SS_NOTATION_DATA:
+
+        /* 4 octets of flags */
+
+        if (!limited_read_data(&C.ss_notation_data.flags, 4,
+                              &subregion, opt))
+            return 0;
+
+        /* 2 octets of name length */
+
+        if (!limited_read_scalar(&C.ss_notation_data.name.len, 2,
+                                 &subregion, opt))
+            return 0;
+
+        /* 2 octets of value length */
+
+        if (!limited_read_scalar(&C.ss_notation_data.value.len, 2,
+                                 &subregion, opt))
+            return 0;
+
+        /* name */
+
+        if (!limited_read_data(&C.ss_notation_data.name,
+                       C.ss_notation_data.name.len,
+                       &subregion, opt))
+            return 0;
+
+        /* value  */
+
+        if (!limited_read_data(&C.ss_notation_data.value,
+                       C.ss_notation_data.value.len, 
+                       &subregion, opt))
+            return 0;
+
+        break;
+
-    case OPS_PTAG_SS_USERDEFINED00:
-    case OPS_PTAG_SS_USERDEFINED01:
@@ -1252 +1308 @@
-    }
-
+ void ops_ss_notation_data_free(ops_ss_notation_data_t *ss_notation_data)
+     {
+     data_free(&ss_notation_data->name);
+     data_free(&ss_notation_data->value);
+     }
+
-void ops_ss_revocation_reason_free(ops_ss_revocation_reason_t *ss_revocation_reason)
-    {

openpgpsdk/trunk/src/packet.h

@@ -158 +158 @@
-    OPS_PTAG_SS_REVOCATION_KEY          =0x200+12,      /*!< revocation key */
-    OPS_PTAG_SS_ISSUER_KEY_ID           =0x200+16, /*!< issuer key ID */
+    OPS_PTAG_SS_NOTATION_DATA           =0x200+20, /*!< notation data */
-    OPS_PTAG_SS_PREFERRED_HASH          =0x200+21, /*!< preferred hash algorithms */
-    OPS_PTAG_SS_PREFERRED_COMPRESSION   =0x200+22, /*!< preferred compression algorithms */
@@ -450 +451 @@
-    unsigned char               key_id[OPS_KEY_ID_SIZE];
-    } ops_ss_key_id_t;
+
+typedef struct
+    {
+    data_t flags;
+    data_t name;
+    data_t value;
+    } ops_ss_notation_data_t;
-
-typedef struct
@@ -578 +586 @@
-    ops_ss_time_t               ss_time;
-    ops_ss_key_id_t             ss_issuer_key_id;
+    ops_ss_notation_data_t      ss_notation_data;
-    ops_packet_t                packet;
-    ops_compressed_t            compressed;
@@ -624 +633 @@
-void ops_ss_key_server_prefs_free(ops_ss_key_server_prefs_t * ss_key_server_prefs);
-void ops_ss_features_free(ops_ss_features_t * ss_features);
+void ops_ss_notation_data_free(ops_ss_notation_data_t *ss_notation_data);
-void ops_ss_userdefined_free(ops_ss_userdefined_t *ss_userdefined);
-void ops_ss_revocation_reason_free(ops_ss_revocation_reason_t *ss_revocation_reason);