Fix the names of some X509_STORE_CTX functions
This matches an upstream change. Add macros for the old names. We may be
able to unexport these, but for now just pick up the less confusing
names.
(I found only one user of one of them, goma, which will be replaced next
year. Though wanting *some* API to query the dirhash machinery is not
completely implausible.)
Change-Id: Idd2352c07c294c4f63c4ef12e5d97804f42225b9
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/64254
Reviewed-by: Bob Beck <bbe@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index e53d23b..7139ace 100644
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -209,8 +209,8 @@
return lu;
}
-int X509_STORE_get_by_subject(X509_STORE_CTX *vs, int type, X509_NAME *name,
- X509_OBJECT *ret) {
+int X509_STORE_CTX_get_by_subject(X509_STORE_CTX *vs, int type, X509_NAME *name,
+ X509_OBJECT *ret) {
X509_STORE *ctx = vs->ctx;
X509_OBJECT stmp;
CRYPTO_MUTEX_lock_write(&ctx->objs_lock);
@@ -395,7 +395,7 @@
return st->objs;
}
-STACK_OF(X509) *X509_STORE_get1_certs(X509_STORE_CTX *ctx, X509_NAME *nm) {
+STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *ctx, X509_NAME *nm) {
int cnt;
STACK_OF(X509) *sk = sk_X509_new_null();
if (sk == NULL) {
@@ -408,7 +408,7 @@
// cache
X509_OBJECT xobj;
CRYPTO_MUTEX_unlock_write(&ctx->ctx->objs_lock);
- if (!X509_STORE_get_by_subject(ctx, X509_LU_X509, nm, &xobj)) {
+ if (!X509_STORE_CTX_get_by_subject(ctx, X509_LU_X509, nm, &xobj)) {
sk_X509_free(sk);
return NULL;
}
@@ -435,7 +435,8 @@
return sk;
}
-STACK_OF(X509_CRL) *X509_STORE_get1_crls(X509_STORE_CTX *ctx, X509_NAME *nm) {
+STACK_OF(X509_CRL) *X509_STORE_CTX_get1_crls(X509_STORE_CTX *ctx,
+ X509_NAME *nm) {
int cnt;
X509_OBJECT xobj;
STACK_OF(X509_CRL) *sk = sk_X509_CRL_new_null();
@@ -444,7 +445,7 @@
}
// Always do lookup to possibly add new CRLs to cache.
- if (!X509_STORE_get_by_subject(ctx, X509_LU_CRL, nm, &xobj)) {
+ if (!X509_STORE_CTX_get_by_subject(ctx, X509_LU_CRL, nm, &xobj)) {
sk_X509_CRL_free(sk);
return NULL;
}
@@ -513,7 +514,7 @@
int idx, ret;
size_t i;
xn = X509_get_issuer_name(x);
- if (!X509_STORE_get_by_subject(ctx, X509_LU_X509, xn, &obj)) {
+ if (!X509_STORE_CTX_get_by_subject(ctx, X509_LU_X509, xn, &obj)) {
return 0;
}
// If certificate matches all OK
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index b0d825a..c56e174 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -139,7 +139,7 @@
X509 *xtmp = NULL;
size_t i;
// Lookup all certs with matching subject name
- certs = X509_STORE_get1_certs(ctx, X509_get_subject_name(x));
+ certs = X509_STORE_CTX_get1_certs(ctx, X509_get_subject_name(x));
if (certs == NULL) {
return NULL;
}
@@ -1143,7 +1143,7 @@
}
// Lookup CRLs from store
- skcrl = X509_STORE_get1_crls(ctx, nm);
+ skcrl = X509_STORE_CTX_get1_crls(ctx, nm);
// If no CRLs found and a near match from get_crl_sk use that
if (!skcrl && crl) {
diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index cb0ebab..09ae9c0 100644
--- a/include/openssl/x509.h
+++ b/include/openssl/x509.h
@@ -2833,6 +2833,11 @@
// X509V3_add_standard_extensions returns one.
OPENSSL_EXPORT int X509V3_add_standard_extensions(void);
+// The following symbols are legacy aliases for |X509_STORE_CTX| functions.
+#define X509_STORE_get_by_subject X509_STORE_CTX_get_by_subject
+#define X509_STORE_get1_certs X509_STORE_CTX_get1_certs
+#define X509_STORE_get1_crls X509_STORE_CTX_get1_crls
+
// Private structures.
@@ -3161,10 +3166,10 @@
OPENSSL_EXPORT void X509_STORE_free(X509_STORE *store);
OPENSSL_EXPORT STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(X509_STORE *st);
-OPENSSL_EXPORT STACK_OF(X509) *X509_STORE_get1_certs(X509_STORE_CTX *st,
- X509_NAME *nm);
-OPENSSL_EXPORT STACK_OF(X509_CRL) *X509_STORE_get1_crls(X509_STORE_CTX *st,
- X509_NAME *nm);
+OPENSSL_EXPORT STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *st,
+ X509_NAME *nm);
+OPENSSL_EXPORT STACK_OF(X509_CRL) *X509_STORE_CTX_get1_crls(X509_STORE_CTX *st,
+ X509_NAME *nm);
// X509_STORE_set_flags enables all values in |flags| in |store|'s verification
// flags.
@@ -3278,8 +3283,9 @@
OPENSSL_EXPORT int X509_STORE_add_cert(X509_STORE *ctx, X509 *x);
OPENSSL_EXPORT int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x);
-OPENSSL_EXPORT int X509_STORE_get_by_subject(X509_STORE_CTX *vs, int type,
- X509_NAME *name, X509_OBJECT *ret);
+OPENSSL_EXPORT int X509_STORE_CTX_get_by_subject(X509_STORE_CTX *vs, int type,
+ X509_NAME *name,
+ X509_OBJECT *ret);
OPENSSL_EXPORT int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
long argl, char **ret);
