Changeset 327

Timestamp:

01/05/06 13:57:53

Author:

ben

Message:

Optionally allow trailing whitespace where we don't strictly expect it.

Files:

• openpgpsdk/trunk/examples/packet-dump.c (modified) (1 diff)
• openpgpsdk/trunk/examples/verify2.c (modified) (1 diff)
• openpgpsdk/trunk/include/openpgpsdk/armour.h (modified) (1 diff)
• openpgpsdk/trunk/src/armour.c (modified) (5 diffs)

openpgpsdk/trunk/examples/packet-dump.c

@@ -907 +907 @@
-
-    if(armour)
-
+,ops_true
-
-    ret=ops_parse(pinfo);

openpgpsdk/trunk/examples/verify2.c

@@ -187 +187 @@
-
-    if(armour)
-
+,ops_false
-
-    ops_parse(pinfo);

openpgpsdk/trunk/include/openpgpsdk/armour.h

@@ -3 +3 @@
-
-void ops_reader_push_dearmour(ops_parse_info_t *parse_info,
-
+
+
+
-
-void ops_reader_pop_dearmour(ops_parse_info_t *parse_info);

openpgpsdk/trunk/src/armour.c

@@ -31 +31 @@
-    ops_boolean_t allow_no_gap:1; /*!< allow no blank line at the
-                                       start of armoured data */
+    ops_boolean_t allow_trailing_whitespace:1; /*!< allow armoured
+                                                 stuff to have
+                                                 trailing whitespace
+                                                 where we wouldn't
+                                                 strictly expect it */
-
-    // base64 stuff
@@ -452 +457 @@
-            ERR(cbinfo,"Error in checksum");
-        c=read_char(arg,errors,rinfo,cbinfo,ops_true);
+        if(arg->allow_trailing_whitespace)
+            while(c == ' ' || c == '\t')
+                c=read_char(arg,errors,rinfo,cbinfo,ops_true);
-        if(c != '\n')
-            ERR(cbinfo,"Badly terminated checksum");
@@ -572 +580 @@
-             if((c=unarmoured_read_char(arg,errors,rinfo,cbinfo,ops_true)) < 0)
-                 return OPS_R_EOF;
+             if(arg->allow_trailing_whitespace)
+                 while(c == ' ' || c == '\t')
+                     if((c=unarmoured_read_char(arg,errors,rinfo,cbinfo,
+                                                ops_true)) < 0)
+                         return OPS_R_EOF;
-             if(c != '\n')
-                 /* wasn't a header line after all */
@@ -698 +711 @@
-
-void ops_reader_push_dearmour(ops_parse_info_t *parse_info,
-
+
+
+
-    {
-    dearmour_arg_t *arg;
@@ -706 +721 @@
-    arg->allow_headers_without_gap=without_gap;
-    arg->allow_no_gap=no_gap;
+    arg->allow_trailing_whitespace=trailing_whitespace;
-
-    ops_reader_push(parse_info,armoured_data_reader,arg);