Correct a lot of printing calls. Remove extra arguments...

[openssl.git] / apps / pkcs12.c

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 64b4b32be72fd5273e23d1e877b03090c173ec9d..385011b457649f1df92d30495c3781017fb05bc6 100644 (file)
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -120,7 +120,9 @@ int MAIN(int argc, char **argv)
     char *passin = NULL, *passout = NULL;
     char *inrand = NULL;
     char *CApath = NULL, *CAfile = NULL;
+#ifndef OPENSSL_NO_ENGINE
     char *engine=NULL;
+#endif
 
     apps_startup();
 
@@ -259,11 +261,13 @@ int MAIN(int argc, char **argv)
                        args++; 
                        CAfile = *args;
                    } else badarg = 1;
+#ifndef OPENSSL_NO_ENGINE
                } else if (!strcmp(*args,"-engine")) {
                    if (args[1]) {
                        args++; 
                        engine = *args;
                    } else badarg = 1;
+#endif
                } else badarg = 1;
 
        } else badarg = 1;
@@ -311,14 +315,18 @@ int MAIN(int argc, char **argv)
        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");
+#ifndef OPENSSL_NO_ENGINE
        BIO_printf (bio_err, "-engine e     use engine e, possibly a hardware device.\n");
+#endif
        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;
     }
 
+#ifndef OPENSSL_NO_ENGINE
     e = setup_engine(bio_err, engine, 0);
+#endif
 
     if(passarg) {
        if(export_cert) passargout = passarg;
@@ -538,7 +546,7 @@ int MAIN(int argc, char **argv)
 #endif
 
        if(!noprompt &&
-               EVP_read_pw_string(pass, 50, "Enter Export Password:", 1))
+               EVP_read_pw_string(pass, sizeof pass, "Enter Export Password:", 1))
                {
                BIO_printf (bio_err, "Can't read Password\n");
                goto export_end;
@@ -550,7 +558,7 @@ int MAIN(int argc, char **argv)
        CRYPTO_push_info("creating PKCS#12 structure");
 #endif
 
-       p12 = PKCS12_create(pass, name, key, ucert, certs,
+       p12 = PKCS12_create(cpass, name, key, ucert, certs,
                                key_pbe, cert_pbe, iter, -1, keytype);
 
        if (!p12)
@@ -651,7 +659,7 @@ int MAIN(int argc, char **argv)
     if(passin) OPENSSL_free(passin);
     if(passout) OPENSSL_free(passout);
     apps_shutdown();
-    EXIT(ret);
+    OPENSSL_EXIT(ret);
 }
 
 int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass,
@@ -806,8 +814,9 @@ int alg_print (BIO *x, X509_ALGOR *alg)
        unsigned char *p;
        p = alg->parameter->value.sequence->data;
        pbe = d2i_PBEPARAM (NULL, &p, alg->parameter->value.sequence->length);
-       BIO_printf (bio_err, "%s, Iteration %d\n", 
-       OBJ_nid2ln(OBJ_obj2nid(alg->algorithm)), ASN1_INTEGER_get(pbe->iter));
+       BIO_printf (bio_err, "%s, Iteration %ld\n", 
+               OBJ_nid2ln(OBJ_obj2nid(alg->algorithm)),
+               ASN1_INTEGER_get(pbe->iter));
        PBEPARAM_free (pbe);
        return 0;
 }