diff options
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/pem/pem_info.c | 11 | ||||
| -rw-r--r-- | crypto/x509/by_file.c | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c index fec18a4..b65239a 100644 --- a/crypto/pem/pem_info.c +++ b/crypto/pem/pem_info.c @@ -132,6 +132,17 @@ start: } pp=(char **)&(xi->x509); } + else if ((strcmp(name,PEM_STRING_X509_TRUSTED) == 0)) + { + d2i=(char *(*)())d2i_X509_AUX; + if (xi->x509 != NULL) + { + if (!sk_X509_INFO_push(ret,xi)) goto err; + if ((xi=X509_INFO_new()) == NULL) goto err; + goto start; + } + pp=(char **)&(xi->x509); + } else if (strcmp(name,PEM_STRING_X509_CRL) == 0) { d2i=(char *(*)())d2i_X509_CRL; diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c index 3c31de7..0457f01 100644 --- a/crypto/x509/by_file.c +++ b/crypto/x509/by_file.c @@ -147,7 +147,7 @@ int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type) { for (;;) { - x=PEM_read_bio_X509(in,NULL,NULL,NULL); + x=PEM_read_bio_X509_AUX(in,NULL,NULL,NULL); if (x == NULL) { if ((ERR_GET_REASON(ERR_peek_error()) == |