[svn] GnuPG - r4076 - trunk/g10

[svn author wk]

Author: wk
Date: 2006-03-21 14:01:45 +0100 (Tue, 21 Mar 2006)
New Revision: 4076

Modified:
   trunk/g10/ChangeLog
   trunk/g10/card-util.c
   trunk/g10/cardglue.c
Log:
Allow for rmd160 signatures when using gpg-agent.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-03-21 12:48:51 UTC (rev 4075)
+++ trunk/g10/ChangeLog	2006-03-21 13:01:45 UTC (rev 4076)
@@ -1,3 +1,8 @@
+2006-03-21  Werner Koch  <wk at g10code.com>
+
+	* cardglue.c (agent_scd_pksign): Allow the use of ripemd-160 along
+	with scdaemon.
+
 2006-03-16  David Shaw  <dshaw at jabberwocky.com>
 
 	* keyserver.c (keyserver_import_cert): Handle the IPGP CERT type
@@ -36,6 +41,10 @@
 	keys originally generated with older GnuPGs that included comments
 	in the secret keys.
 
+2006-03-10  Werner Koch  <wk at g10code.com>
+
+	* card-util.c (get_manufacturer): Added Vendor 3
+
 2006-03-09  David Shaw  <dshaw at jabberwocky.com>
 
 	* build-packet.c (string_to_notation): Add ability to indicate a

Modified: trunk/g10/card-util.c
===================================================================
--- trunk/g10/card-util.c	2006-03-21 12:48:51 UTC (rev 4075)
+++ trunk/g10/card-util.c	2006-03-21 13:01:45 UTC (rev 4076)
@@ -158,6 +158,7 @@
     case 0xffff: return "test card";
     case 0x0001: return "PPC Card Systems";
     case 0x0002: return "Prism";
+    case 0x0003: return "OpenFortress";
     default: return "unknown";
     }
 }

Modified: trunk/g10/cardglue.c
===================================================================
--- trunk/g10/cardglue.c	2006-03-21 12:48:51 UTC (rev 4075)
+++ trunk/g10/cardglue.c	2006-03-21 13:01:45 UTC (rev 4076)
@@ -1225,7 +1225,9 @@
       if (!rc)
         {
           init_membuf (&data, 1024);
-          snprintf (line, DIM(line)-1, "SCD PKSIGN %s", serialno);
+          snprintf (line, DIM(line)-1, "SCD PKSIGN %s%s",
+                    hashalgo == GCRY_MD_RMD160? "--hash=rmd160 ": "",
+                    serialno);
           line[DIM(line)-1] = 0;
           rc = test_transact (assuan_transact (app->assuan_ctx, line,
                                                membuf_data_cb, &data,