From: Gábor Tóthvári <tigbrcode@protonmail.com>
Date: Tue, 29 Oct 2024 19:28:04 +0000 (+0100)
Subject: Remove two unused union members from struct x509_object_st.
X-Git-Tag: openssl-3.5.0-alpha1~943
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f4cd8e305ad2e918fc0c5680d0ff94ee25f42c3;p=thirdparty%2Fopenssl.git

Remove two unused union members from struct x509_object_st.

CLA: trivial

Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25826)
---

diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index e7fdf3d6ab6..29b30ad6b2c 100644
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -331,7 +331,7 @@ static int ossl_x509_store_ctx_get_by_subject(const X509_STORE_CTX *ctx,
         return 0;
 
     stmp.type = X509_LU_NONE;
-    stmp.data.ptr = NULL;
+    stmp.data.x509 = NULL;
 
     if (!x509_store_read_lock(store))
         return 0;
@@ -371,7 +371,7 @@ static int ossl_x509_store_ctx_get_by_subject(const X509_STORE_CTX *ctx,
         return -1;
 
     ret->type = tmp->type;
-    ret->data.ptr = tmp->data.ptr;
+    ret->data = tmp->data;
     return 1;
 }
 
diff --git a/include/crypto/x509.h b/include/crypto/x509.h
index 332108d1bb5..616265f5b27 100644
--- a/include/crypto/x509.h
+++ b/include/crypto/x509.h
@@ -303,10 +303,8 @@ struct x509_object_st {
     /* one of the above types */
     X509_LOOKUP_TYPE type;
     union {
-        char *ptr;
         X509 *x509;
         X509_CRL *crl;
-        EVP_PKEY *pkey;
     } data;
 };