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

15 files changed, 15 insertions, 84 deletions

diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c
index eb7f520282..6ef3fb37c0 100644
--- a/src/lib/libcrypto/evp/e_aes.c
+++ b/src/lib/libcrypto/evp/e_aes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_aes.c,v 1.55 2023/11/18 09:37:15 tb Exp $ */
+/* $OpenBSD: e_aes.c,v 1.56 2024/01/04 17:38:36 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 2001-2011 The OpenSSL Project.  All rights reserved.
  *
@@ -2550,7 +2550,6 @@ static const EVP_CIPHER aes_128_wrap = {
         .set_asn1_parameters = NULL,
         .get_asn1_parameters = NULL,
         .ctrl = aes_wrap_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -2572,7 +2571,6 @@ static const EVP_CIPHER aes_192_wrap = {
         .set_asn1_parameters = NULL,
         .get_asn1_parameters = NULL,
         .ctrl = aes_wrap_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -2594,7 +2592,6 @@ static const EVP_CIPHER aes_256_wrap = {
         .set_asn1_parameters = NULL,
         .get_asn1_parameters = NULL,
         .ctrl = aes_wrap_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
diff --git a/src/lib/libcrypto/evp/e_bf.c b/src/lib/libcrypto/evp/e_bf.c
index 9146a531e4..90a589c608 100644
--- a/src/lib/libcrypto/evp/e_bf.c
+++ b/src/lib/libcrypto/evp/e_bf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_bf.c,v 1.17 2023/07/07 19:37:53 beck Exp $ */
+/* $OpenBSD: e_bf.c,v 1.18 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 bf_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 bf_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 bf_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 bf_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 *
diff --git a/src/lib/libcrypto/evp/e_camellia.c b/src/lib/libcrypto/evp/e_camellia.c
index cec7649e3f..6d9bedbbcd 100644
--- a/src/lib/libcrypto/evp/e_camellia.c
+++ b/src/lib/libcrypto/evp/e_camellia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_camellia.c,v 1.18 2023/07/07 19:37:53 beck Exp $ */
+/* $OpenBSD: e_camellia.c,v 1.19 2024/01/04 17:38:36 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
  *
@@ -171,7 +171,6 @@ static const EVP_CIPHER camellia_128_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 *
@@ -193,7 +192,6 @@ static const EVP_CIPHER camellia_128_cfb128 = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = NULL,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -215,7 +213,6 @@ static const EVP_CIPHER camellia_128_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 *
@@ -237,7 +234,6 @@ static const EVP_CIPHER camellia_128_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 *
@@ -329,7 +325,6 @@ static const EVP_CIPHER camellia_192_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 *
@@ -351,7 +346,6 @@ static const EVP_CIPHER camellia_192_cfb128 = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = NULL,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -373,7 +367,6 @@ static const EVP_CIPHER camellia_192_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 *
@@ -395,7 +388,6 @@ static const EVP_CIPHER camellia_192_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 *
@@ -487,7 +479,6 @@ static const EVP_CIPHER camellia_256_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 *
@@ -509,7 +500,6 @@ static const EVP_CIPHER camellia_256_cfb128 = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = NULL,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -531,7 +521,6 @@ static const EVP_CIPHER camellia_256_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 *
@@ -553,7 +542,6 @@ static const EVP_CIPHER camellia_256_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 *
@@ -597,7 +585,6 @@ static const EVP_CIPHER camellia_128_cfb1 = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = NULL,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -641,7 +628,6 @@ static const EVP_CIPHER camellia_192_cfb1 = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = NULL,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -685,7 +671,6 @@ static const EVP_CIPHER camellia_256_cfb1 = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = NULL,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -728,7 +713,6 @@ static const EVP_CIPHER camellia_128_cfb8 = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = NULL,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -770,7 +754,6 @@ static const EVP_CIPHER camellia_192_cfb8 = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = NULL,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -812,7 +795,6 @@ static const EVP_CIPHER camellia_256_cfb8 = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = NULL,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
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 *
diff --git a/src/lib/libcrypto/evp/e_des.c b/src/lib/libcrypto/evp/e_des.c
index 64d098ca14..7a0b24c1ab 100644
--- a/src/lib/libcrypto/evp/e_des.c
+++ b/src/lib/libcrypto/evp/e_des.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_des.c,v 1.22 2023/07/07 19:37:53 beck Exp $ */
+/* $OpenBSD: e_des.c,v 1.23 2024/01/04 17:38:36 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -234,7 +234,6 @@ static const EVP_CIPHER des_cbc = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = des_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -256,7 +255,6 @@ static const EVP_CIPHER des_cfb64 = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = des_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -278,7 +276,6 @@ static const EVP_CIPHER des_ofb = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = des_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -300,7 +297,6 @@ static const EVP_CIPHER des_ecb = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = des_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -322,7 +318,6 @@ static const EVP_CIPHER des_cfb1 = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = des_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -344,7 +339,6 @@ static const EVP_CIPHER des_cfb8 = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = des_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
diff --git a/src/lib/libcrypto/evp/e_des3.c b/src/lib/libcrypto/evp/e_des3.c
index 3e6c5234cb..f283be2912 100644
--- a/src/lib/libcrypto/evp/e_des3.c
+++ b/src/lib/libcrypto/evp/e_des3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_des3.c,v 1.28 2023/07/07 19:37:53 beck Exp $ */
+/* $OpenBSD: e_des3.c,v 1.29 2024/01/04 17:38:36 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -266,7 +266,6 @@ static const EVP_CIPHER des_ede_cbc = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = des3_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -288,7 +287,6 @@ static const EVP_CIPHER des_ede_cfb64 = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = des3_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -310,7 +308,6 @@ static const EVP_CIPHER des_ede_ofb = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = des3_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -332,7 +329,6 @@ static const EVP_CIPHER des_ede_ecb = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = des3_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -360,7 +356,6 @@ static const EVP_CIPHER des_ede3_cbc = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = des3_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -382,7 +377,6 @@ static const EVP_CIPHER des_ede3_cfb64 = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = des3_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -404,7 +398,6 @@ static const EVP_CIPHER des_ede3_ofb = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = des3_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -426,7 +419,6 @@ static const EVP_CIPHER des_ede3_ecb = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = des3_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -449,7 +441,6 @@ static const EVP_CIPHER des_ede3_cfb1 = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = des3_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -472,7 +463,6 @@ static const EVP_CIPHER des_ede3_cfb8 = {
         .set_asn1_parameters = EVP_CIPHER_set_asn1_iv,
         .get_asn1_parameters = EVP_CIPHER_get_asn1_iv,
         .ctrl = des3_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
diff --git a/src/lib/libcrypto/evp/e_gost2814789.c b/src/lib/libcrypto/evp/e_gost2814789.c
index 359cf5e4ca..48619d109d 100644
--- a/src/lib/libcrypto/evp/e_gost2814789.c
+++ b/src/lib/libcrypto/evp/e_gost2814789.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_gost2814789.c,v 1.13 2023/07/07 19:37:53 beck Exp $ */
+/* $OpenBSD: e_gost2814789.c,v 1.14 2024/01/04 17:38:36 tb Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -260,7 +260,6 @@ static const EVP_CIPHER gost2814789_ecb = {
         .set_asn1_parameters = gost2814789_set_asn1_params,
         .get_asn1_parameters = gost2814789_get_asn1_params,
         .ctrl = gost2814789_ctl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -282,7 +281,6 @@ static const EVP_CIPHER gost2814789_cfb64 = {
         .set_asn1_parameters = gost2814789_set_asn1_params,
         .get_asn1_parameters = gost2814789_get_asn1_params,
         .ctrl = gost2814789_ctl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -304,7 +302,6 @@ static const EVP_CIPHER gost2814789_cnt = {
         .set_asn1_parameters = gost2814789_set_asn1_params,
         .get_asn1_parameters = gost2814789_get_asn1_params,
         .ctrl = gost2814789_ctl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
diff --git a/src/lib/libcrypto/evp/e_idea.c b/src/lib/libcrypto/evp/e_idea.c
index b2129dc990..025a1f5087 100644
--- a/src/lib/libcrypto/evp/e_idea.c
+++ b/src/lib/libcrypto/evp/e_idea.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_idea.c,v 1.20 2023/07/07 19:37:53 beck Exp $ */
+/* $OpenBSD: e_idea.c,v 1.21 2024/01/04 17:38:36 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -189,7 +189,6 @@ static const EVP_CIPHER idea_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 *
@@ -211,7 +210,6 @@ static const EVP_CIPHER idea_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 *
@@ -233,7 +231,6 @@ static const EVP_CIPHER idea_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 *
@@ -255,7 +252,6 @@ static const EVP_CIPHER idea_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 *
diff --git a/src/lib/libcrypto/evp/e_null.c b/src/lib/libcrypto/evp/e_null.c
index f30c207ff6..d3364de1c5 100644
--- a/src/lib/libcrypto/evp/e_null.c
+++ b/src/lib/libcrypto/evp/e_null.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_null.c,v 1.18 2023/07/07 19:37:53 beck Exp $ */
+/* $OpenBSD: e_null.c,v 1.19 2024/01/04 17:38:36 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -80,7 +80,6 @@ static const EVP_CIPHER n_cipher = {
         NULL,
         NULL,
         NULL,
-        NULL
 };
 
 const EVP_CIPHER *
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 @@
-/* $OpenBSD: e_rc2.c,v 1.25 2023/12/02 19:06:22 tb Exp $ */
+/* $OpenBSD: e_rc2.c,v 1.26 2024/01/04 17:38:36 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -172,7 +172,6 @@ static const EVP_CIPHER rc2_cbc = {
         .set_asn1_parameters = rc2_set_asn1_type_and_iv,
         .get_asn1_parameters = rc2_get_asn1_type_and_iv,
         .ctrl = rc2_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -194,7 +193,6 @@ static const EVP_CIPHER rc2_cfb64 = {
         .set_asn1_parameters = rc2_set_asn1_type_and_iv,
         .get_asn1_parameters = rc2_get_asn1_type_and_iv,
         .ctrl = rc2_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -216,7 +214,6 @@ static const EVP_CIPHER rc2_ofb = {
         .set_asn1_parameters = rc2_set_asn1_type_and_iv,
         .get_asn1_parameters = rc2_get_asn1_type_and_iv,
         .ctrl = rc2_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -238,7 +235,6 @@ static const EVP_CIPHER rc2_ecb = {
         .set_asn1_parameters = rc2_set_asn1_type_and_iv,
         .get_asn1_parameters = rc2_get_asn1_type_and_iv,
         .ctrl = rc2_ctrl,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -262,7 +258,6 @@ static const EVP_CIPHER r2_64_cbc_cipher = {
         rc2_set_asn1_type_and_iv,
         rc2_get_asn1_type_and_iv,
         rc2_ctrl,
-        NULL
 };
 
 static const EVP_CIPHER r2_40_cbc_cipher = {
@@ -276,7 +271,6 @@ static const EVP_CIPHER r2_40_cbc_cipher = {
         rc2_set_asn1_type_and_iv,
         rc2_get_asn1_type_and_iv,
         rc2_ctrl,
-        NULL
 };
 
 const EVP_CIPHER *
diff --git a/src/lib/libcrypto/evp/e_rc4.c b/src/lib/libcrypto/evp/e_rc4.c
index 2503d37049..4588dfc719 100644
--- a/src/lib/libcrypto/evp/e_rc4.c
+++ b/src/lib/libcrypto/evp/e_rc4.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_rc4.c,v 1.17 2023/07/07 19:37:53 beck Exp $ */
+/* $OpenBSD: e_rc4.c,v 1.18 2024/01/04 17:38:36 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -93,7 +93,6 @@ static const EVP_CIPHER r4_cipher = {
         NULL,
         NULL,
         NULL,
-        NULL
 };
 
 static const EVP_CIPHER r4_40_cipher = {
@@ -107,7 +106,6 @@ static const EVP_CIPHER r4_40_cipher = {
         NULL,
         NULL,
         NULL,
-        NULL
 };
 
 const EVP_CIPHER *
diff --git a/src/lib/libcrypto/evp/e_rc4_hmac_md5.c b/src/lib/libcrypto/evp/e_rc4_hmac_md5.c
index bcf8daea60..a9301dcdc9 100644
--- a/src/lib/libcrypto/evp/e_rc4_hmac_md5.c
+++ b/src/lib/libcrypto/evp/e_rc4_hmac_md5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_rc4_hmac_md5.c,v 1.12 2023/07/07 19:37:53 beck Exp $ */
+/* $OpenBSD: e_rc4_hmac_md5.c,v 1.13 2024/01/04 17:38:36 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
  *
@@ -296,7 +296,6 @@ static EVP_CIPHER r4_hmac_md5_cipher = {
         NULL,
         NULL,
         rc4_hmac_md5_ctrl,
-        NULL
 };
 
 const EVP_CIPHER *
diff --git a/src/lib/libcrypto/evp/e_sm4.c b/src/lib/libcrypto/evp/e_sm4.c
index 9db45a87f6..85b4d3ca04 100644
--- a/src/lib/libcrypto/evp/e_sm4.c
+++ b/src/lib/libcrypto/evp/e_sm4.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: e_sm4.c,v 1.11 2024/01/02 19:54:43 tb Exp $   */
+/*      $OpenBSD: e_sm4.c,v 1.12 2024/01/04 17:38:36 tb Exp $   */
 /*
  * Copyright (c) 2017, 2019 Ribose Inc
  *
@@ -157,7 +157,6 @@ static const EVP_CIPHER sm4_cbc = {
         .set_asn1_parameters = NULL,
         .get_asn1_parameters = NULL,
         .ctrl = NULL,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -179,7 +178,6 @@ static const EVP_CIPHER sm4_cfb128 = {
         .set_asn1_parameters = NULL,
         .get_asn1_parameters = NULL,
         .ctrl = NULL,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -201,7 +199,6 @@ static const EVP_CIPHER sm4_ofb = {
         .set_asn1_parameters = NULL,
         .get_asn1_parameters = NULL,
         .ctrl = NULL,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -223,7 +220,6 @@ static const EVP_CIPHER sm4_ecb = {
         .set_asn1_parameters = NULL,
         .get_asn1_parameters = NULL,
         .ctrl = NULL,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
@@ -256,7 +252,6 @@ static const EVP_CIPHER sm4_ctr_mode = {
         .set_asn1_parameters = NULL,
         .get_asn1_parameters = NULL,
         .ctrl = NULL,
-        .app_data = NULL,
 };
 
 const EVP_CIPHER *
diff --git a/src/lib/libcrypto/evp/e_xcbc_d.c b/src/lib/libcrypto/evp/e_xcbc_d.c
index 32f9f2eaa8..5a3d535661 100644
--- a/src/lib/libcrypto/evp/e_xcbc_d.c
+++ b/src/lib/libcrypto/evp/e_xcbc_d.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_xcbc_d.c,v 1.15 2023/07/07 19:37:53 beck Exp $ */
+/* $OpenBSD: e_xcbc_d.c,v 1.16 2024/01/04 17:38:36 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -94,7 +94,6 @@ static const EVP_CIPHER d_xcbc_cipher = {
         EVP_CIPHER_set_asn1_iv,
         EVP_CIPHER_get_asn1_iv,
         NULL,
-        NULL
 };
 
 const EVP_CIPHER *
diff --git a/src/lib/libcrypto/evp/evp_local.h b/src/lib/libcrypto/evp/evp_local.h
index 52fa8e1e52..42839f39bd 100644
--- a/src/lib/libcrypto/evp/evp_local.h
+++ b/src/lib/libcrypto/evp/evp_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_local.h,v 1.12 2024/01/04 17:01:26 tb Exp $ */
+/* $OpenBSD: evp_local.h,v 1.13 2024/01/04 17:38:36 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -223,7 +223,6 @@ struct evp_cipher_st {
         int (*set_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *); /* Populate a ASN1_TYPE with parameters */
         int (*get_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *); /* Get parameters from a ASN1_TYPE */
         int (*ctrl)(EVP_CIPHER_CTX *, int type, int arg, void *ptr); /* Miscellaneous operations */
-        void *app_data;         /* Application data */
 } /* EVP_CIPHER */;
 
 struct evp_cipher_ctx_st {