aboutsummaryrefslogtreecommitdiff
path: root/crypto/x509/x509_lu.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2016-07-25 14:05:39 +0100
committerDr. Stephen Henson <steve@openssl.org>2016-07-26 16:23:02 +0100
commitfc9d1ef39c97c06f83fd40a6f94c0af4da3887ea (patch)
treed0029e8beff52847e41812553ae5bc6a562de36d /crypto/x509/x509_lu.c
parent61d81f0ac91cc0e8612c55f46432839f25a4c71a (diff)
downloadopenssl-fc9d1ef39c97c06f83fd40a6f94c0af4da3887ea.zip
openssl-fc9d1ef39c97c06f83fd40a6f94c0af4da3887ea.tar.gz
openssl-fc9d1ef39c97c06f83fd40a6f94c0af4da3887ea.tar.bz2
Remove current_method from X509_STORE_CTX
Remove current_method: it was intended as a means of retrying lookups bit it was never used. Now that X509_verify_cert() is a "one shot" operation it can never work as intended. Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/x509/x509_lu.c')
-rw-r--r--crypto/x509/x509_lu.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index 6f5f269..f40f3fc 100644
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -283,19 +283,14 @@ int X509_STORE_CTX_get_by_subject(X509_STORE_CTX *vs, X509_LOOKUP_TYPE type,
CRYPTO_THREAD_unlock(ctx->lock);
if (tmp == NULL || type == X509_LU_CRL) {
- for (i = vs->current_method;
- i < sk_X509_LOOKUP_num(ctx->get_cert_methods); i++) {
+ for (i = 0; i < sk_X509_LOOKUP_num(ctx->get_cert_methods); i++) {
lu = sk_X509_LOOKUP_value(ctx->get_cert_methods, i);
j = X509_LOOKUP_by_subject(lu, type, name, &stmp);
- if (j < 0) {
- vs->current_method = j;
- return j;
- } else if (j) {
+ if (j) {
tmp = &stmp;
break;
}
}
- vs->current_method = 0;
if (tmp == NULL)
return 0;
}