[svn] GnuPG - r4631 - branches/STABLE-BRANCH-1-4/cipher

[svn author dshaw]

Author: dshaw
Date: 2007-11-29 00:00:11 +0100 (Thu, 29 Nov 2007)
New Revision: 4631

Modified:
   branches/STABLE-BRANCH-1-4/cipher/ChangeLog
   branches/STABLE-BRANCH-1-4/cipher/sha256.c
Log:
* sha256.c (sha224_get_info): 4880 has an error in the SHA-224 OID and
we inherited it.  Fixing.


Modified: branches/STABLE-BRANCH-1-4/cipher/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/cipher/ChangeLog	2007-11-28 15:15:37 UTC (rev 4630)
+++ branches/STABLE-BRANCH-1-4/cipher/ChangeLog	2007-11-28 23:00:11 UTC (rev 4631)
@@ -1,3 +1,8 @@
+2007-11-28  David Shaw  <dshaw at jabberwocky.com>
+
+	* sha256.c (sha224_get_info): 4880 has an error in the SHA-224 OID
+	and we inherited it.  Fixing.
+
 2007-10-23  Werner Koch  <wk at g10code.com>
 
 	Switched entire package to GPLv3+.

Modified: branches/STABLE-BRANCH-1-4/cipher/sha256.c
===================================================================
--- branches/STABLE-BRANCH-1-4/cipher/sha256.c	2007-11-28 15:15:37 UTC (rev 4630)
+++ branches/STABLE-BRANCH-1-4/cipher/sha256.c	2007-11-28 23:00:11 UTC (rev 4631)
@@ -356,9 +356,9 @@
 {
     static byte asn[] = /* Object ID is 2.16.840.1.101.3.4.2.4 */
       { 
-	0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86,
+	0x30, 0x2D, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86,
 	0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04, 0x05,
-	0x00, 0x04, 0x20
+	0x00, 0x04, 0x1C
       };
 
     if( algo != 11 )