Consolidate BUILDENV [idea is to keep all variables in one place].

[openssl.git] / apps / genrsa.c

diff --git a/apps/genrsa.c b/apps/genrsa.c
index 0ce23946ef5b2cb9ac3775a312a28524249e193b..f0bb30c56b8c8a54e41e314db57d881b115cbd89 100644 (file)
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -81,17 +81,17 @@
 #undef PROG
 #define PROG genrsa_main
 
-static void MS_CALLBACK genrsa_cb(int p, int n, void *arg);
+static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
        {
+       BN_GENCB cb;
 #ifndef OPENSSL_NO_ENGINE
        ENGINE *e = NULL;
 #endif
        int ret=1;
-       RSA *rsa=NULL;
        int i,num=DEFBITS;
        long l;
        const EVP_CIPHER *enc=NULL;
@@ -103,8 +103,13 @@ int MAIN(int argc, char **argv)
 #endif
        char *inrand=NULL;
        BIO *out=NULL;
+       BIGNUM *bn = BN_new();
+       RSA *rsa = RSA_new();
+
+       if(!bn || !rsa) goto err;
 
        apps_startup();
+       BN_GENCB_set(&cb, genrsa_cb, bio_err);
 
        if (bio_err == NULL)
                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
@@ -239,12 +244,12 @@ bad:
 
        BIO_printf(bio_err,"Generating RSA private key, %d bit long modulus\n",
                num);
-       rsa=RSA_generate_key(num,f4,genrsa_cb,bio_err);
+
+       if(!BN_set_word(bn, f4) || !RSA_generate_key_ex(rsa, num, bn, &cb))
+               goto err;
                
        app_RAND_write_file(NULL, bio_err);
 
-       if (rsa == NULL) goto err;
-       
        /* We need to do the following for when the base number size is <
         * long, esp windows 3.1 :-(. */
        l=0L;
@@ -268,8 +273,9 @@ bad:
 
        ret=0;
 err:
-       if (rsa != NULL) RSA_free(rsa);
-       if (out != NULL) BIO_free_all(out);
+       if (bn) BN_free(bn);
+       if (rsa) RSA_free(rsa);
+       if (out) BIO_free_all(out);
        if(passout) OPENSSL_free(passout);
        if (ret != 0)
                ERR_print_errors(bio_err);
@@ -277,7 +283,7 @@ err:
        OPENSSL_EXIT(ret);
        }
 
-static void MS_CALLBACK genrsa_cb(int p, int n, void *arg)
+static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb)
        {
        char c='*';
 
@@ -285,11 +291,12 @@ static void MS_CALLBACK genrsa_cb(int p, int n, void *arg)
        if (p == 1) c='+';
        if (p == 2) c='*';
        if (p == 3) c='\n';
-       BIO_write((BIO *)arg,&c,1);
-       (void)BIO_flush((BIO *)arg);
+       BIO_write(cb->arg,&c,1);
+       (void)BIO_flush(cb->arg);
 #ifdef LINT
        p=n;
 #endif
+       return 1;
        }
 #else /* !OPENSSL_NO_RSA */