summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2006-03-21 14:01:45 +0100
committerWerner Koch <wk@gnupg.org>2006-03-21 14:01:45 +0100
commit7f99c71839732735460f57fda19bdcf7e92e4179 (patch)
tree96764250450eb448e591c3367caa36689d8a00d7
parent* blowfish.c, md5.c, rmd160.c, sha1.c, sha256.c, sha512.c: Revert previous (diff)
downloadgnupg2-7f99c71839732735460f57fda19bdcf7e92e4179.tar.xz
gnupg2-7f99c71839732735460f57fda19bdcf7e92e4179.zip
Allow for rmd160 signatures when using gpg-agent.
-rw-r--r--g10/ChangeLog9
-rw-r--r--g10/card-util.c1
-rw-r--r--g10/cardglue.c4
3 files changed, 13 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 27a7c04ef..c2216951b 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-21 Werner Koch <wk@g10code.com>
+
+ * cardglue.c (agent_scd_pksign): Allow the use of ripemd-160 along
+ with scdaemon.
+
2006-03-16 David Shaw <dshaw@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@g10code.com>
+
+ * card-util.c (get_manufacturer): Added Vendor 3
+
2006-03-09 David Shaw <dshaw@jabberwocky.com>
* build-packet.c (string_to_notation): Add ability to indicate a
diff --git a/g10/card-util.c b/g10/card-util.c
index cace1962d..0c8365405 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -158,6 +158,7 @@ get_manufacturer (unsigned int no)
case 0xffff: return "test card";
case 0x0001: return "PPC Card Systems";
case 0x0002: return "Prism";
+ case 0x0003: return "OpenFortress";
default: return "unknown";
}
}
diff --git a/g10/cardglue.c b/g10/cardglue.c
index d850b561b..101b833c1 100644
--- a/g10/cardglue.c
+++ b/g10/cardglue.c
@@ -1225,7 +1225,9 @@ agent_scd_pksign (const char *serialno, int hashalgo,
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,