The various hash #includes in rand_lcl.h *are* needed despite

[openssl.git] / apps / pkcs8.c

diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index 3e59b74124a2a9f615a6c3d93ef489a069945fa1..cfc4851e00a6ddd3a8904cfc94bcdc40f3c6152c 100644 (file)
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -62,6 +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
@@ -70,6 +71,7 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
+       ENGINE *e = NULL;
        char **args, *infile = NULL, *outfile = NULL;
        char *passargin = NULL, *passargout = NULL;
        BIO *in = NULL, *out = NULL;
@@ -85,9 +87,13 @@ int MAIN(int argc, char **argv)
        EVP_PKEY *pkey;
        char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL;
        int badarg = 0;
+       char *engine=NULL;
+
        if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
+
        informat=FORMAT_PEM;
        outformat=FORMAT_PEM;
+
        ERR_load_crypto_strings();
        OpenSSL_add_all_algorithms();
        args = argv + 1;
@@ -138,6 +144,11 @@ int MAIN(int argc, char **argv)
                        if (!args[1]) goto bad;
                        passargout= *(++args);
                        }
+               else if (strcmp(*args,"-engine") == 0)
+                       {
+                       if (!args[1]) goto bad;
+                       engine= *(++args);
+                       }
                else if (!strcmp (*args, "-in")) {
                        if (args[1]) {
                                args++;
@@ -170,9 +181,12 @@ 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");
+               BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
                return (1);
        }
 
+        e = setup_engine(bio_err, engine, 0);
+
        if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
                BIO_printf(bio_err, "Error getting passwords\n");
                return (1);
@@ -194,23 +208,22 @@ int MAIN(int argc, char **argv)
                                 "Can't open output file %s\n", outfile);
                        return (1);
                }
-       } else out = BIO_new_fp (stdout, BIO_NOCLOSE);
-
-       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);
+       } else {
+               out = BIO_new_fp (stdout, BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+               {
+                       BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                       out = BIO_push(tmpbio, out);
                }
+#endif
+       }
+       if (topk8)
+               {
+               BIO_free(in); /* Not needed in this section */
+               pkey = load_key(bio_err, infile, informat, passin, e, "key");
                if (!pkey) {
-                       BIO_printf(bio_err, "Error reading key\n", outfile);
-                       ERR_print_errors(bio_err);
                        return (1);
                }
-               BIO_free(in);
                if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken))) {
                        BIO_printf(bio_err, "Error converting key\n", outfile);
                        ERR_print_errors(bio_err);
@@ -253,9 +266,9 @@ int MAIN(int argc, char **argv)
                }
                PKCS8_PRIV_KEY_INFO_free (p8inf);
                EVP_PKEY_free(pkey);
-               BIO_free(out);
-               if(passin) Free(passin);
-               if(passout) Free(passout);
+               BIO_free_all(out);
+               if(passin) OPENSSL_free(passin);
+               if(passout) OPENSSL_free(passout);
                return (0);
        }
 
@@ -288,7 +301,7 @@ int MAIN(int argc, char **argv)
                        p8pass = pass;
                        EVP_read_pw_string(pass, 50, "Enter Password:", 0);
                }
-               p8inf = M_PKCS8_decrypt(p8, p8pass, strlen(p8pass));
+               p8inf = PKCS8_decrypt(p8, p8pass, strlen(p8pass));
                X509_SIG_free(p8);
        }
 
@@ -336,10 +349,10 @@ int MAIN(int argc, char **argv)
        }
 
        EVP_PKEY_free(pkey);
-       BIO_free(out);
+       BIO_free_all(out);
        BIO_free(in);
-       if(passin) Free(passin);
-       if(passout) Free(passout);
+       if(passin) OPENSSL_free(passin);
+       if(passout) OPENSSL_free(passout);
 
        return (0);
 }