Note the BN_mod_exp_word bug. (Markus Friedl provided a test program.)

[openssl.git] / apps / pkcs8.c

diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index e3fa7d4bad6d03681399785d902a3130770c1976..b0914cd453375d24adceec678393f778a786d88a 100644 (file)
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -71,6 +71,7 @@ int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 {
        char **args, *infile = NULL, *outfile = NULL;
+       char *passargin = NULL, *passargout = NULL;
        BIO *in = NULL, *out = NULL;
        int topk8 = 0;
        int pbe_nid = -1;
@@ -82,7 +83,7 @@ int MAIN(int argc, char **argv)
        X509_SIG *p8;
        PKCS8_PRIV_KEY_INFO *p8inf;
        EVP_PKEY *pkey;
-       char pass[50], *passin = NULL, *passout = NULL;
+       char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL;
        int badarg = 0;
        if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
        informat=FORMAT_PEM;
@@ -130,34 +131,12 @@ int MAIN(int argc, char **argv)
                else if (!strcmp(*args,"-passin"))
                        {
                        if (!args[1]) goto bad;
-                       passin= *(++args);
-                       }
-               else if (!strcmp(*args,"-envpassin"))
-                       {
-                       if (!args[1]) goto bad;
-                       if(!(passin= getenv(*(++args))))
-                               {
-                               BIO_printf(bio_err,
-                                "Can't read environment variable %s\n",
-                                                               *args);
-                               badarg = 1;
-                               }
-                       }
-               else if (strcmp(*args,"-envpassout") == 0)
-                       {
-                       if (!args[1]) goto bad;
-                       if(!(passout= getenv(*(++args))))
-                               {
-                               BIO_printf(bio_err,
-                                "Can't read environment variable %s\n",
-                                                               *args);
-                               badarg = 1;
-                               }
+                       passargin= *(++args);
                        }
                else if (!strcmp(*args,"-passout"))
                        {
                        if (!args[1]) goto bad;
-                       passout= *(++args);
+                       passargout= *(++args);
                        }
                else if (!strcmp (*args, "-in")) {
                        if (args[1]) {
@@ -179,12 +158,10 @@ int MAIN(int argc, char **argv)
                BIO_printf(bio_err, "where options are\n");
                BIO_printf(bio_err, "-in file        input file\n");
                BIO_printf(bio_err, "-inform X       input format (DER or PEM)\n");
-               BIO_printf(bio_err, "-passin arg     input file pass phrase\n");
-               BIO_printf(bio_err, "-envpassin arg  environment variable containing input file pass phrase\n");
+               BIO_printf(bio_err, "-passin arg     input file pass phrase source\n");
                BIO_printf(bio_err, "-outform X      output format (DER or PEM)\n");
                BIO_printf(bio_err, "-out file       output file\n");
-               BIO_printf(bio_err, "-passout arg    output file pass phrase\n");
-               BIO_printf(bio_err, "-envpassout arg environment variable containing outut file pass phrase\n");
+               BIO_printf(bio_err, "-passout arg    output file pass phrase source\n");
                BIO_printf(bio_err, "-topk8          output PKCS8 file\n");
                BIO_printf(bio_err, "-nooct          use (nonstandard) no octet format\n");
                BIO_printf(bio_err, "-embed          use (nonstandard) embedded DSA parameters format\n");
@@ -196,6 +173,11 @@ int MAIN(int argc, char **argv)
                return (1);
        }
 
+       if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
+               BIO_printf(bio_err, "Error getting passwords\n");
+               return (1);
+       }
+
        if ((pbe_nid == -1) && !cipher) pbe_nid = NID_pbeWithMD5AndDES_CBC;
 
        if (infile) {
@@ -216,7 +198,7 @@ int MAIN(int argc, char **argv)
 
        if (topk8) {
                if(informat == FORMAT_PEM)
-                       pkey = PEM_read_bio_PrivateKey(in, NULL, PEM_cb, passin);
+                       pkey = PEM_read_bio_PrivateKey(in, NULL, NULL, passin);
                else if(informat == FORMAT_ASN1)
                        pkey = d2i_PrivateKey_bio(in, NULL);
                else {
@@ -244,18 +226,21 @@ int MAIN(int argc, char **argv)
                                return (1);
                        }
                } else {
-                       if(!passout) {
-                               passout = pass;
+                       if(passout) p8pass = passout;
+                       else {
+                               p8pass = pass;
                                EVP_read_pw_string(pass, 50, "Enter Encryption Password:", 1);
                        }
+                       app_RAND_load_file(NULL, bio_err, 0);
                        if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,
-                                       passout, strlen(passout),
+                                       p8pass, strlen(p8pass),
                                        NULL, 0, iter, p8inf))) {
                                BIO_printf(bio_err, "Error encrypting key\n",
                                                                 outfile);
                                ERR_print_errors(bio_err);
                                return (1);
                        }
+                       app_RAND_write_file(NULL, bio_err);
                        if(outformat == FORMAT_PEM) 
                                PEM_write_bio_PKCS8(out, p8);
                        else if(outformat == FORMAT_ASN1)
@@ -269,6 +254,8 @@ int MAIN(int argc, char **argv)
                PKCS8_PRIV_KEY_INFO_free (p8inf);
                EVP_PKEY_free(pkey);
                BIO_free(out);
+               if(passin) OPENSSL_free(passin);
+               if(passout) OPENSSL_free(passout);
                return (0);
        }
 
@@ -296,11 +283,12 @@ int MAIN(int argc, char **argv)
                        ERR_print_errors(bio_err);
                        return (1);
                }
-               if(!passin) {
-                       passin = pass;
+               if(passin) p8pass = passin;
+               else {
+                       p8pass = pass;
                        EVP_read_pw_string(pass, 50, "Enter Password:", 0);
                }
-               p8inf = M_PKCS8_decrypt(p8, passin, strlen(passin));
+               p8inf = M_PKCS8_decrypt(p8, p8pass, strlen(p8pass));
                X509_SIG_free(p8);
        }
 
@@ -339,7 +327,7 @@ int MAIN(int argc, char **argv)
        
        PKCS8_PRIV_KEY_INFO_free(p8inf);
        if(outformat == FORMAT_PEM) 
-               PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, PEM_cb, passout);
+               PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL, passout);
        else if(outformat == FORMAT_ASN1)
                i2d_PrivateKey_bio(out, pkey);
        else {
@@ -350,6 +338,8 @@ int MAIN(int argc, char **argv)
        EVP_PKEY_free(pkey);
        BIO_free(out);
        BIO_free(in);
+       if(passin) OPENSSL_free(passin);
+       if(passout) OPENSSL_free(passout);
 
        return (0);
 }