diff options
| author | Werner Koch <wk@gnupg.org> | 2001-12-06 20:42:18 +0000 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2001-12-06 20:42:18 +0000 |
| commit | ebcbc6ae00e75a25a5ab8308592aed210d8f1668 (patch) | |
| tree | a817d35eaafe7d83eca6128aa897023cb8f22f50 /cipher/rsa.c | |
| parent | aaa6672e8ffa96a62aaf8296ea8b3ae95ca58818 (diff) | |
| download | libgcrypt-ebcbc6ae00e75a25a5ab8308592aed210d8f1668.tar.gz | |
* cipher.c (gcry_cipher_map_name): Look also for OIDs prefixed
with "oid." or "OID.".
Diffstat (limited to 'cipher/rsa.c')
| -rw-r--r-- | cipher/rsa.c | 55 |
1 files changed, 29 insertions, 26 deletions
diff --git a/cipher/rsa.c b/cipher/rsa.c index e5ad116c..51310ad6 100644 --- a/cipher/rsa.c +++ b/cipher/rsa.c @@ -202,20 +202,22 @@ public(MPI output, MPI input, RSA_public_key *pkey ) static void stronger_key_check ( RSA_secret_key *skey ) { - MPI t = mpi_alloc_secure ( 0 ); - MPI t1 = mpi_alloc_secure ( 0 ); - MPI t2 = mpi_alloc_secure ( 0 ); - MPI phi = mpi_alloc_secure ( 0 ); - - /* check that n == p * q */ - mpi_mul( t, skey->p, skey->q); - if (mpi_cmp( t, skey->n) ) - log_info ( "RSA Oops: n != p * q\n" ); - - /* check that p is less than q */ - if( mpi_cmp( skey->p, skey->q ) > 0 ) - log_info ("RSA Oops: p >= q\n"); - + MPI t = mpi_alloc_secure ( 0 ); + MPI t1 = mpi_alloc_secure ( 0 ); + MPI t2 = mpi_alloc_secure ( 0 ); + MPI phi = mpi_alloc_secure ( 0 ); + + /* check that n == p * q */ + mpi_mul( t, skey->p, skey->q); + if (mpi_cmp( t, skey->n) ) + log_info ( "RSA Oops: n != p * q\n" ); + + /* check that p is less than q */ + if( mpi_cmp( skey->p, skey->q ) > 0 ) + { + log_info ("RSA Oops: p >= q - fixed\n"); + _gcry_mpi_swap ( skey->p, skey->q); + } /* check that e divides neither p-1 nor q-1 */ mpi_sub_ui(t, skey->p, 1 ); @@ -231,17 +233,25 @@ stronger_key_check ( RSA_secret_key *skey ) mpi_sub_ui( t1, skey->p, 1 ); mpi_sub_ui( t2, skey->q, 1 ); mpi_mul( phi, t1, t2 ); - mpi_gcd(t, t1, t2); + gcry_mpi_gcd(t, t1, t2); mpi_fdiv_q(t, phi, t); mpi_invm(t, skey->e, t ); if ( mpi_cmp(t, skey->d ) ) - log_info ( "RSA Oops: d is wrong\n"); + { + log_info ( "RSA Oops: d is wrong - fixed\n"); + mpi_set (skey->d, t); + _gcry_log_mpidump (" fixed d", skey->d); + } - /* check for crrectness of u */ + /* check for correctness of u */ mpi_invm(t, skey->p, skey->q ); if ( mpi_cmp(t, skey->u ) ) - log_info ( "RSA Oops: u is wrong\n"); - + { + log_info ( "RSA Oops: u is wrong - fixed\n"); + mpi_set (skey->u, t); + _gcry_log_mpidump (" fixed u", skey->u); + } + log_info ( "RSA secret key check finished\n"); mpi_free (t); @@ -459,10 +469,3 @@ _gcry_rsa_get_info( int algo, default:*usage = 0; return NULL; } } - - - - - - - |