EXIT() may mean return(). That's confusing, so let's have it really mean
[openssl.git] / apps / pkcs12.c
index dd008c4..e445c24 100644 (file)
@@ -1,11 +1,11 @@
 /* pkcs12.c */
-#if !defined(NO_DES) && !defined(NO_SHA1)
+#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)
 
 /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
+ * project.
  */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2002 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -69,7 +69,7 @@
 
 #define PROG pkcs12_main
 
-EVP_CIPHER *enc;
+const EVP_CIPHER *enc;
 
 
 #define NOKEYS         0x1
@@ -78,21 +78,27 @@ EVP_CIPHER *enc;
 #define CLCERTS                0x8
 #define CACERTS                0x10
 
-int get_cert_chain(X509 *cert, STACK_OF(X509) **chain);
+int get_cert_chain (X509 *cert, X509_STORE *store, STACK_OF(X509) **chain);
 int dump_certs_keys_p12(BIO *out, PKCS12 *p12, char *pass, int passlen, int options, char *pempass);
-int dump_certs_pkeys_bags(BIO *out, STACK *bags, char *pass, int passlen, int options, char *pempass);
+int dump_certs_pkeys_bags(BIO *out, STACK_OF(PKCS12_SAFEBAG) *bags, char *pass,
+                         int passlen, int options, char *pempass);
 int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bags, char *pass, int passlen, int options, char *pempass);
 int print_attribs(BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst, char *name);
 void hex_prin(BIO *out, unsigned char *buf, int len);
 int alg_print(BIO *x, X509_ALGOR *alg);
 int cert_load(BIO *in, STACK_OF(X509) *sk);
