aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2007-11-28 23:00:11 +0000
committerDavid Shaw <[email protected]>2007-11-28 23:00:11 +0000
commit154407fd38acd8d53dbfb25dfc7e25369cbc2d7c (patch)
tree8de7763bf4ba2b5849972131f201619266dbcf4c
parent* defs.inc: Use new --list-config method to get cipher and digest (diff)
downloadgnupg-154407fd38acd8d53dbfb25dfc7e25369cbc2d7c.tar.gz
gnupg-154407fd38acd8d53dbfb25dfc7e25369cbc2d7c.zip
* sha256.c (sha224_get_info): 4880 has an error in the SHA-224 OID and
we inherited it. Fixing.
-rw-r--r--cipher/ChangeLog5
-rw-r--r--cipher/sha256.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index f694ef07c..0895cc81a 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-28 David Shaw <[email protected]>
+
+ * sha256.c (sha224_get_info): 4880 has an error in the SHA-224 OID
+ and we inherited it. Fixing.
+
2007-10-23 Werner Koch <[email protected]>
Switched entire package to GPLv3+.
diff --git a/cipher/sha256.c b/cipher/sha256.c
index b4930c002..4a6f79615 100644
--- a/cipher/sha256.c
+++ b/cipher/sha256.c
@@ -356,9 +356,9 @@ sha224_get_info( int algo, size_t *contextsize,
{
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 )