summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2012-03-12 15:30:37 -0700
committerBrian Carlstrom <bdc@google.com>2012-03-12 16:19:22 -0700
commit21c841450af61d0a9119cdc863e93d019127bfe1 (patch)
tree4ea5e41f6bc6e5de4e1fa9afb41ce1d68d078547 /apps
parent48ab0d92457e1d77588be52be12076e372fdbcb7 (diff)
downloadreplicant_openssl-21c841450af61d0a9119cdc863e93d019127bfe1.zip
replicant_openssl-21c841450af61d0a9119cdc863e93d019127bfe1.tar.gz
replicant_openssl-21c841450af61d0a9119cdc863e93d019127bfe1.tar.bz2
Upgrade to openssl-1.0.0h
Change-Id: I0bc9b6b486bf10ebae34b994b63cf6011afdf5e1
Diffstat (limited to 'apps')
-rw-r--r--apps/apps.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/apps.c b/apps/apps.c
index 38e6197..272fd78 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -109,7 +109,7 @@
*
*/
-#ifndef _POSIX_C_SOURCE
+#if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
#define _POSIX_C_SOURCE 2 /* On VMS, you need to define this to get
the declaration of fileno(). The value
2 is to make sure no function defined
@@ -1215,7 +1215,8 @@ STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,
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;
}
@@ -1223,7 +1224,8 @@ STACK_OF(X509_CRL) *load_crls(BIO *err, const char *file, int format,
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;
}