New documentation about things related to SSL_CIPHER. Submitted by Lutz Jaenicke...

[openssl.git] / apps / genrsa.c

diff --git a/apps/genrsa.c b/apps/genrsa.c
index 63fd45ee989ebb3062a33e73a34bbf256bafec9e..5cf47e69215c9a6f302b2df64ea104fe1b75f2db 100644 (file)
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -75,6 +75,9 @@
 #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)
        {
        int ret=1;
@@ -84,7 +87,7 @@ int MAIN(int argc, char **argv)
        EVP_CIPHER *enc=NULL;
        unsigned long f4=RSA_F4;
        char *outfile=NULL;
-       char *passout = NULL;
+       char *passargout = NULL, *passout = NULL;
        char *inrand=NULL;
        BIO *out=NULL;
 
@@ -111,7 +114,7 @@ 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,"-rand") == 0)
                        {
@@ -128,21 +131,10 @@ int MAIN(int argc, char **argv)
                else if (strcmp(*argv,"-idea") == 0)
                        enc=EVP_idea_cbc();
 #endif
-               else if (strcmp(*argv,"-envpassout") == 0)
-                       {
-                       if (--argc < 1) goto bad;
-                               if(!(passout= getenv(*(++argv))))
-                               {
-                               BIO_printf(bio_err,
-                                "Can't read environment variable %s\n",
-                                                               *argv);
-                               goto bad;
-                               }
-                       }
                else if (strcmp(*argv,"-passout") == 0)
                        {
                        if (--argc < 1) goto bad;
-                       passout= *(++argv);
+                       passargout= *(++argv);
                        }
                else
                        break;
@@ -159,17 +151,22 @@ bad:
                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," -passout arg    output file pass phrase\n");
-               BIO_printf(bio_err," -envpassout arg environment variable containing output file pass phrase\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," -rand file:file:...\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 (outfile == NULL)
                BIO_set_fp(out,stdout,BIO_NOCLOSE);
        else
@@ -209,13 +206,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,PEM_cb, passout))
+       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(passout) OPENSSL_free(passout);
        if (ret != 0)
                ERR_print_errors(bio_err);
        EXIT(ret);