commit 2ab9090b8784b1c188f91f1093ee8aad24269871
author David Benjamin <davidben@chromium.org> Wed Apr 15 17:19:58 2015 -0400
committer Adam Langley <agl@google.com> Wed Apr 15 23:36:09 2015 +0000
tree b6cb5f3e9c366cba68f3239a8648ab37d99b8706
parent 1004b9564aa2a2f58b721e0ee46bbe9479778357

Remove X509_STORE's ex_data.

No functions for using it were ever added.

Change-Id: Iaee6e5bc8254a740435ccdcdbd715b851d8a0dce
Reviewed-on: https://boringssl-review.googlesource.com/4374
Reviewed-by: Adam Langley <agl@google.com>

crypto/internal.h

diff --git a/crypto/internal.h b/crypto/internal.h
index 101f7a8..faceefc 100644
--- a/crypto/internal.h
+++ b/crypto/internal.h
@@ -487,7 +487,6 @@
   CRYPTO_EX_INDEX_SSL,
   CRYPTO_EX_INDEX_SSL_CTX,
   CRYPTO_EX_INDEX_SSL_SESSION,
-  CRYPTO_EX_INDEX_X509_STORE,
   CRYPTO_EX_INDEX_X509_STORE_CTX,
   CRYPTO_EX_INDEX_RSA,
   CRYPTO_EX_INDEX_DSA,

crypto/x509/x509_lu.c

diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index a3b1d68..34ef26e 100644
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -64,8 +64,6 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
-#include "../internal.h"
-
 
 X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method)
 	{
@@ -194,9 +192,6 @@
 	if ((ret->param = X509_VERIFY_PARAM_new()) == NULL)
 		goto err;
 
-	if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_X509_STORE, ret, &ret->ex_data))
-		goto err;
-
 	ret->references = 1;
 	return ret;
 err:
@@ -264,7 +259,6 @@
 	sk_X509_LOOKUP_free(sk);
 	sk_X509_OBJECT_pop_free(vfy->objs, cleanup);
 
-	CRYPTO_free_ex_data(CRYPTO_EX_INDEX_X509_STORE, vfy, &vfy->ex_data);
 	if (vfy->param)
 		X509_VERIFY_PARAM_free(vfy->param);
 	OPENSSL_free(vfy);

include/openssl/x509_vfy.h

diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h
index af114eb..299cad7 100644
--- a/include/openssl/x509_vfy.h
+++ b/include/openssl/x509_vfy.h
@@ -202,7 +202,6 @@
 	STACK_OF(X509_CRL) * (*lookup_crls)(X509_STORE_CTX *ctx, X509_NAME *nm);
 	int (*cleanup)(X509_STORE_CTX *ctx);
 
-	CRYPTO_EX_DATA ex_data;
 	int references;
 	} /* X509_STORE */;