1 files changed, 1 insertions, 19 deletions

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 *