diff options
Diffstat (limited to 'cipher')
| -rw-r--r-- | cipher/ChangeLog | 4 | ||||
| -rw-r--r-- | cipher/random.c | 2 | ||||
| -rw-r--r-- | cipher/rsa.c | 12 |
3 files changed, 12 insertions, 6 deletions
diff --git a/cipher/ChangeLog b/cipher/ChangeLog index dd20e1e2d..9174d424b 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,7 @@ +2001-09-09 Werner Koch <[email protected]> + + * rsa.c (rsa_get_info): s/usage/r_usage/ to avoid shadow warnings. + 2001-08-24 Werner Koch <[email protected]> * md.c (md_write): Made buf arg const. diff --git a/cipher/random.c b/cipher/random.c index cdbd0b700..30c94b5b9 100644 --- a/cipher/random.c +++ b/cipher/random.c @@ -296,7 +296,7 @@ set_random_seed_file( const char *name ) * and return true if this was successful */ static int -read_seed_file() +read_seed_file(void) { int fd; struct stat sb; diff --git a/cipher/rsa.c b/cipher/rsa.c index 9e6343f4f..c7078ea1d 100644 --- a/cipher/rsa.c +++ b/cipher/rsa.c @@ -446,7 +446,7 @@ rsa_get_nbits( int algo, MPI *pkey ) */ const char * rsa_get_info( int algo, - int *npkey, int *nskey, int *nenc, int *nsig, int *usage ) + int *npkey, int *nskey, int *nenc, int *nsig, int *r_usage ) { *npkey = 2; *nskey = 6; @@ -454,10 +454,12 @@ rsa_get_info( int algo, *nsig = 1; switch( algo ) { - case 1: *usage = PUBKEY_USAGE_SIG | PUBKEY_USAGE_ENC; return "RSA"; - case 2: *usage = PUBKEY_USAGE_ENC; return "RSA-E"; - case 3: *usage = PUBKEY_USAGE_SIG; return "RSA-S"; - default:*usage = 0; return NULL; + case 1: *r_usage = PUBKEY_USAGE_SIG | PUBKEY_USAGE_ENC; return "RSA"; + case 2: *r_usage = PUBKEY_USAGE_ENC; return "RSA-E"; + case 3: *r_usage = PUBKEY_USAGE_SIG; return "RSA-S"; + default:*r_usage = 0; return NULL; } } + + |