From: Richard Levitte <levitte@openssl.org>
Date: Wed, 12 Dec 2001 16:49:02 +0000 (+0000)
Subject: Change pkcs12 so the certificates coming from -in do not get tossed if
X-Git-Tag: OpenSSL-engine-0_9_6c^2^2~150
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=206eb6a11d35f91b0165ac8fb597f71972e84489;p=oweals%2Fopenssl.git

Change pkcs12 so the certificates coming from -in do not get tossed if
-certfile is given as well.
---

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index cd9c02808a..0e2bd6dbcd 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -459,10 +459,16 @@ int MAIN(int argc, char **argv)
 
 	/* Add any more certificates asked for */
 	if (certfile) {
-		if(!(certs = load_certs(bio_err, certfile, FORMAT_PEM, NULL, e,
-			"certificates from 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