Changeset 74

Timestamp:

04/25/05 17:29:58

Author:

rachel

Message:

Preferred SKA signature sub-packet now uses malloc instead of fixed-size array

Files:

• openpgpsdk/trunk/src/packet-parse.c (modified) (3 diffs)
• openpgpsdk/trunk/src/packet.h (modified) (3 diffs)

openpgpsdk/trunk/src/packet-parse.c

@@ -357 +357 @@
-        break;
-
+    case OPS_PTAG_SS_PREFERRED_SKA:
+        ops_ss_preferred_ska_free(&c->content.ss_preferred_ska);
+        break;
+
-    case OPS_PARSER_PACKET_END:
-        ops_packet_free(&c->content.packet);
@@ -697 +701 @@
-
-        C.ss_preferred_ska.len = subregion.length - subregion.length_read;       
-
-
-
-
-
-
-
-
+
+
-        if (!ops_limited_read(C.ss_preferred_ska.data,
-                              C.ss_preferred_ska.len, &subregion, opt))
@@ -765 +763 @@
-
-    return 1;
+    }
+
+/** ops_ss_preferred_ska_free(ops_ss_preferred_ska_t * ss_preferred_ska)
+ */
+
+void ops_ss_preferred_ska_free(ops_ss_preferred_ska_t * ss_preferred_ska)
+    {
+    free(ss_preferred_ska->data);
+    ss_preferred_ska->data=NULL;
+    ss_preferred_ska->len=0;
-    }
-

openpgpsdk/trunk/src/packet.h

@@ -414 +414 @@
-    } ops_ss_key_id_t;
-
-/* MAX PREFERRED ALGORITHMS is defined to provide an upper bound
- * on the size of array to be used to stored the array given in the
- * Preferred Symmetric Algorithms signature sub-packet.
- * The value has been arbitrarily chosen to allow for an array
- * which includes each SKA currently defined in rfc2440bis
- */
-
-#define MAX_PREFERRED_SKA 22
-typedef struct
-    {
@@ -428 +420 @@
-                           The value 0 may represent the plaintext algorithm
-                           so we cannot expect a null-terminated list */
-data[MAX_PREFERRED_SKA]
+* data
-    } ops_ss_preferred_ska_t;
-
@@ -516 +508 @@
-void ops_user_id_free(ops_user_id_t *id);
-void ops_signature_free(ops_signature_t *sig);
+void ops_ss_preferred_ska_free(ops_ss_preferred_ska_t *ss_preferred_ska);
-void ops_packet_free(ops_packet_t *packet);
-
-void ops_parser_content_free(ops_parser_content_t *c);
-