diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/gpg.c | 4 | ||||
| -rw-r--r-- | g10/keygen.c | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 0c33c5888..6110066c3 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2006-10-19 Werner Koch <[email protected]> + + * keygen.c (get_parameter_algo): Add special case for ELG_E which + is not supported by libgcrypt's mapping function. + 2006-10-18 Werner Koch <[email protected]> * keyid.c (v3_keyid): Don't use mempcy as we need to hold the @@ -1907,8 +1907,8 @@ main (int argc, char **argv ) #endif /* Initialize the secure memory. */ - gcry_control (GCRYCTL_INIT_SECMEM, 32768, 0); - got_secmem = 1; /* FIXME: gcry_control should return an indicator. */ + if (!gcry_control (GCRYCTL_INIT_SECMEM, 32768, 0)) + got_secmem = 1; #if defined(HAVE_GETUID) && defined(HAVE_GETEUID) /* There should be no way to get to this spot while still carrying setuid privs. Just in case, bomb out if we are. */ diff --git a/g10/keygen.c b/g10/keygen.c index 260e6625f..0ce588c37 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -2176,6 +2176,8 @@ get_parameter_algo( struct para_data_s *para, enum para_name key ) return -1; if( digitp( r->u.value ) ) i = atoi( r->u.value ); + else if ( !strcmp ( r->u.value, "ELG-E") ) + i = GCRY_PK_ELG_E; else i = gcry_pk_map_name (r->u.value); if (i == PUBKEY_ALGO_RSA_E || i == PUBKEY_ALGO_RSA_S) |