138493a921
do not return bogus values from load_certs (#652286)
24 lines
857 B
Diff
24 lines
857 B
Diff
diff -up openssl-1.0.0a/apps/apps.c.load-certs openssl-1.0.0a/apps/apps.c
|
|
--- openssl-1.0.0a/apps/apps.c.load-certs 2010-05-27 16:09:13.000000000 +0200
|
|
+++ openssl-1.0.0a/apps/apps.c 2011-04-28 21:24:06.000000000 +0200
|
|
@@ -1208,7 +1208,8 @@ STACK_OF(X509) *load_certs(BIO *err, con
|
|
const char *pass, ENGINE *e, const char *desc)
|
|
{
|
|
STACK_OF(X509) *certs;
|
|
- load_certs_crls(err, file, format, pass, e, desc, &certs, NULL);
|
|
+ if (!load_certs_crls(err, file, format, pass, e, desc, &certs, NULL))
|
|
+ return NULL;
|
|
return certs;
|
|
}
|
|
|
|
@@ -1216,7 +1217,8 @@ STACK_OF(X509_CRL) *load_crls(BIO *err,
|
|
const char *pass, ENGINE *e, const char *desc)
|
|
{
|
|
STACK_OF(X509_CRL) *crls;
|
|
- load_certs_crls(err, file, format, pass, e, desc, NULL, &crls);
|
|
+ if (!load_certs_crls(err, file, format, pass, e, desc, NULL, &crls))
|
|
+ return NULL;
|
|
return crls;
|
|
}
|
|
|