Fix some of the command line password stuff. New function

[openssl.git] / apps / req.c

diff --git a/apps/req.c b/apps/req.c
index 24e666f0dccd6bfb142785b34978a6c988b5fcf9..5c14c71e570327742059a433c2074cfcd9e92177 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -237,14 +237,13 @@ int MAIN(int argc, char **argv)
                else if (strcmp(*argv,"-envpassout") == 0)
                        {
                        if (--argc < 1) goto bad;
-                               if(!(passout= getenv(*(++argv))))
+                       if(!(passout= getenv(*(++argv))))
                                {
                                BIO_printf(bio_err,
                                 "Can't read environment variable %s\n",
                                                                *argv);
                                badops = 1;
                                }
-                       argv++;
                        }
                else if (strcmp(*argv,"-passout") == 0)
                        {
@@ -527,10 +526,9 @@ bad:
                        goto end;
                        }
 
-/*             if (keyform == FORMAT_ASN1)
-                       rsa=d2i_RSAPrivateKey_bio(in,NULL);
-               else */
-               if (keyform == FORMAT_PEM)
+               if (keyform == FORMAT_ASN1)
+                       pkey=d2i_PrivateKey_bio(in,NULL);
+               else if (keyform == FORMAT_PEM)
                        {
                        pkey=PEM_read_bio_PrivateKey(in,NULL,PEM_cb,passin);
                        }