+
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
 {
+    ENGINE *e = NULL;
     char *infile=NULL, *outfile=NULL, *keyname = NULL; 
     char *certfile=NULL;
-    BIO *in=NULL, *out = NULL, *inkey = NULL, *certsin = NULL;
+    BIO *in=NULL, *out = NULL;
     char **args;
     char *name = NULL;
+    char *csp_name = NULL;
     PKCS12 *p12 = NULL;
     char pass[50], macpass[50];
     int export_cert = 0;
@@ -110,13 +116,20 @@ int MAIN(int argc, char **argv)
     int noprompt = 0;
     STACK *canames = NULL;
     char *cpass = NULL, *mpass = NULL;
+    char *passargin = NULL, *passargout = NULL, *passarg = NULL;
     char *passin = NULL, *passout = NULL;
+    char *inrand = NULL;
+    char *CApath = NULL, *CAfile = NULL;
+    char *engine=NULL;
 
     apps_startup();
 
     enc = EVP_des_ede3_cbc();
     if (bio_err == NULL ) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
 
+       if (!load_config(bio_err, NULL))
+               goto end;
+
     args = argv + 1;
 
 
@@ -137,19 +150,28 @@ int MAIN(int argc, char **argv)
                        cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
                else if (!strcmp (*args, "-export")) export_cert = 1;
                else if (!strcmp (*args, "-des")) enc=EVP_des_cbc();
-#ifndef NO_IDEA
+#ifndef OPENSSL_NO_IDEA
                else if (!strcmp (*args, "-idea")) enc=EVP_idea_cbc();
 #endif
                else if (!strcmp (*args, "-des3")) enc = EVP_des_ede3_cbc();
+#ifndef OPENSSL_NO_AES
+               else if (!strcmp(*args,"-aes128")) enc=EVP_aes_128_cbc();
+               else if (!strcmp(*args,"-aes192")) enc=EVP_aes_192_cbc();
+               else if (!strcmp(*args,"-aes256")) enc=EVP_aes_256_cbc();
+#endif
                else if (!strcmp (*args, "-noiter")) iter = 1;
                else if (!strcmp (*args, "-maciter"))
                                         maciter = PKCS12_DEFAULT_ITER;
                else if (!strcmp (*args, "-nomaciter"))
                                         maciter = 1;
+               else if (!strcmp (*args, "-nomac"))
+                                        maciter = -1;
                else if (!strcmp (*args, "-nodes")) enc=NULL;
                else if (!strcmp (*args, "-certpbe")) {
                        if (args[1]) {
                                args++;
+                               if (!strcmp(*args, "NONE"))
+                                       cert_pbe = -1;
                                cert_pbe=OBJ_txt2nid(*args);
                                if(cert_pbe == NID_undef) {
                                        BIO_printf(bio_err,
@@ -160,13 +182,21 @@ int MAIN(int argc, char **argv)
                } else if (!strcmp (*args, "-keypbe")) {
                        if (args[1]) {
                                args++;
-                               key_pbe=OBJ_txt2nid(*args);
+                               if (!strcmp(*args, "NONE"))
+                                       key_pbe = -1;
+                               else
+                                       key_pbe=OBJ_txt2nid(*args);
                                if(key_pbe == NID_undef) {
                                        BIO_printf(bio_err,
                                                 "Unknown PBE algorithm %s\n", *args);
                                        badarg = 1;
                                }
                        } else badarg = 1;
+               } else if (!strcmp (*args, "-rand")) {
+                   if (args[1]) {
+                       args++; 
+                       inrand = *args;
+                   } else badarg = 1;
                } else if (!strcmp (*args, "-inkey")) {
                    if (args[1]) {
                        args++; 
@@ -182,10 +212,15 @@ int MAIN(int argc, char **argv)
                        args++; 
                        name = *args;
                    } else badarg = 1;
+               } else if (!strcmp (*args, "-CSP")) {
+                   if (args[1]) {
+                       args++; 
+                       csp_name = *args;
+                   } else badarg = 1;
                } else if (!strcmp (*args, "-caname")) {
                    if (args[1]) {
                        args++; 
-                       if (!canames) canames = sk_new(NULL);
+                       if (!canames) canames = sk_new_null();
                        sk_push(canames, *args);
                    } else badarg = 1;
                } else if (!strcmp (*args, "-in")) {
@@ -201,47 +236,33 @@ int MAIN(int argc, char **argv)
                } else if (!strcmp(*args,"-passin")) {
                    if (args[1]) {
                        args++; 
-                       passin = *args;
+                       passargin = *args;
                    } else badarg = 1;
-               } else if (!strcmp(*args,"-envpassin")) {
+               } else if (!strcmp(*args,"-passout")) {
                    if (args[1]) {
                        args++; 
-                       if(!(passin= getenv(*args))) {
-                               BIO_printf(bio_err,
-                                "Can't read environment variable %s\n",
-                                                               *argv);
-                               badarg = 1;
-                       }
+                       passargout = *args;
                    } else badarg = 1;
-               } else if (!strcmp(*args,"-envpassout")) {
+               } else if (!strcmp (*args, "-password")) {
                    if (args[1]) {
                        args++; 
-                       if(!(passout= getenv(*args))) {
-                               BIO_printf(bio_err,
-                                "Can't read environment variable %s\n",
-                                                               *argv);
-                               badarg = 1;
-                       }
+                       passarg = *args;
+                       noprompt = 1;
                    } else badarg = 1;
-               } else if (!strcmp(*args,"-passout")) {
+               } else if (!strcmp(*args,"-CApath")) {
                    if (args[1]) {
                        args++; 
-                       passout = *args;
+                       CApath = *args;
                    } else badarg = 1;
-               } else if (!strcmp (*args, "-envpass")) {
+               } else if (!strcmp(*args,"-CAfile")) {
                    if (args[1]) {
                        args++; 
-                       if(!(cpass = getenv(*args))) {
-                               BIO_printf(bio_err,
-                                "Can't read environment variable %s\n", *args);
-                               goto end;
-                       }
+                       CAfile = *args;
                    } else badarg = 1;
-               } else if (!strcmp (*args, "-password")) {
+               } else if (!strcmp(*args,"-engine")) {
                    if (args[1]) {
                        args++; 
-                       cpass = *args;
-                       noprompt = 1;
+                       engine = *args;
                    } else badarg = 1;
                } else badarg = 1;
 
@@ -256,6 +277,8 @@ int MAIN(int argc, char **argv)
        BIO_printf (bio_err, "-chain        add certificate chain\n");
        BIO_printf (bio_err, "-inkey file   private key if not infile\n");
        BIO_printf (bio_err, "-certfile f   add all certs in f\n");
+       BIO_printf (bio_err, "-CApath arg   - PEM format directory of CA's\n");
+       BIO_printf (bio_err, "-CAfile arg   - PEM format file of CA's\n");
        BIO_printf (bio_err, "-name \"name\"  use name as friendly name\n");
        BIO_printf (bio_err, "-caname \"nm\"  use nm as CA friendly name (can be used more than once).\n");
        BIO_printf (bio_err, "-in  infile   input filename\n");
@@ -269,8 +292,12 @@ int MAIN(int argc, char **argv)
        BIO_printf (bio_err, "-info         give info about PKCS#12 structure.\n");
        BIO_printf (bio_err, "-des          encrypt private keys with DES\n");
        BIO_printf (bio_err, "-des3         encrypt private keys with triple DES (default)\n");
-#ifndef NO_IDEA
+#ifndef OPENSSL_NO_IDEA
        BIO_printf (bio_err, "-idea         encrypt private keys with idea\n");
+#endif
+#ifndef OPENSSL_NO_AES
+       BIO_printf (bio_err, "-aes128, -aes192, -aes256\n");
+       BIO_printf (bio_err, "              encrypt PEM output with cbc aes\n");
 #endif
        BIO_printf (bio_err, "-nodes        don't encrypt private keys\n");
        BIO_printf (bio_err, "-noiter       don't use encryption iteration\n");
@@ -281,15 +308,28 @@ int MAIN(int argc, char **argv)
        BIO_printf (bio_err, "-keypbe alg   specify private key PBE algorithm (default 3DES)\n");
        BIO_printf (bio_err, "-keyex        set MS key exchange type\n");
        BIO_printf (bio_err, "-keysig       set MS key signature type\n");
-       BIO_printf (bio_err, "-password p   set import/export password (NOT RECOMMENDED)\n");
-       BIO_printf (bio_err, "-envpass p    set import/export password from environment\n");
-       BIO_printf (bio_err, "-passin p     input file pass phrase\n");
-       BIO_printf (bio_err, "-envpassin p  environment variable containing input file pass phrase\n");
-       BIO_printf (bio_err, "-passout p    output file pass phrase\n");
-       BIO_printf (bio_err, "-envpassout p environment variable containing output file pass phrase\n");
+       BIO_printf (bio_err, "-password p   set import/export password source\n");
+       BIO_printf (bio_err, "-passin p     input file pass phrase source\n");
+       BIO_printf (bio_err, "-passout p    output file pass phrase source\n");
+       BIO_printf (bio_err, "-engine e     use engine e, possibly a hardware device.\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 end;
     }
 
+    e = setup_engine(bio_err, engine, 0);
+
+    if(passarg) {
+       if(export_cert) passargout = passarg;
+       else passargin = passarg;
+    }
+
+    if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
+       BIO_printf(bio_err, "Error getting passwords\n");
+       goto end;
+    }
+
     if(!cpass) {
        if(export_cert) cpass = passout;
        else cpass = passin;
@@ -303,6 +343,12 @@ int MAIN(int argc, char **argv)
        mpass = macpass;
     }
 
+    if(export_cert || inrand) {
+       app_RAND_load_file(NULL, bio_err, (inrand != NULL));
+        if (inrand != NULL)
+               BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+                       app_RAND_load_files(inrand));
+    }
     ERR_load_crypto_strings();
 
 #ifdef CRYPTO_MDEBUG
@@ -318,29 +364,20 @@ int MAIN(int argc, char **argv)
            goto end;
    }
 
-   if (certfile) {
-       if(!(certsin = BIO_new_file(certfile, "r"))) {
-           BIO_printf(bio_err, "Can't open certificate file %s\n", certfile);
-           perror (certfile);
-           goto end;
-       }
-    }
-
-    if (keyname) {
-       if(!(inkey = BIO_new_file(keyname, "r"))) {
-           BIO_printf(bio_err, "Can't key certificate file %s\n", keyname);
-           perror (keyname);
-           goto end;
-       }
-     }
-
 #ifdef CRYPTO_MDEBUG
     CRYPTO_pop_info();
     CRYPTO_push_info("write files");
 #endif
 
-    if (!outfile) out = BIO_new_fp(stdout, BIO_NOCLOSE);
-    else out = BIO_new_file(outfile, "wb");
+    if (!outfile) {
+       out = BIO_new_fp(stdout, BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+       {
+           BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+           out = BIO_push(tmpbio, out);
+       }
+#endif
+    } else out = BIO_new_file(outfile, "wb");
     if (!out) {
        BIO_printf(bio_err, "Error opening output file %s\n",
                                                outfile ? outfile : "<stdout>");
@@ -351,7 +388,7 @@ int MAIN(int argc, char **argv)
 #ifdef CRYPTO_MDEBUG
     CRYPTO_push_info("read MAC password");
 #endif
-       if(EVP_read_pw_string (macpass, 50, "Enter MAC Password:", export_cert))
+       if(EVP_read_pw_string (macpass, sizeof macpass, "Enter MAC Password:", export_cert))
        {
            BIO_printf (bio_err, "Can't read Password\n");
            goto end;
@@ -362,144 +399,188 @@ int MAIN(int argc, char **argv)
     }
 
     if (export_cert) {
-       EVP_PKEY *key;
-       STACK *bags, *safes;
-       PKCS12_SAFEBAG *bag;
-       PKCS8_PRIV_KEY_INFO *p8;
-       PKCS7 *authsafe;
-       X509 *ucert = NULL;
+       EVP_PKEY *key = NULL;
+       X509 *ucert = NULL, *x = NULL;
        STACK_OF(X509) *certs=NULL;
-       char *catmp;
+       unsigned char *catmp = NULL;
        int i;
-       unsigned char keyid[EVP_MAX_MD_SIZE];
-       unsigned int keyidlen = 0;
+
+       if ((options & (NOCERTS|NOKEYS)) == (NOCERTS|NOKEYS))
+               {       
+               BIO_printf(bio_err, "Nothing to do!\n");
+               goto export_end;
+               }
+
+       if (options & NOCERTS)
+               chain = 0;
 
 #ifdef CRYPTO_MDEBUG
        CRYPTO_push_info("process -export_cert");
+       CRYPTO_push_info("reading private key");
 #endif
-       key = PEM_read_bio_PrivateKey(inkey ? inkey : in, NULL, PEM_cb, passin);
-       if (!inkey) (void) BIO_reset(in);
-       else BIO_free(inkey);
-       if (!key) {
-               BIO_printf (bio_err, "Error loading private key\n");
-               ERR_print_errors(bio_err);
-               goto end;
-       }
+       if (!(options & NOKEYS))
+               {
+               key = load_key(bio_err, keyname ? keyname : infile,
+                               FORMAT_PEM, 1, passin, e, "private key");
+               if (!key)
+                       goto export_end;
+               }
 
-       certs = sk_X509_new(NULL);
+#ifdef CRYPTO_MDEBUG
+       CRYPTO_pop_info();
+       CRYPTO_push_info("reading certs from input");
+#endif
 
        /* Load in all certs in input file */
-       if(!cert_load(in, certs)) {
-               BIO_printf(bio_err, "Error loading certificates from input\n");
-               ERR_print_errors(bio_err);
-               goto end;
-       }
+       if(!(options & NOCERTS))
+               {
+               certs = load_certs(bio_err, infile, FORMAT_PEM, NULL, e,
+                                                       "certificates");
+               if (!certs)
+                       goto export_end;
+
+               if (key)
+                       {
+                       /* Look for matching private key */
+                       for(i = 0; i < sk_X509_num(certs); i++)
+                               {
+                               x = sk_X509_value(certs, i);
+                               if(X509_check_private_key(x, key))
+                                       {
+                                       ucert = x;
+                                       /* Zero keyid and alias */
+                                       X509_keyid_set1(ucert, NULL, 0);
+                                       X509_alias_set1(ucert, NULL, 0);
+                                       /* Remove from list */
+                                       sk_X509_delete(certs, i);
+                                       break;
+                                       }
+                               }
+                       if (!ucert)
+                               {
+                               BIO_printf(bio_err, "No certificate matches private key\n");
+                               goto export_end;
+                               }
+                       }
 
-       for(i = 0; i < sk_X509_num(certs); i++) {
-               ucert = sk_X509_value(certs, i);
-               if(X509_check_private_key(ucert, key)) {
-                       X509_digest(ucert, EVP_sha1(), keyid, &keyidlen);
-                       break;
                }
-       }
 
-       if(!keyidlen) {
-               BIO_printf(bio_err, "No certificate matches private key\n");
-               goto end;
-       }
-       
-       bags = sk_new (NULL);
+#ifdef CRYPTO_MDEBUG
+       CRYPTO_pop_info();
+       CRYPTO_push_info("reading certs from input 2");
+#endif
 
        /* Add any more certificates asked for */
-       if (certsin) {
-               if(!cert_load(certsin, certs)) {
-                       BIO_printf(bio_err, "Error loading certificates from certfile\n");
-                       ERR_print_errors(bio_err);
-                       goto end;
-               }
-               BIO_free(certsin);
-       }
+       if(certfile)
+               {
+               STACK_OF(X509) *morecerts=NULL;
+               if(!(morecerts = load_certs(bio_err, certfile, FORMAT_PEM,
+                                           NULL, e,
+                                           "certificates from certfile")))
+                       goto export_end;
+               while(sk_X509_num(morecerts) > 0)
+                       sk_X509_push(certs, sk_X509_shift(morecerts));
+               sk_X509_free(morecerts);
+               }
+
+#ifdef CRYPTO_MDEBUG
+       CRYPTO_pop_info();
+       CRYPTO_push_info("reading certs from certfile");
+#endif
+
+#ifdef CRYPTO_MDEBUG
+       CRYPTO_pop_info();
+       CRYPTO_push_info("building chain");
+#endif
 
        /* If chaining get chain from user cert */
        if (chain) {
                int vret;
                STACK_OF(X509) *chain2;
-               vret = get_cert_chain (ucert, &chain2);
-               if (vret) {
+               X509_STORE *store = X509_STORE_new();
+               if (!store)
+                       {
+                       BIO_printf (bio_err, "Memory allocation error\n");
+                       goto export_end;
+                       }
+               if (!X509_STORE_load_locations(store, CAfile, CApath))
+                       X509_STORE_set_default_paths (store);
+
+               vret = get_cert_chain (ucert, store, &chain2);
+               X509_STORE_free(store);
+
+               if (!vret) {
+                   /* Exclude verified certificate */
+                   for (i = 1; i < sk_X509_num (chain2) ; i++) 
+                       sk_X509_push(certs, sk_X509_value (chain2, i));
+                   /* Free first certificate */
+                   X509_free(sk_X509_value(chain2, 0));
+                   sk_X509_free(chain2);
+               } else {
                        BIO_printf (bio_err, "Error %s getting chain.\n",
                                        X509_verify_cert_error_string(vret));
-                       goto end;
-               }
-               /* Exclude verified certificate */
-               for (i = 1; i < sk_X509_num (chain2) ; i++) 
-                                sk_X509_push(certs, sk_X509_value (chain2, i));
-               sk_X509_free(chain2);
-                       
+                       goto export_end;
+               }                       
        }
 
-       /* We now have loads of certificates: include them all */
-       for(i = 0; i < sk_X509_num(certs); i++) {
-               X509 *cert = NULL;
-               cert = sk_X509_value(certs, i);
-               bag = M_PKCS12_x5092certbag(cert);
-               /* If it matches private key set id */
-               if(cert == ucert) {
-                       if(name) PKCS12_add_friendlyname(bag, name, -1);
-                       PKCS12_add_localkeyid(bag, keyid, keyidlen);
-               } else if((catmp = sk_shift(canames))) 
-                               PKCS12_add_friendlyname(bag, catmp, -1);
-               sk_push(bags, (char *)bag);
-       }
-       sk_X509_pop_free(certs, X509_free);
-       if (canames) sk_free(canames);
+       /* Add any CA names */
+
+       for (i = 0; i < sk_num(canames); i++)
+               {
+               catmp = (unsigned char *)sk_value(canames, i);
+               X509_alias_set1(sk_X509_value(certs, i), catmp, -1);
+               }
+               
+
+#ifdef CRYPTO_MDEBUG
+       CRYPTO_pop_info();
+       CRYPTO_push_info("reading password");
+#endif
 
        if(!noprompt &&
-               EVP_read_pw_string(pass, 50, "Enter Export Password:", 1)) {
-           BIO_printf (bio_err, "Can't read Password\n");
-           goto end;
-        }
+               EVP_read_pw_string(pass, sizeof pass, "Enter Export Password:", 1))
+               {
+               BIO_printf (bio_err, "Can't read Password\n");
+               goto export_end;
+               }
        if (!twopass) strcpy(macpass, pass);
-       /* Turn certbags into encrypted authsafe */
-       authsafe = PKCS12_pack_p7encdata(cert_pbe, cpass, -1, NULL, 0,
-                                                                iter, bags);
-       sk_pop_free(bags, PKCS12_SAFEBAG_free);
-
-       if (!authsafe) {
-               ERR_print_errors (bio_err);
-               goto end;
-       }
 
-       safes = sk_new (NULL);
-       sk_push (safes, (char *)authsafe);
+#ifdef CRYPTO_MDEBUG
+       CRYPTO_pop_info();
+       CRYPTO_push_info("creating PKCS#12 structure");
+#endif
 
-       /* Make a shrouded key bag */
-       p8 = EVP_PKEY2PKCS8 (key);
-       EVP_PKEY_free(key);
-       if(keytype) PKCS8_add_keyusage(p8, keytype);
-       bag = PKCS12_MAKE_SHKEYBAG(key_pbe, cpass, -1, NULL, 0, iter, p8);
-       PKCS8_PRIV_KEY_INFO_free(p8);
-        if (name) PKCS12_add_friendlyname (bag, name, -1);
-       PKCS12_add_localkeyid (bag, keyid, keyidlen);
-       bags = sk_new(NULL);
-       sk_push (bags, (char *)bag);
-       /* Turn it into unencrypted safe bag */
-       authsafe = PKCS12_pack_p7data (bags);
-       sk_pop_free(bags, PKCS12_SAFEBAG_free);
-       sk_push (safes, (char *)authsafe);
+       p12 = PKCS12_create(pass, name, key, ucert, certs,
+                               key_pbe, cert_pbe, iter, -1, keytype);
 
-       p12 = PKCS12_init (NID_pkcs7_data);
+       if (!p12)
+               {
+               ERR_print_errors (bio_err);
+               goto export_end;
+               }
 
-       M_PKCS12_pack_authsafes (p12, safes);
+       if (maciter != -1)
+               PKCS12_set_mac(p12, mpass, -1, NULL, 0, maciter, NULL);
 
-       sk_pop_free(safes, PKCS7_free);
+#ifdef CRYPTO_MDEBUG
+       CRYPTO_pop_info();
+       CRYPTO_push_info("writing pkcs12");
+#endif
 
-       PKCS12_set_mac (p12, mpass, -1, NULL, 0, maciter, NULL);
+       i2d_PKCS12_bio(out, p12);
 
-       i2d_PKCS12_bio (out, p12);
+       ret = 0;
 
-       PKCS12_free(p12);
+    export_end:
+#ifdef CRYPTO_MDEBUG
+       CRYPTO_pop_info();
+       CRYPTO_pop_info();
+       CRYPTO_push_info("process -export_cert: freeing");
+#endif
 
-       ret = 0;
+       if (key) EVP_PKEY_free(key);
+       if (certs) sk_X509_pop_free(certs, X509_free);
+       if (ucert) X509_free(ucert);
 
 #ifdef CRYPTO_MDEBUG
        CRYPTO_pop_info();
@@ -516,7 +597,7 @@ int MAIN(int argc, char **argv)
 #ifdef CRYPTO_MDEBUG
     CRYPTO_push_info("read import password");
 #endif
-    if(!noprompt && EVP_read_pw_string(pass, 50, "Enter Import Password:", 0)) {
+    if(!noprompt && EVP_read_pw_string(pass, sizeof pass, "Enter Import Password:", 0)) {
        BIO_printf (bio_err, "Can't read Password\n");
        goto end;
     }
@@ -531,11 +612,16 @@ int MAIN(int argc, char **argv)
 #ifdef CRYPTO_MDEBUG
     CRYPTO_push_info("verify MAC");
 #endif
-       if (!PKCS12_verify_mac (p12, mpass, -1)) {
+       /* If we enter empty password try no password first */
+       if(!macpass[0] && PKCS12_verify_mac(p12, NULL, 0)) {
+               /* If mac and crypto pass the same set it to NULL too */
+               if(!twopass) cpass = NULL;
+       } else if (!PKCS12_verify_mac(p12, mpass, -1)) {
            BIO_printf (bio_err, "Mac verify error: invalid password?\n");
            ERR_print_errors (bio_err);
            goto end;
-       } else BIO_printf (bio_err, "MAC verified OK\n");
+       }
+       BIO_printf (bio_err, "MAC verified OK\n");
 #ifdef CRYPTO_MDEBUG
     CRYPTO_pop_info();
 #endif
@@ -552,58 +638,67 @@ int MAIN(int argc, char **argv)
 #ifdef CRYPTO_MDEBUG
     CRYPTO_pop_info();
 #endif
-    PKCS12_free(p12);
     ret = 0;
-    end:
+ end:
+    if (p12) PKCS12_free(p12);
+    if(export_cert || inrand) app_RAND_write_file(NULL, bio_err);
 #ifdef CRYPTO_MDEBUG
     CRYPTO_remove_all_info();
 #endif
     BIO_free(in);
-    BIO_free(out);
-    EXIT(ret);
+    BIO_free_all(out);
+    if (canames) sk_free(canames);
+    if(passin) OPENSSL_free(passin);
+    if(passout) OPENSSL_free(passout);
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
 }
 
 int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass,
             int passlen, int options, char *pempass)
 {
-       STACK *asafes, *bags;
+       STACK_OF(PKCS7) *asafes;
+       STACK_OF(PKCS12_SAFEBAG) *bags;
        int i, bagnid;
        PKCS7 *p7;
-       if (!( asafes = M_PKCS12_unpack_authsafes (p12))) return 0;
-       for (i = 0; i < sk_num (asafes); i++) {
-               p7 = (PKCS7 *) sk_value (asafes, i);
+
+       if (!( asafes = PKCS12_unpack_authsafes(p12))) return 0;
+       for (i = 0; i < sk_PKCS7_num (asafes); i++) {
+               p7 = sk_PKCS7_value (asafes, i);
                bagnid = OBJ_obj2nid (p7->type);
                if (bagnid == NID_pkcs7_data) {
-                       bags = M_PKCS12_unpack_p7data (p7);
+                       bags = PKCS12_unpack_p7data(p7);
                        if (options & INFO) BIO_printf (bio_err, "PKCS7 Data\n");
                } else if (bagnid == NID_pkcs7_encrypted) {
                        if (options & INFO) {
-                               BIO_printf (bio_err, "PKCS7 Encrypted data: ");
-                               alg_print (bio_err, 
+                               BIO_printf(bio_err, "PKCS7 Encrypted data: ");
+                               alg_print(bio_err, 
                                        p7->d.encrypted->enc_data->algorithm);
                        }
-                       bags = M_PKCS12_unpack_p7encdata (p7, pass, passlen);
+                       bags = PKCS12_unpack_p7encdata(p7, pass, passlen);
                } else continue;
                if (!bags) return 0;
                if (!dump_certs_pkeys_bags (out, bags, pass, passlen, 
                                                 options, pempass)) {
-                       sk_pop_free (bags, PKCS12_SAFEBAG_free);
+                       sk_PKCS12_SAFEBAG_pop_free (bags, PKCS12_SAFEBAG_free);
                        return 0;
                }
-               sk_pop_free (bags, PKCS12_SAFEBAG_free);
+               sk_PKCS12_SAFEBAG_pop_free (bags, PKCS12_SAFEBAG_free);
        }
-       sk_pop_free (asafes, PKCS7_free);
+       sk_PKCS7_pop_free (asafes, PKCS7_free);
        return 1;
 }
 
-int dump_certs_pkeys_bags (BIO *out, STACK *bags, char *pass,
-            int passlen, int options, char *pempass)
+int dump_certs_pkeys_bags (BIO *out, STACK_OF(PKCS12_SAFEBAG) *bags,
+                          char *pass, int passlen, int options, char *pempass)
 {
        int i;
-       for (i = 0; i < sk_num (bags); i++) {
+       for (i = 0; i < sk_PKCS12_SAFEBAG_num (bags); i++) {
                if (!dump_certs_pkeys_bag (out,
-                        (PKCS12_SAFEBAG *)sk_value (bags, i), pass, passlen,
-                                               options, pempass)) return 0;
+                                          sk_PKCS12_SAFEBAG_value (bags, i),
+                                          pass, passlen,
+                                          options, pempass))
+                   return 0;
        }
        return 1;
 }
@@ -624,7 +719,7 @@ int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,
                p8 = bag->value.keybag;
                if (!(pkey = EVP_PKCS82PKEY (p8))) return 0;
                print_attribs (out, p8->attributes, "Key Attributes");
-               PEM_write_bio_PrivateKey (out, pkey, enc, NULL, 0, PEM_cb, pempass);
+               PEM_write_bio_PrivateKey (out, pkey, enc, NULL, 0, NULL, pempass);
                EVP_PKEY_free(pkey);
        break;
 
@@ -635,12 +730,15 @@ int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,
                }
                if (options & NOKEYS) return 1;
                print_attribs (out, bag->attrib, "Bag Attributes");
-               if (!(p8 = M_PKCS12_decrypt_skey (bag, pass, passlen)))
+               if (!(p8 = PKCS12_decrypt_skey(bag, pass, passlen)))
                                return 0;
-               if (!(pkey = EVP_PKCS82PKEY (p8))) return 0;
+               if (!(pkey = EVP_PKCS82PKEY (p8))) {
+                       PKCS8_PRIV_KEY_INFO_free(p8);
+                       return 0;
+               }
                print_attribs (out, p8->attributes, "Key Attributes");
                PKCS8_PRIV_KEY_INFO_free(p8);
-               PEM_write_bio_PrivateKey (out, pkey, enc, NULL, 0, PEM_cb, pempass);
+               PEM_write_bio_PrivateKey (out, pkey, enc, NULL, 0, NULL, pempass);
                EVP_PKEY_free(pkey);
        break;
 
@@ -653,7 +751,7 @@ int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,
                print_attribs (out, bag->attrib, "Bag Attributes");
                if (M_PKCS12_cert_bag_type(bag) != NID_x509Certificate )
                                                                 return 1;
-               if (!(x509 = M_PKCS12_certbag2x509(bag))) return 0;
+               if (!(x509 = PKCS12_certbag2x509(bag))) return 0;
                dump_cert_text (out, x509);
                PEM_write_bio_X509 (out, x509);
                X509_free(x509);
@@ -679,26 +777,25 @@ int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,
 
 /* Hope this is OK .... */
 
-int get_cert_chain (X509 *cert, STACK_OF(X509) **chain)
+int get_cert_chain (X509 *cert, X509_STORE *store, STACK_OF(X509) **chain)
 {
-       X509_STORE *store;
        X509_STORE_CTX store_ctx;
        STACK_OF(X509) *chn;
        int i;
 
-       store = X509_STORE_new ();
-       X509_STORE_set_default_paths (store);
+       /* FIXME: Should really check the return status of X509_STORE_CTX_init
+        * for an error, but how that fits into the return value of this
+        * function is less obvious. */
        X509_STORE_CTX_init(&store_ctx, store, cert, NULL);
        if (X509_verify_cert(&store_ctx) <= 0) {
                i = X509_STORE_CTX_get_error (&store_ctx);
                goto err;
        }
-       chn =  X509_STORE_CTX_rget_chain(&store_ctx);
+       chn =  X509_STORE_CTX_get1_chain(&store_ctx);
        i = 0;
        *chain = chn;
 err:
        X509_STORE_CTX_cleanup(&store_ctx);
-       X509_STORE_free(store);
        
        return i;
 }      
@@ -722,10 +819,22 @@ int cert_load(BIO *in, STACK_OF(X509) *sk)
        int ret;
        X509 *cert;
        ret = 0;
+#ifdef CRYPTO_MDEBUG
+       CRYPTO_push_info("cert_load(): reading one cert");
+#endif
        while((cert = PEM_read_bio_X509(in, NULL, NULL, NULL))) {
+#ifdef CRYPTO_MDEBUG
+               CRYPTO_pop_info();
+#endif
                ret = 1;
                sk_X509_push(sk, cert);
+#ifdef CRYPTO_MDEBUG
+               CRYPTO_push_info("cert_load(): reading one cert");
+#endif
        }
+#ifdef CRYPTO_MDEBUG
+       CRYPTO_pop_info();
+#endif
        if(ret) ERR_clear_error();
        return ret;
 }
@@ -763,18 +872,18 @@ int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst, char *name)
                                value = uni2asc(av->value.bmpstring->data,
                                               av->value.bmpstring->length);
                                BIO_printf(out, "%s\n", value);
-                               Free(value);
+                               OPENSSL_free(value);
                                break;
 
                                case V_ASN1_OCTET_STRING:
-                               hex_prin(out, av->value.bit_string->data,
-                                       av->value.bit_string->length);
+                               hex_prin(out, av->value.octet_string->data,
+                                       av->value.octet_string->length);
                                BIO_printf(out, "\n");  
                                break;
 
                                case V_ASN1_BIT_STRING:
-                               hex_prin(out, av->value.octet_string->data,
-                                       av->value.octet_string->length);
+                               hex_prin(out, av->value.bit_string->data,
+                                       av->value.bit_string->length);
                                BIO_printf(out, "\n");  
                                break;