diff options
Diffstat (limited to 'cipher')
| -rw-r--r-- | cipher/ChangeLog | 7 | ||||
| -rw-r--r-- | cipher/Makefile.am | 1 | ||||
| -rw-r--r-- | cipher/pubkey.c | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/cipher/ChangeLog b/cipher/ChangeLog index b4195dd3c..c85d958f2 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,10 @@ +Wed Sep 6 17:55:47 CEST 2000 Werner Koch <[email protected]> + + * rsa.c: Changed the comment about the patent. + * Makefile.am: Included rsa.[ch]. + * pubkey.c: Enabled RSA support. + (pubkey_get_npkey): Removed RSA workaround. + Fri Aug 25 16:05:38 CEST 2000 Werner Koch <[email protected]> * rndlinux.c (open_device): Loose random device checking. diff --git a/cipher/Makefile.am b/cipher/Makefile.am index f3b087eb8..81bc77c30 100644 --- a/cipher/Makefile.am +++ b/cipher/Makefile.am @@ -43,6 +43,7 @@ libcipher_a_SOURCES = cipher.c \ cast5.h \ elgamal.c \ elgamal.h \ + rsa.c rsa.h \ primegen.c \ random.h \ random.c \ diff --git a/cipher/pubkey.c b/cipher/pubkey.c index abe39cb14..ce78895fd 100644 --- a/cipher/pubkey.c +++ b/cipher/pubkey.c @@ -30,9 +30,7 @@ #include "cipher.h" #include "elgamal.h" #include "dsa.h" -#if 0 #include "rsa.h" -#endif #include "dynload.h" @@ -153,7 +151,6 @@ setup_pubkey_table(void) BUG(); i++; - #if 0 pubkey_table[i].algo = PUBKEY_ALGO_RSA; pubkey_table[i].name = rsa_get_info( pubkey_table[i].algo, &pubkey_table[i].npkey, @@ -205,7 +202,6 @@ setup_pubkey_table(void) if( !pubkey_table[i].name ) BUG(); i++; - #endif for( ; i < TABLE_SIZE; i++ ) pubkey_table[i].name = NULL; @@ -388,8 +384,6 @@ 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; } |