diff options
Diffstat (limited to '')
| -rw-r--r-- | cipher/ChangeLog | 10 | ||||
| -rw-r--r-- | cipher/pubkey.c | 7 |
2 files changed, 14 insertions, 3 deletions
diff --git a/cipher/ChangeLog b/cipher/ChangeLog index 707307e1e..62c896c27 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,6 +1,14 @@ +2003-11-30 David Shaw <[email protected]> + + * pubkey.c (setup_pubkey_table): Only include RSA if USE_RSA is + defined. + (pubkey_get_npkey): Return 2 for RSA even if it isn't available so + we can at least handle RSA keys. + 2003-11-27 Werner Koch <[email protected]> - * pubkey.c (pubkey_sign): Return an error if an ElGamal key is used. + * pubkey.c (pubkey_sign): Return an error if an ElGamal key is + used. * elgamal.c (gen_k): New arg SMALL_K. (sign): Use it here with SMALL_K set to false diff --git a/cipher/pubkey.c b/cipher/pubkey.c index 3ab84e4a3..3a54cb83c 100644 --- a/cipher/pubkey.c +++ b/cipher/pubkey.c @@ -1,5 +1,5 @@ /* pubkey.c - pubkey dispatcher - * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -152,6 +152,7 @@ setup_pubkey_table(void) BUG(); i++; +#ifdef USE_RSA pubkey_table[i].algo = PUBKEY_ALGO_RSA; pubkey_table[i].name = rsa_get_info( pubkey_table[i].algo, &pubkey_table[i].npkey, @@ -203,6 +204,7 @@ setup_pubkey_table(void) if( !pubkey_table[i].name ) BUG(); i++; +#endif /* USE_RSA */ for( ; i < TABLE_SIZE; i++ ) pubkey_table[i].name = NULL; @@ -325,6 +327,8 @@ pubkey_get_npkey( int algo ) if( pubkey_table[i].algo == algo ) return pubkey_table[i].npkey; } while( load_pubkey_modules() ); + if( is_RSA(algo) ) /* special hack, so that we are able to */ + return 2; /* see the RSA keyids */ return 0; } @@ -559,4 +563,3 @@ pubkey_verify( int algo, MPI hash, MPI *data, MPI *pkey, ready: return rc; } - |