- (djm) Merge OpenBSD changes:

[openssh.git] / rsa.c

diff --git a/rsa.c b/rsa.c
index 0c9aef7916e1be63f7828926cfd94e2dd635674f..7cfcc80db5ff996f6a7249dfcd250f52dbf8d35e 100644 (file)
--- a/rsa.c
+++ b/rsa.c
@@ -60,82 +60,13 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: rsa.c,v 1.16 2000/09/07 20:27:53 deraadt Exp $");
+RCSID("$OpenBSD: rsa.c,v 1.17 2000/11/12 19:50:37 markus Exp $");
 
 #include "rsa.h"
 #include "ssh.h"
 #include "xmalloc.h"
 #include "entropy.h"
 
-int rsa_verbose = 1;
-
-int
-rsa_alive()
-{
-       RSA *key;
-
-       seed_rng();
-       key = RSA_generate_key(32, 3, NULL, NULL);
-       if (key == NULL)
-               return (0);
-       RSA_free(key);
-       return (1);
-}
-
-/*
- * Generates RSA public and private keys.  This initializes the data
- * structures; they should be freed with rsa_clear_private_key and
- * rsa_clear_public_key.
- */
-
-void
-rsa_generate_key(RSA *prv, RSA *pub, unsigned int bits)
-{
-       RSA *key;
-
-       seed_rng();
-       
-       if (rsa_verbose) {
-               printf("Generating RSA keys:  ");
-               fflush(stdout);
-       }
-       key = RSA_generate_key(bits, 35, NULL, NULL);
-       if (key == NULL)
-               fatal("rsa_generate_key: key generation failed.");
-
-       /* Copy public key parameters */
-       pub->n = BN_new();
-       BN_copy(pub->n, key->n);
-       pub->e = BN_new();
-       BN_copy(pub->e, key->e);
-
-       /* Copy private key parameters */
-       prv->n = BN_new();
-       BN_copy(prv->n, key->n);
-       prv->e = BN_new();
-       BN_copy(prv->e, key->e);
-       prv->d = BN_new();
-       BN_copy(prv->d, key->d);
-       prv->p = BN_new();
-       BN_copy(prv->p, key->p);
-       prv->q = BN_new();
-       BN_copy(prv->q, key->q);
-
-       prv->dmp1 = BN_new();
-       BN_copy(prv->dmp1, key->dmp1);
-
-       prv->dmq1 = BN_new();
-       BN_copy(prv->dmq1, key->dmq1);
-
-       prv->iqmp = BN_new();
-       BN_copy(prv->iqmp, key->iqmp);
-
-       RSA_free(key);
-
-       if (rsa_verbose)
-               printf("Key generation complete.\n");
-}
-
 void
 rsa_public_encrypt(BIGNUM *out, BIGNUM *in, RSA *key)
 {
@@ -188,11 +119,3 @@ rsa_private_decrypt(BIGNUM *out, BIGNUM *in, RSA *key)
        xfree(outbuf);
        xfree(inbuf);
 }
-
-/* Set whether to output verbose messages during key generation. */
-
-void
-rsa_set_verbose(int verbose)
-{
-       rsa_verbose = verbose;
-}