summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp/e_rc2.c
diff options
context:
space:
mode:
authortb <>2024-01-04 17:38:36 +0000
committertb <>2024-01-04 17:38:36 +0000
commitf2a7290c2bb7399b90fac477d310553dc6fdf435 (patch)
tree0099e9b3077e473a202c464efd1bf63a3d98814a /src/lib/libcrypto/evp/e_rc2.c
parent258a2014e5e6da7d7bc8516cdeb2ebb5a5c9d042 (diff)
downloadopenbsd-f2a7290c2bb7399b90fac477d310553dc6fdf435.tar.gz
openbsd-f2a7290c2bb7399b90fac477d310553dc6fdf435.tar.bz2
openbsd-f2a7290c2bb7399b90fac477d310553dc6fdf435.zip
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
Diffstat (limited to 'src/lib/libcrypto/evp/e_rc2.c')
-rw-r--r--src/lib/libcrypto/evp/e_rc2.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/lib/libcrypto/evp/e_rc2.c b/src/lib/libcrypto/evp/e_rc2.c
index d859ad2a15..6f8c051cff 100644
--- a/src/lib/libcrypto/evp/e_rc2.c
+++ b/src/lib/libcrypto/evp/e_rc2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_rc2.c,v 1.25 2023/12/02 19:06:22 tb Exp $ */ 1/* $OpenBSD: e_rc2.c,v 1.26 2024/01/04 17:38:36 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 *
@@ -172,7 +172,6 @@ static const EVP_CIPHER rc2_cbc = {
172 .set_asn1_parameters = rc2_set_asn1_type_and_iv, 172 .set_asn1_parameters = rc2_set_asn1_type_and_iv,
173 .get_asn1_parameters = rc2_get_asn1_type_and_iv, 173 .get_asn1_parameters = rc2_get_asn1_type_and_iv,
174 .ctrl = rc2_ctrl, 174 .ctrl = rc2_ctrl,
175 .app_data = NULL,
176}; 175};
177 176
178const EVP_CIPHER * 177const EVP_CIPHER *
@@ -194,7 +193,6 @@ static const EVP_CIPHER rc2_cfb64 = {
194 .set_asn1_parameters = rc2_set_asn1_type_and_iv, 193 .set_asn1_parameters = rc2_set_asn1_type_and_iv,
195 .get_asn1_parameters = rc2_get_asn1_type_and_iv, 194 .get_asn1_parameters = rc2_get_asn1_type_and_iv,
196 .ctrl = rc2_ctrl, 195 .ctrl = rc2_ctrl,
197 .app_data = NULL,
198}; 196};
199 197
200const EVP_CIPHER * 198const EVP_CIPHER *
@@ -216,7 +214,6 @@ static const EVP_CIPHER rc2_ofb = {
216 .set_asn1_parameters = rc2_set_asn1_type_and_iv, 214 .set_asn1_parameters = rc2_set_asn1_type_and_iv,
217 .get_asn1_parameters = rc2_get_asn1_type_and_iv, 215 .get_asn1_parameters = rc2_get_asn1_type_and_iv,
218 .ctrl = rc2_ctrl, 216 .ctrl = rc2_ctrl,
219 .app_data = NULL,
220}; 217};
221 218
222const EVP_CIPHER * 219const EVP_CIPHER *
@@ -238,7 +235,6 @@ static const EVP_CIPHER rc2_ecb = {
238 .set_asn1_parameters = rc2_set_asn1_type_and_iv, 235 .set_asn1_parameters = rc2_set_asn1_type_and_iv,
239 .get_asn1_parameters = rc2_get_asn1_type_and_iv, 236 .get_asn1_parameters = rc2_get_asn1_type_and_iv,
240 .ctrl = rc2_ctrl, 237 .ctrl = rc2_ctrl,
241 .app_data = NULL,
242}; 238};
243 239
244const EVP_CIPHER * 240const EVP_CIPHER *
@@ -262,7 +258,6 @@ static const EVP_CIPHER r2_64_cbc_cipher = {
262 rc2_set_asn1_type_and_iv, 258 rc2_set_asn1_type_and_iv,
263 rc2_get_asn1_type_and_iv, 259 rc2_get_asn1_type_and_iv,
264 rc2_ctrl, 260 rc2_ctrl,
265 NULL
266}; 261};
267 262
268static const EVP_CIPHER r2_40_cbc_cipher = { 263static const EVP_CIPHER r2_40_cbc_cipher = {
@@ -276,7 +271,6 @@ static const EVP_CIPHER r2_40_cbc_cipher = {
276 rc2_set_asn1_type_and_iv, 271 rc2_set_asn1_type_and_iv,
277 rc2_get_asn1_type_and_iv, 272 rc2_get_asn1_type_and_iv,
278 rc2_ctrl, 273 rc2_ctrl,
279 NULL
280}; 274};
281 275
282const EVP_CIPHER * 276const EVP_CIPHER *