[svn] GnuPG - r4345 - trunk/g10

[svn author wk]

Author: wk
Date: 2006-11-21 20:33:04 +0100 (Tue, 21 Nov 2006)
New Revision: 4345

Modified:
   trunk/g10/ChangeLog
   trunk/g10/keygen.c
Log:
Final fix which should now pass all tests.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-11-21 15:29:52 UTC (rev 4344)
+++ trunk/g10/ChangeLog	2006-11-21 19:33:04 UTC (rev 4345)
@@ -6,6 +6,7 @@
 	bit time_t.
 	(save_unprotected_key_to_card): Made RSA_N_LEN et al a size_t.
 	Cast printf args.
+	(get_parameter_algo): Allow "ELG" as alias for "ELG-E".
 
 	* seckey-cert.c (do_check): Made NBYTES a size_t.
 	(do_check): Made NDATA a size_t.

Modified: trunk/g10/keygen.c
===================================================================
--- trunk/g10/keygen.c	2006-11-21 15:29:52 UTC (rev 4344)
+++ trunk/g10/keygen.c	2006-11-21 19:33:04 UTC (rev 4345)
@@ -2176,7 +2176,8 @@
 	return -1;
     if( digitp( r->u.value ) )
 	i = atoi( r->u.value );
-    else if ( !strcmp ( r->u.value, "ELG-E") )
+    else if ( !strcmp ( r->u.value, "ELG-E")
+              || !strcmp ( r->u.value, "ELG") )
         i = GCRY_PK_ELG_E;
     else
         i = gcry_pk_map_name (r->u.value);