From: tb <tb@openbsd.org>
Date: Fri, 5 Nov 2021 17:09:36 +0000 (+0000)
Subject: Garbage collect the unused skip member of X509_LOOKUP and
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9002f7e3e3f2aab533243053ddc4ea8c00f5f1a7;p=openbsd

Garbage collect the unused skip member of X509_LOOKUP and
the unused cache member of X509_STORE.

ok jsing
---

diff --git a/lib/libcrypto/x509/x509_lcl.h b/lib/libcrypto/x509/x509_lcl.h
index e1894e55239..9ef99584d15 100644
--- a/lib/libcrypto/x509/x509_lcl.h
+++ b/lib/libcrypto/x509/x509_lcl.h
@@ -288,7 +288,6 @@ struct X509_VERIFY_PARAM_st {
  */
 struct x509_store_st {
 	/* The following is a cache of trusted certs */
-	int cache;	/* if true, stash any hits */
 	STACK_OF(X509_OBJECT) *objs;	/* Cache of all objects */
 
 	/* These are external lookup methods */
@@ -316,7 +315,6 @@ struct x509_store_st {
 /* This is the functions plus an instance of the local variables. */
 struct x509_lookup_st {
 	int init;			/* have we been started */
-	int skip;			/* don't use us. */
 	X509_LOOKUP_METHOD *method;	/* the functions */
 	char *method_data;		/* method data */
 
diff --git a/lib/libcrypto/x509/x509_lu.c b/lib/libcrypto/x509/x509_lu.c
index 3fa572c7efa..69e11f35cb0 100644
--- a/lib/libcrypto/x509/x509_lu.c
+++ b/lib/libcrypto/x509/x509_lu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_lu.c,v 1.42 2021/11/05 17:08:12 tb Exp $ */
+/* $OpenBSD: x509_lu.c,v 1.43 2021/11/05 17:09:36 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -134,8 +134,6 @@ X509_LOOKUP_by_subject(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type, X509_NAME *name,
 {
 	if (ctx->method == NULL || ctx->method->get_by_subject == NULL)
 		return 0;
-	if (ctx->skip)
-		return 0;
 	return ctx->method->get_by_subject(ctx, type, name, ret);
 }