summaryrefslogtreecommitdiffstats
path: root/crypto/x509
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2005-06-16 02:05:57 +0000
committerDr. Stephen Henson <steve@openssl.org>2005-06-16 02:05:57 +0000
commitce2c19e357144e1248d5c4c9df6b775b874b5903 (patch)
tree5d4aa2259c313684362095814011e24e10410c1a /crypto/x509
parent1b1081a3ed041213aed9aad9f544571e8fa6fd7b (diff)
Update from head.
Diffstat (limited to 'crypto/x509')
-rw-r--r--crypto/x509/x509_vfy.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index a4a142cd01..79dae3d3bf 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -776,7 +776,8 @@ static int check_crl(X509_STORE_CTX *ctx, X509_CRL *crl)
}
}
- if (!check_crl_time(ctx, crl, 1))
+ ok = check_crl_time(ctx, crl, 1);
+ if (!ok)
goto err;
ok = 1;
@@ -1006,7 +1007,8 @@ static int internal_verify(X509_STORE_CTX *ctx)
xs->valid = 1;
- if (!check_cert_time(ctx, xs))
+ ok = check_cert_time(ctx, xs);
+ if (!ok)
goto end;
/* The last error (if any) is still in the error value */