Stress collector/padding function.

[openssl.git] / apps / pkcs8.c

diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index 5e20a2be70b526eecff0c34082cca762ca7d37c9..43a828484784944349297087ab14ebbd1e601136 100644 (file)
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -62,9 +62,7 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/pkcs12.h>
-#include <openssl/engine.h>
 
-#include "apps.h"
 #define PROG pkcs8_main
 
 int MAIN(int, char **);
@@ -84,13 +82,18 @@ int MAIN(int argc, char **argv)
        int nocrypt = 0;
        X509_SIG *p8;
        PKCS8_PRIV_KEY_INFO *p8inf;
-       EVP_PKEY *pkey;
+       EVP_PKEY *pkey=NULL;
        char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL;
        int badarg = 0;
+#ifndef OPENSSL_NO_ENGINE
        char *engine=NULL;
+#endif
 
        if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
 
+       if (!load_config(bio_err, NULL))
+               goto end;
+
        informat=FORMAT_PEM;
        outformat=FORMAT_PEM;
 
@@ -144,11 +147,13 @@ int MAIN(int argc, char **argv)
                        if (!args[1]) goto bad;
                        passargout= *(++args);
                        }
+#ifndef OPENSSL_NO_ENGINE
                else if (strcmp(*args,"-engine") == 0)
                        {
                        if (!args[1]) goto bad;
                        engine= *(++args);
                        }
+#endif
                else if (!strcmp (*args, "-in")) {
                        if (args[1]) {
                                args++;
@@ -181,11 +186,15 @@ int MAIN(int argc, char **argv)
                BIO_printf(bio_err, "-nocrypt        use or expect unencrypted private key\n");
                BIO_printf(bio_err, "-v2 alg         use PKCS#5 v2.0 and cipher \"alg\"\n");
                BIO_printf(bio_err, "-v1 obj         use PKCS#5 v1.5 and cipher \"alg\"\n");
+#ifndef OPENSSL_NO_ENGINE
                BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
+#endif
                return (1);
        }
 
+#ifndef OPENSSL_NO_ENGINE
         e = setup_engine(bio_err, engine, 0);
+#endif
 
        if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
                BIO_printf(bio_err, "Error getting passwords\n");
@@ -217,24 +226,20 @@ int MAIN(int argc, char **argv)
                }
 #endif
        }
-       if (topk8) {
-               if(informat == FORMAT_PEM)
-                       pkey = PEM_read_bio_PrivateKey(in, NULL, NULL, passin);
-               else if(informat == FORMAT_ASN1)
-                       pkey = d2i_PrivateKey_bio(in, NULL);
-               else {
-                       BIO_printf(bio_err, "Bad format specified for key\n");
-                       return (1);
-               }
+       if (topk8)
+               {
+               BIO_free(in); /* Not needed in this section */
+               pkey = load_key(bio_err, infile, informat, 1,
+                       passin, e, "key");
                if (!pkey) {
-                       BIO_printf(bio_err, "Error reading key\n", outfile);
-                       ERR_print_errors(bio_err);
+                       BIO_free_all(out);
                        return (1);
                }
-               BIO_free(in);
                if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken))) {
-                       BIO_printf(bio_err, "Error converting key\n", outfile);
+                       BIO_printf(bio_err, "Error converting key\n");
                        ERR_print_errors(bio_err);
+                       EVP_PKEY_free(pkey);
+                       BIO_free_all(out);
                        return (1);
                }
                if(nocrypt) {
@@ -244,21 +249,32 @@ int MAIN(int argc, char **argv)
                                i2d_PKCS8_PRIV_KEY_INFO_bio(out, p8inf);
                        else {
                                BIO_printf(bio_err, "Bad format specified for key\n");
+                               PKCS8_PRIV_KEY_INFO_free(p8inf);
+                               EVP_PKEY_free(pkey);
+                               BIO_free_all(out);
                                return (1);
                        }
                } else {
                        if(passout) p8pass = passout;
                        else {
                                p8pass = pass;
-                               EVP_read_pw_string(pass, 50, "Enter Encryption Password:", 1);
+                               if (EVP_read_pw_string(pass, sizeof pass, "Enter Encryption Password:", 1))
+                               {
+                                       PKCS8_PRIV_KEY_INFO_free(p8inf);
+                                       EVP_PKEY_free(pkey);
+                                       BIO_free_all(out);
+                                       return (1);
+                               }
                        }
                        app_RAND_load_file(NULL, bio_err, 0);
                        if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,
                                        p8pass, strlen(p8pass),
                                        NULL, 0, iter, p8inf))) {
-                               BIO_printf(bio_err, "Error encrypting key\n",
-                                                                outfile);
+                               BIO_printf(bio_err, "Error encrypting key\n");
                                ERR_print_errors(bio_err);
+                               PKCS8_PRIV_KEY_INFO_free(p8inf);
+                               EVP_PKEY_free(pkey);
+                               BIO_free_all(out);
                                return (1);
                        }
                        app_RAND_write_file(NULL, bio_err);
@@ -268,6 +284,9 @@ int MAIN(int argc, char **argv)
                                i2d_PKCS8_bio(out, p8);
                        else {
                                BIO_printf(bio_err, "Bad format specified for key\n");
+                               PKCS8_PRIV_KEY_INFO_free(p8inf);
+                               EVP_PKEY_free(pkey);
+                               BIO_free_all(out);
                                return (1);
                        }
                        X509_SIG_free(p8);
@@ -300,27 +319,27 @@ int MAIN(int argc, char **argv)
                }
 
                if (!p8) {
-                       BIO_printf (bio_err, "Error reading key\n", outfile);
+                       BIO_printf (bio_err, "Error reading key\n");
                        ERR_print_errors(bio_err);
                        return (1);
                }
                if(passin) p8pass = passin;
                else {
                        p8pass = pass;
-                       EVP_read_pw_string(pass, 50, "Enter Password:", 0);
+                       EVP_read_pw_string(pass, sizeof pass, "Enter Password:", 0);
                }
                p8inf = PKCS8_decrypt(p8, p8pass, strlen(p8pass));
                X509_SIG_free(p8);
        }
 
        if (!p8inf) {
-               BIO_printf(bio_err, "Error decrypting key\n", outfile);
+               BIO_printf(bio_err, "Error decrypting key\n");
                ERR_print_errors(bio_err);
                return (1);
        }
 
        if (!(pkey = EVP_PKCS82PKEY(p8inf))) {
-               BIO_printf(bio_err, "Error converting key\n", outfile);
+               BIO_printf(bio_err, "Error converting key\n");
                ERR_print_errors(bio_err);
                return (1);
        }
@@ -356,6 +375,7 @@ int MAIN(int argc, char **argv)
                        return (1);
        }
 
+       end:
        EVP_PKEY_free(pkey);
        BIO_free_all(out);
        BIO_free(in);