From ffc98932e7dd8da47a52971639e2eb8ada5f7097 Mon Sep 17 00:00:00 2001 From: tb <> Date: Thu, 4 Jan 2024 17:38:36 +0000 Subject: Remove unused app_data from EVP_CIPHER The EVP_CIPHER structs are static const data that the library returns when you call EVP_aes_128_cbc(), for example. It makes no sense whatsoever to hang user data off such a struct, but it's been there since forever. ok jsing --- src/lib/libcrypto/evp/e_cast.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/lib/libcrypto/evp/e_cast.c') diff --git a/src/lib/libcrypto/evp/e_cast.c b/src/lib/libcrypto/evp/e_cast.c index a0e52dfdf4..5c3e504835 100644 --- a/src/lib/libcrypto/evp/e_cast.c +++ b/src/lib/libcrypto/evp/e_cast.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_cast.c,v 1.16 2023/07/07 19:37:53 beck Exp $ */ +/* $OpenBSD: e_cast.c,v 1.17 2024/01/04 17:38:36 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -170,7 +170,6 @@ static const EVP_CIPHER cast5_cbc = { .set_asn1_parameters = EVP_CIPHER_set_asn1_iv, .get_asn1_parameters = EVP_CIPHER_get_asn1_iv, .ctrl = NULL, - .app_data = NULL, }; const EVP_CIPHER * @@ -192,7 +191,6 @@ static const EVP_CIPHER cast5_cfb64 = { .set_asn1_parameters = EVP_CIPHER_set_asn1_iv, .get_asn1_parameters = EVP_CIPHER_get_asn1_iv, .ctrl = NULL, - .app_data = NULL, }; const EVP_CIPHER * @@ -214,7 +212,6 @@ static const EVP_CIPHER cast5_ofb = { .set_asn1_parameters = EVP_CIPHER_set_asn1_iv, .get_asn1_parameters = EVP_CIPHER_get_asn1_iv, .ctrl = NULL, - .app_data = NULL, }; const EVP_CIPHER * @@ -236,7 +233,6 @@ static const EVP_CIPHER cast5_ecb = { .set_asn1_parameters = EVP_CIPHER_set_asn1_iv, .get_asn1_parameters = EVP_CIPHER_get_asn1_iv, .ctrl = NULL, - .app_data = NULL, }; const EVP_CIPHER * -- cgit v1.2.3-55-g6feb