summaryrefslogtreecommitdiffstats
path: root/apps/pkcs12.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2006-09-22 00:28:37 +0000
committerDr. Stephen Henson <steve@openssl.org>2006-09-22 00:28:37 +0000
commit1a5e414863a1c29bc6f88e4ae1d662f2e71e4969 (patch)
tree6f7af217a38e7568dbd49c70ce49f8d53fd04e57 /apps/pkcs12.c
parentec3639385e4c50202ab8502fca82bb5c46e85850 (diff)
Fix but in apps/pkcs12.c
PR: 1377
Diffstat (limited to 'apps/pkcs12.c')
-rw-r--r--apps/pkcs12.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 308f9208a1..688a0cee60 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -180,7 +180,8 @@ int MAIN(int argc, char **argv)
args++;
if (!strcmp(*args, "NONE"))
cert_pbe = -1;
- cert_pbe=OBJ_txt2nid(*args);
+ else
+ cert_pbe=OBJ_txt2nid(*args);
if(cert_pbe == NID_undef) {
BIO_printf(bio_err,
"Unknown PBE algorithm %s\n", *args);