Commit 206eb6a1 authored by Richard Levitte's avatar Richard Levitte
Browse files

Change pkcs12 so the certificates coming from -in do not get tossed if 

-certfile is given as well.
parent f11fd3f4

apps/pkcs12.c

+8 −2
Original line number Diff line number Diff line
@@ -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,

		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