[svn] GnuPG - r4548 - branches/STABLE-BRANCH-1-4/g10

[svn author dshaw]

Author: dshaw
Date: 2007-07-19 14:29:22 +0200 (Thu, 19 Jul 2007)
New Revision: 4548

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/armor.c
Log:
* armor.c (parse_header_line): Improve test so that the header test
only allows "Hash" in the signed data section.


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2007-07-18 19:36:24 UTC (rev 4547)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2007-07-19 12:29:22 UTC (rev 4548)
@@ -1,3 +1,8 @@
+2007-07-19  David Shaw  <dshaw at jabberwocky.com>
+
+	* armor.c (parse_header_line): Improve test so that the header
+	test only allows "Hash" in the signed data section.
+
 2007-07-18  David Shaw  <dshaw at jabberwocky.com>
 
 	* armor.c (is_armor_tag): New.  Detect if an armor header matches

Modified: branches/STABLE-BRANCH-1-4/g10/armor.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/armor.c	2007-07-18 19:36:24 UTC (rev 4547)
+++ branches/STABLE-BRANCH-1-4/g10/armor.c	2007-07-19 12:29:22 UTC (rev 4548)
@@ -436,28 +436,32 @@
 	putc('\n', stderr);
     }
 
-    /* Section 6.2: OpenPGP should consider improperly formatted Armor
-       Headers to be corruption of the ASCII Armor. Unknown keys
-       should be reported to the user, but OpenPGP should continue to
-       process the message. */
+    if( afx->in_cleartext )
+      {
+	if( (hashes=parse_hash_header( line )) )
+	  afx->hashes |= hashes;
+	else if( strlen(line) > 15 && !memcmp( line, "NotDashEscaped:", 15 ) )
+	  afx->not_dash_escaped = 1;
+	else
+	  {
+	    log_error(_("invalid clearsig header\n"));
+	    return -1;
+	  }
+      }
+    else if(!is_armor_tag(line))
+      {
+	/* Section 6.2: "Unknown keys should be reported to the user,
+	   but OpenPGP should continue to process the message."  Note
+	   that in a clearsigned message this applies to the signature
+	   part (i.e. "BEGIN PGP SIGNATURE") and not the signed data
+	   ("BEGIN PGP SIGNED MESSAGE").  The only key allowed in the
+	   signed data section is "Hash". */
 
-    if(!is_armor_tag(line))
-      {
 	log_info(_("unknown armor header: "));
 	print_string( stderr, line, len, 0 );
 	putc('\n', stderr);
       }
 
-    if( afx->in_cleartext ) {
-	if( (hashes=parse_hash_header( line )) )
-	    afx->hashes |= hashes;
-	else if( strlen(line) > 15 && !memcmp( line, "NotDashEscaped:", 15 ) )
-	    afx->not_dash_escaped = 1;
-	else {
-	    log_error(_("invalid clearsig header\n"));
-	    return -1;
-	}
-    }
     return 1;
 }