diff options
author | tb <> | 2024-08-22 12:24:24 +0000 |
---|---|---|
committer | tb <> | 2024-08-22 12:24:24 +0000 |
commit | f4189b2cf71462de192f6d78bdc3d1bca89c80d2 (patch) | |
tree | 48a16a5881a9b76d6ded8e0c223ddc2d53f3c327 /src | |
parent | 44a50157e270294ce6647668feb0e9b98553abbe (diff) | |
download | openbsd-f4189b2cf71462de192f6d78bdc3d1bca89c80d2.tar.gz openbsd-f4189b2cf71462de192f6d78bdc3d1bca89c80d2.tar.bz2 openbsd-f4189b2cf71462de192f6d78bdc3d1bca89c80d2.zip |
Garbage collect unused attributes member from EVP_PKEY
ok miod
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/evp/evp_local.h | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/evp/p_lib.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libcrypto/evp/evp_local.h b/src/lib/libcrypto/evp/evp_local.h index 9631992a28..3e90e068e6 100644 --- a/src/lib/libcrypto/evp/evp_local.h +++ b/src/lib/libcrypto/evp/evp_local.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: evp_local.h,v 1.22 2024/04/12 09:41:39 tb Exp $ */ | 1 | /* $OpenBSD: evp_local.h,v 1.23 2024/08/22 12:24:24 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -175,7 +175,6 @@ struct evp_pkey_st { | |||
175 | #endif | 175 | #endif |
176 | } pkey; | 176 | } pkey; |
177 | int save_parameters; | 177 | int save_parameters; |
178 | STACK_OF(X509_ATTRIBUTE) *attributes; /* [ 0 ] */ | ||
179 | } /* EVP_PKEY */; | 178 | } /* EVP_PKEY */; |
180 | 179 | ||
181 | struct evp_md_st { | 180 | struct evp_md_st { |
diff --git a/src/lib/libcrypto/evp/p_lib.c b/src/lib/libcrypto/evp/p_lib.c index 4a6a6db4cc..95c7721303 100644 --- a/src/lib/libcrypto/evp/p_lib.c +++ b/src/lib/libcrypto/evp/p_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p_lib.c,v 1.60 2024/04/09 13:52:41 beck Exp $ */ | 1 | /* $OpenBSD: p_lib.c,v 1.61 2024/08/22 12:24:24 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -422,7 +422,6 @@ EVP_PKEY_free(EVP_PKEY *pkey) | |||
422 | return; | 422 | return; |
423 | 423 | ||
424 | evp_pkey_free_pkey_ptr(pkey); | 424 | evp_pkey_free_pkey_ptr(pkey); |
425 | sk_X509_ATTRIBUTE_pop_free(pkey->attributes, X509_ATTRIBUTE_free); | ||
426 | freezero(pkey, sizeof(*pkey)); | 425 | freezero(pkey, sizeof(*pkey)); |
427 | } | 426 | } |
428 | LCRYPTO_ALIAS(EVP_PKEY_free); | 427 | LCRYPTO_ALIAS(EVP_PKEY_free); |