generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
-certfile is given as well.
This commit is contained in:
Richard Levitte 2001-12-12 16:49:02 +00:00
parent f11fd3f4e1
commit 206eb6a11d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/pkcs12.c
View File

@ -459,10 +459,16 @@ int MAIN(int argc, char **argv)
/* Add any more certificates asked for */ /* Add any more certificates asked for */
if (certfile) { if (certfile) {
if(!(certs = load_certs(bio_err, certfile, FORMAT_PEM, NULL, e, STACK_OF(X509) *morecerts=NULL;
"certificates from certfile"))) { if(!(morecerts = load_certs(bio_err, certfile, FORMAT_PEM,
NULL, e,
"certificates from certfile"))) {
goto export_end; goto export_end;
} }
while(sk_X509_num(morecerts) > 0) {
sk_X509_push(certs, sk_X509_shift(morecerts));
}
sk_X509_free(morecerts);
} }
#ifdef CRYPTO_MDEBUG #ifdef CRYPTO_MDEBUG