The majority of the OCSP code from CertCo.

[openssl.git] / apps / genrsa.c

diff --git a/apps/genrsa.c b/apps/genrsa.c
index ab760f6ad48ae367d15c60e3ae4fca7ac72955b7..e7445e6a499bd55ebaf102d73022bed79ff6d72e 100644 (file)
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -69,14 +69,19 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
+#include <openssl/engine.h>
 
 #define DEFBITS        512
 #undef PROG
 #define PROG genrsa_main
 
 static void MS_CALLBACK genrsa_cb(int p, int n, void *arg);
+
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
+       ENGINE *e = NULL;
        int ret=1;
        RSA *rsa=NULL;
        int i,num=DEFBITS;
@@ -84,6 +89,8 @@ int MAIN(int argc, char **argv)
        EVP_CIPHER *enc=NULL;
        unsigned long f4=RSA_F4;
        char *outfile=NULL;
+       char *passargout = NULL, *passout = NULL;
+       char *engine=NULL;
        char *inrand=NULL;
        BIO *out=NULL;
 
@@ -110,8 +117,13 @@ int MAIN(int argc, char **argv)
                        }
                else if (strcmp(*argv,"-3") == 0)
                        f4=3;
-               else if (strcmp(*argv,"-F4") == 0)
+               else if (strcmp(*argv,"-F4") == 0 || strcmp(*argv,"-f4") == 0)
                        f4=RSA_F4;
+               else if (strcmp(*argv,"-engine") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       engine= *(++argv);
+                       }
                else if (strcmp(*argv,"-rand") == 0)
                        {
                        if (--argc < 1) goto bad;
@@ -127,6 +139,11 @@ int MAIN(int argc, char **argv)
                else if (strcmp(*argv,"-idea") == 0)
                        enc=EVP_idea_cbc();
 #endif
+               else if (strcmp(*argv,"-passout") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       passargout= *(++argv);
+                       }
                else
                        break;
                argv++;
@@ -136,23 +153,57 @@ int MAIN(int argc, char **argv)
                {
 bad:
                BIO_printf(bio_err,"usage: genrsa [args] [numbits]\n");
-               BIO_printf(bio_err," -des      - encrypt the generated key with DES in cbc mode\n");
-               BIO_printf(bio_err," -des3     - encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
+               BIO_printf(bio_err," -des            encrypt the generated key with DES in cbc mode\n");
+               BIO_printf(bio_err," -des3           encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
 #ifndef NO_IDEA
-               BIO_printf(bio_err," -idea     - encrypt the generated key with IDEA in cbc mode\n");
+               BIO_printf(bio_err," -idea           encrypt the generated key with IDEA in cbc mode\n");
 #endif
-               BIO_printf(bio_err," -out file - output the key to 'file\n");
-               BIO_printf(bio_err," -f4       - use F4 (0x10001) for the E value\n");
-               BIO_printf(bio_err," -3        - use 3 for the E value\n");
-               BIO_printf(bio_err," -rand file:file:...\n");
-               BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
-               BIO_printf(bio_err,"             the random number generator\n");
+               BIO_printf(bio_err," -out file       output the key to 'file\n");
+               BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
+               BIO_printf(bio_err," -f4             use F4 (0x10001) for the E value\n");
+               BIO_printf(bio_err," -3              use 3 for the E value\n");
+               BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
+               BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+               BIO_printf(bio_err,"                 load the file (or the files in the directory) into\n");
+               BIO_printf(bio_err,"                 the random number generator\n");
                goto err;
                }
                
        ERR_load_crypto_strings();
+
+       if(!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
+               BIO_printf(bio_err, "Error getting password\n");
+               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);
+               }
+
        if (outfile == NULL)
+               {
                BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef VMS
+               {
+               BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+               out = BIO_push(tmpbio, out);
+               }
+#endif
+               }
        else
                {
                if (BIO_write_filename(out,outfile) <= 0)
@@ -162,7 +213,8 @@ bad:
                        }
                }
 
-       if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
+       if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL
+               && !RAND_status())
                {
                BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
                }
@@ -190,13 +242,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,NULL))
+       if (!PEM_write_bio_RSAPrivateKey(out,rsa,enc,NULL,0,NULL, passout))
                goto err;
 
        ret=0;
 err:
        if (rsa != NULL) RSA_free(rsa);
-       if (out != NULL) BIO_free(out);
+       if (out != NULL) BIO_free_all(out);
+       if(passout) OPENSSL_free(passout);
        if (ret != 0)
                ERR_print_errors(bio_err);
        EXIT(ret);