EC curve stuff

[openssl.git] / apps / genrsa.c

diff --git a/apps/genrsa.c b/apps/genrsa.c
index a2e7d989fd3c2f938efb170cec651a32bea05640..515bd7c9017135667781a2c8cc4ba3ae2ba84d16 100644 (file)
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -69,7 +69,7 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
-#include <openssl/engine.h>
+#include <openssl/rand.h>
 
 #define DEFBITS        512
 #undef PROG
@@ -86,7 +86,7 @@ int MAIN(int argc, char **argv)
        RSA *rsa=NULL;
        int i,num=DEFBITS;
        long l;
-       EVP_CIPHER *enc=NULL;
+       const EVP_CIPHER *enc=NULL;
        unsigned long f4=RSA_F4;
        char *outfile=NULL;
        char *passargout = NULL, *passout = NULL;
@@ -99,6 +99,9 @@ int MAIN(int argc, char **argv)
        if (bio_err == NULL)
                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
                        BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+
+       if (!load_config(bio_err, NULL))
+               goto err;
        if ((out=BIO_new(BIO_s_file())) == NULL)
                {
                BIO_printf(bio_err,"unable to create BIO for output\n");
@@ -138,6 +141,14 @@ int MAIN(int argc, char **argv)
 #ifndef OPENSSL_NO_IDEA
                else if (strcmp(*argv,"-idea") == 0)
                        enc=EVP_idea_cbc();
+#endif
+#ifndef OPENSSL_NO_AES
+               else if (strcmp(*argv,"-aes128") == 0)
+                       enc=EVP_aes_128_cbc();
+               else if (strcmp(*argv,"-aes192") == 0)
+                       enc=EVP_aes_192_cbc();
+               else if (strcmp(*argv,"-aes256") == 0)
+                       enc=EVP_aes_256_cbc();
 #endif
                else if (strcmp(*argv,"-passout") == 0)
                        {
@@ -157,6 +168,10 @@ bad:
                BIO_printf(bio_err," -des3           encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
 #ifndef OPENSSL_NO_IDEA
                BIO_printf(bio_err," -idea           encrypt the generated key with IDEA in cbc mode\n");
+#endif
+#ifndef OPENSSL_NO_AES
+               BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
+               BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
 #endif
                BIO_printf(bio_err," -out file       output the key to 'file\n");
                BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
@@ -176,28 +191,12 @@ bad:
                goto err;
        }
 
-       if (engine != NULL)
-               {
-               if((e = ENGINE_by_id(engine)) == NULL)
-                       {
-                       BIO_printf(bio_err,"invalid engine \"%s\"\n",
-                               engine);
-                       goto err;
-                       }
-               if(!ENGINE_set_default(e, ENGINE_METHOD_ALL))
-                       {
-                       BIO_printf(bio_err,"can't use that engine\n");
-                       goto err;
-                       }
-               BIO_printf(bio_err,"engine \"%s\" set.\n", engine);
-               /* Free our "structural" reference. */
-               ENGINE_free(e);
-               }
+        e = setup_engine(bio_err, engine, 0);
 
        if (outfile == NULL)
                {
                BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef VMS
+#ifdef OPENSSL_SYS_VMS
                {
                BIO *tmpbio = BIO_new(BIO_f_linebuffer());
                out = BIO_push(tmpbio, out);
@@ -242,8 +241,14 @@ bad:
                l+=rsa->e->d[i];
                }
        BIO_printf(bio_err,"e is %ld (0x%lX)\n",l,l);
-       if (!PEM_write_bio_RSAPrivateKey(out,rsa,enc,NULL,0,NULL, passout))
+       {
+       PW_CB_DATA cb_data;
+       cb_data.password = passout;
+       cb_data.prompt_info = outfile;
+       if (!PEM_write_bio_RSAPrivateKey(out,rsa,enc,NULL,0,
+               (pem_password_cb *)password_callback,&cb_data))
                goto err;
+       }
 
        ret=0;
 err:
@@ -252,6 +257,7 @@ err:
        if(passout) OPENSSL_free(passout);
        if (ret != 0)
                ERR_print_errors(bio_err);
+       apps_shutdown();
        EXIT(ret);
        }