From: tb <tb@openbsd.org>
Date: Thu, 22 Aug 2024 12:24:24 +0000 (+0000)
Subject: Garbage collect unused attributes member from EVP_PKEY
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ce6bee98cad7cec0befea255ad50101053fe421a;p=openbsd

Garbage collect unused attributes member from EVP_PKEY

ok miod
---

diff --git a/lib/libcrypto/evp/evp_local.h b/lib/libcrypto/evp/evp_local.h
index 9631992a28f..3e90e068e66 100644
--- a/lib/libcrypto/evp/evp_local.h
+++ b/lib/libcrypto/evp/evp_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_local.h,v 1.22 2024/04/12 09:41:39 tb Exp $ */
+/* $OpenBSD: evp_local.h,v 1.23 2024/08/22 12:24:24 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -175,7 +175,6 @@ struct evp_pkey_st {
 #endif
 	} pkey;
 	int save_parameters;
-	STACK_OF(X509_ATTRIBUTE) *attributes; /* [ 0 ] */
 } /* EVP_PKEY */;
 
 struct evp_md_st {
diff --git a/lib/libcrypto/evp/p_lib.c b/lib/libcrypto/evp/p_lib.c
index 4a6a6db4ccd..95c7721303d 100644
--- a/lib/libcrypto/evp/p_lib.c
+++ b/lib/libcrypto/evp/p_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p_lib.c,v 1.60 2024/04/09 13:52:41 beck Exp $ */
+/* $OpenBSD: p_lib.c,v 1.61 2024/08/22 12:24:24 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -422,7 +422,6 @@ EVP_PKEY_free(EVP_PKEY *pkey)
 		return;
 
 	evp_pkey_free_pkey_ptr(pkey);
-	sk_X509_ATTRIBUTE_pop_free(pkey->attributes, X509_ATTRIBUTE_free);
 	freezero(pkey, sizeof(*pkey));
 }
 LCRYPTO_ALIAS(EVP_PKEY_free);