diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/x509/x509_lu.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/lib/libcrypto/x509/x509_lu.c b/src/lib/libcrypto/x509/x509_lu.c index 05730f56cc..5a8fe96368 100644 --- a/src/lib/libcrypto/x509/x509_lu.c +++ b/src/lib/libcrypto/x509/x509_lu.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_lu.c,v 1.60 2023/04/25 18:32:42 tb Exp $ */ | 1 | /* $OpenBSD: x509_lu.c,v 1.61 2023/12/25 22:14:23 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -102,9 +102,8 @@ X509_LOOKUP_init(X509_LOOKUP *ctx) | |||
102 | { | 102 | { |
103 | if (ctx->method == NULL) | 103 | if (ctx->method == NULL) |
104 | return 0; | 104 | return 0; |
105 | if (ctx->method->init == NULL) | 105 | /* Historical behavior: make init succeed even without method. */ |
106 | return 1; | 106 | return 1; |
107 | return ctx->method->init(ctx); | ||
108 | } | 107 | } |
109 | LCRYPTO_ALIAS(X509_LOOKUP_init); | 108 | LCRYPTO_ALIAS(X509_LOOKUP_init); |
110 | 109 | ||
@@ -113,9 +112,8 @@ X509_LOOKUP_shutdown(X509_LOOKUP *ctx) | |||
113 | { | 112 | { |
114 | if (ctx->method == NULL) | 113 | if (ctx->method == NULL) |
115 | return 0; | 114 | return 0; |
116 | if (ctx->method->shutdown == NULL) | 115 | /* Historical behavior: make shutdown succeed even without method. */ |
117 | return 1; | 116 | return 1; |
118 | return ctx->method->shutdown(ctx); | ||
119 | } | 117 | } |
120 | LCRYPTO_ALIAS(X509_LOOKUP_shutdown); | 118 | LCRYPTO_ALIAS(X509_LOOKUP_shutdown); |
121 | 119 | ||
@@ -145,9 +143,7 @@ int | |||
145 | X509_LOOKUP_by_issuer_serial(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type, | 143 | X509_LOOKUP_by_issuer_serial(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type, |
146 | X509_NAME *name, ASN1_INTEGER *serial, X509_OBJECT *ret) | 144 | X509_NAME *name, ASN1_INTEGER *serial, X509_OBJECT *ret) |
147 | { | 145 | { |
148 | if (ctx->method == NULL || ctx->method->get_by_issuer_serial == NULL) | 146 | return 0; |
149 | return 0; | ||
150 | return ctx->method->get_by_issuer_serial(ctx, type, name, serial, ret); | ||
151 | } | 147 | } |
152 | LCRYPTO_ALIAS(X509_LOOKUP_by_issuer_serial); | 148 | LCRYPTO_ALIAS(X509_LOOKUP_by_issuer_serial); |
153 | 149 | ||
@@ -155,9 +151,7 @@ int | |||
155 | X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type, | 151 | X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type, |
156 | const unsigned char *bytes, int len, X509_OBJECT *ret) | 152 | const unsigned char *bytes, int len, X509_OBJECT *ret) |
157 | { | 153 | { |
158 | if (ctx->method == NULL || ctx->method->get_by_fingerprint == NULL) | 154 | return 0; |
159 | return 0; | ||
160 | return ctx->method->get_by_fingerprint(ctx, type, bytes, len, ret); | ||
161 | } | 155 | } |
162 | LCRYPTO_ALIAS(X509_LOOKUP_by_fingerprint); | 156 | LCRYPTO_ALIAS(X509_LOOKUP_by_fingerprint); |
163 | 157 | ||
@@ -165,9 +159,7 @@ int | |||
165 | X509_LOOKUP_by_alias(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type, const char *str, | 159 | X509_LOOKUP_by_alias(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type, const char *str, |
166 | int len, X509_OBJECT *ret) | 160 | int len, X509_OBJECT *ret) |
167 | { | 161 | { |
168 | if (ctx->method == NULL || ctx->method->get_by_alias == NULL) | 162 | return 0; |
169 | return 0; | ||
170 | return ctx->method->get_by_alias(ctx, type, str, len, ret); | ||
171 | } | 163 | } |
172 | LCRYPTO_ALIAS(X509_LOOKUP_by_alias); | 164 | LCRYPTO_ALIAS(X509_LOOKUP_by_alias); |
173 | 165 | ||