aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2006-03-07 01:16:31 +0000
committerDavid Shaw <[email protected]>2006-03-07 01:16:31 +0000
commit764b3f939560537c822fa7b11e5f3ef8ed93c073 (patch)
treec1f6cc4e735ec8eaa138f4d79ee6ca0aa919c765
parent* mainproc.c (proc_compressed): "Uncompressed" is not a valid compression (diff)
downloadgnupg-764b3f939560537c822fa7b11e5f3ef8ed93c073.tar.gz
gnupg-764b3f939560537c822fa7b11e5f3ef8ed93c073.zip
* sign.c (make_keysig_packet): Don't use MD5 for a RSA_S key as that
is not a PGP 2.x algorithm.
Diffstat (limited to '')
-rw-r--r--g10/ChangeLog3
-rw-r--r--g10/sign.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 71a0770dd..7bb6f4edd 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,8 @@
2006-03-06 David Shaw <[email protected]>
+ * sign.c (make_keysig_packet): Don't use MD5 for a RSA_S key as
+ that is not a PGP 2.x algorithm.
+
* mainproc.c (proc_compressed): "Uncompressed" is not a valid
compression algorithm.
diff --git a/g10/sign.c b/g10/sign.c
index 2e64abb20..24c37c10f 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -1374,9 +1374,8 @@ make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
if(opt.cert_digest_algo)
digest_algo=opt.cert_digest_algo;
- else if((sk->pubkey_algo==PUBKEY_ALGO_RSA ||
- sk->pubkey_algo==PUBKEY_ALGO_RSA_S) &&
- pk->version<4 && sigversion < 4)
+ else if(sk->pubkey_algo==PUBKEY_ALGO_RSA
+ && pk->version<4 && sigversion<4)
digest_algo = DIGEST_ALGO_MD5;
else
digest_algo = DIGEST_ALGO_SHA1;