[svn] GnuPG - r4038 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2006-03-07 02:16:31 +0100 (Tue, 07 Mar 2006)
New Revision: 4038

Modified:
   trunk/g10/ChangeLog
   trunk/g10/sign.c
Log:
* sign.c (make_keysig_packet): Don't use MD5 for a RSA_S key as that
is not a PGP 2.x algorithm.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-03-06 23:14:13 UTC (rev 4037)
+++ trunk/g10/ChangeLog	2006-03-07 01:16:31 UTC (rev 4038)
@@ -1,5 +1,8 @@
 2006-03-06  David Shaw  <dshaw at jabberwocky.com>
 
+	* 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.
 

Modified: trunk/g10/sign.c
===================================================================
--- trunk/g10/sign.c	2006-03-06 23:14:13 UTC (rev 4037)
+++ trunk/g10/sign.c	2006-03-07 01:16:31 UTC (rev 4038)
@@ -1374,9 +1374,8 @@
 
 	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;