[svn] gcry - r1196 - branches/LIBGCRYPT-1-2-BRANCH/cipher

[svn author wk]

Author: wk
Date: 2007-01-30 21:11:43 +0100 (Tue, 30 Jan 2007)
New Revision: 1196

Modified:
   branches/LIBGCRYPT-1-2-BRANCH/cipher/ChangeLog
   branches/LIBGCRYPT-1-2-BRANCH/cipher/sha256.c
   branches/LIBGCRYPT-1-2-BRANCH/cipher/sha512.c
Log:
Added OIDs from pkcs#1


Modified: branches/LIBGCRYPT-1-2-BRANCH/cipher/ChangeLog
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/cipher/ChangeLog	2006-12-18 19:02:48 UTC (rev 1195)
+++ branches/LIBGCRYPT-1-2-BRANCH/cipher/ChangeLog	2007-01-30 20:11:43 UTC (rev 1196)
@@ -1,3 +1,9 @@
+2007-01-30  Werner Koch  <wk at g10code.com>
+
+	* sha256.c (oid_spec_sha256): Add alias from pkcs#1.
+	* sha512.c (oid_spec_sha512): Ditto.
+	(oid_spec_sha384): Ditto.
+
 2006-12-18  Werner Koch  <wk at g10code.com>
 
 	* rndlinux.c (set_cloexec_flag): New.

Modified: branches/LIBGCRYPT-1-2-BRANCH/cipher/sha256.c
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/cipher/sha256.c	2006-12-18 19:02:48 UTC (rev 1195)
+++ branches/LIBGCRYPT-1-2-BRANCH/cipher/sha256.c	2007-01-30 20:11:43 UTC (rev 1196)
@@ -299,6 +299,8 @@
   {
     /* According to the OpenPGG draft rfc2440-bis06 */
     { "2.16.840.1.101.3.4.2.1" }, 
+    /* PKCS#1 sha256WithRSAEncryption */
+    { "1.2.840.113549.1.1.11" },
     { NULL },
   };
 

Modified: branches/LIBGCRYPT-1-2-BRANCH/cipher/sha512.c
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/cipher/sha512.c	2006-12-18 19:02:48 UTC (rev 1195)
+++ branches/LIBGCRYPT-1-2-BRANCH/cipher/sha512.c	2007-01-30 20:11:43 UTC (rev 1196)
@@ -371,6 +371,8 @@
 static gcry_md_oid_spec_t oid_spec_sha512[] =
   {
     { "2.16.840.1.101.3.4.2.3" },
+    /* PKCS#1 sha512WithRSAEncryption */
+    { "1.2.840.113549.1.1.13" },
     { NULL }
   };
 
@@ -390,6 +392,8 @@
 static gcry_md_oid_spec_t oid_spec_sha384[] =
   {
     { "2.16.840.1.101.3.4.2.2" }, 
+    /* PKCS#1 sha384WithRSAEncryption */
+    { "1.2.840.113549.1.1.12" },
     { NULL },
   };