From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 22 Sep 2006 00:28:37 +0000 (+0000)
Subject: Fix but in apps/pkcs12.c
X-Git-Tag: OpenSSL_0_9_8d~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1a5e414863a1c29bc6f88e4ae1d662f2e71e4969;p=oweals%2Fopenssl.git

Fix but in apps/pkcs12.c
PR: 1377
---

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);