diff options
| author | tb <> | 2025-05-27 03:58:12 +0000 |
|---|---|---|
| committer | tb <> | 2025-05-27 03:58:12 +0000 |
| commit | 68a52297dea2d50284c7a8a12b92d8f2c15421f3 (patch) | |
| tree | 2eb24b5e4c85e38c91f34fc3f821969bc557eadd /src/lib/libcrypto/evp/e_xcbc_d.c | |
| parent | d2463d70a3218b82a784e40274a5073b7e3a241b (diff) | |
| download | openbsd-68a52297dea2d50284c7a8a12b92d8f2c15421f3.tar.gz openbsd-68a52297dea2d50284c7a8a12b92d8f2c15421f3.tar.bz2 openbsd-68a52297dea2d50284c7a8a12b92d8f2c15421f3.zip | |
Make EVP_CIPHER_[gs]et_asn1_iv() local to evp_cipher
These formerly public functions have only ever been called from
EVP_CIPHER_asn1_to_param() and EVP_CPIHER_param_to_asn1(), either
directly if the EVP_CIPH_FLAG_DEFAULT_ASN1 flag is set, or indirectly
when set as the .[gs]et_asn1_parameters() method of the EVP_CIPHER.
This commit removes their use in .[gs]et_asn1_parameters() dating back
to long before the EVP_CIPH_FLAG_DEFAULT_ASN1 was introduced in 2010.
This way the only remaining consumer of .[gs]et_asn1_parameters() is RC2.
ok jsing
Diffstat (limited to 'src/lib/libcrypto/evp/e_xcbc_d.c')
| -rw-r--r-- | src/lib/libcrypto/evp/e_xcbc_d.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/evp/e_xcbc_d.c b/src/lib/libcrypto/evp/e_xcbc_d.c index 1e3bee0791..1c5e6c32b2 100644 --- a/src/lib/libcrypto/evp/e_xcbc_d.c +++ b/src/lib/libcrypto/evp/e_xcbc_d.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: e_xcbc_d.c,v 1.18 2024/04/09 13:52:41 beck Exp $ */ | 1 | /* $OpenBSD: e_xcbc_d.c,v 1.19 2025/05/27 03:58:12 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 | * |
| @@ -88,13 +88,13 @@ static const EVP_CIPHER d_xcbc_cipher = { | |||
| 88 | .block_size = 8, | 88 | .block_size = 8, |
| 89 | .key_len = 24, | 89 | .key_len = 24, |
| 90 | .iv_len = 8, | 90 | .iv_len = 8, |
| 91 | .flags = EVP_CIPH_CBC_MODE, | 91 | .flags = EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1, |
| 92 | .init = desx_cbc_init_key, | 92 | .init = desx_cbc_init_key, |
| 93 | .do_cipher = desx_cbc_cipher, | 93 | .do_cipher = desx_cbc_cipher, |
| 94 | .cleanup = NULL, | 94 | .cleanup = NULL, |
| 95 | .ctx_size = sizeof(DESX_CBC_KEY), | 95 | .ctx_size = sizeof(DESX_CBC_KEY), |
| 96 | .set_asn1_parameters = EVP_CIPHER_set_asn1_iv, | 96 | .set_asn1_parameters = NULL, |
| 97 | .get_asn1_parameters = EVP_CIPHER_get_asn1_iv, | 97 | .get_asn1_parameters = NULL, |
| 98 | .ctrl = NULL, | 98 | .ctrl = NULL, |
| 99 | }; | 99 | }; |
| 100 | 100 | ||
