Forgot to change the declaration of do_subject() to one of parse_name()...

[openssl.git] / apps / pkcs12.c

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index dd56a2b808ab76dbb548102439ffc0bd9ec65f98..385011b457649f1df92d30495c3781017fb05bc6 100644 (file)
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -558,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)
@@ -814,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;
 }