summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2024-03-02 10:21:12 +0000
committertb <>2024-03-02 10:21:12 +0000
commitc1a3226b7cdc1e03728f3a1e4a2ce04c16131718 (patch)
treece7ec8f0ede914e6274fb8b3f0d1ac3128cf3170
parentb4541fab5e606187b51e789c26e6065cfc57ded0 (diff)
downloadopenbsd-c1a3226b7cdc1e03728f3a1e4a2ce04c16131718.tar.gz
openbsd-c1a3226b7cdc1e03728f3a1e4a2ce04c16131718.tar.bz2
openbsd-c1a3226b7cdc1e03728f3a1e4a2ce04c16131718.zip
Garbage collect CUSTOM_KEY_LENGTH/SET_KEY_LENGTH
These are unused defines that used to add unwanted complications in EVP_CIPHER_CTX_set_key_lenght(). ok jsing
-rw-r--r--src/lib/libcrypto/evp/evp.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h
index 9e203b086d..f6123963e9 100644
--- a/src/lib/libcrypto/evp/evp.h
+++ b/src/lib/libcrypto/evp/evp.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp.h,v 1.131 2024/03/02 10:20:27 tb Exp $ */ 1/* $OpenBSD: evp.h,v 1.132 2024/03/02 10:21: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 *
@@ -210,8 +210,6 @@ extern "C" {
210#define EVP_CIPH_ALWAYS_CALL_INIT 0x20 210#define EVP_CIPH_ALWAYS_CALL_INIT 0x20
211/* Call ctrl() to init cipher parameters */ 211/* Call ctrl() to init cipher parameters */
212#define EVP_CIPH_CTRL_INIT 0x40 212#define EVP_CIPH_CTRL_INIT 0x40
213/* Don't use standard key length function */
214#define EVP_CIPH_CUSTOM_KEY_LENGTH 0x80
215/* Don't use standard block padding */ 213/* Don't use standard block padding */
216#define EVP_CIPH_NO_PADDING 0x100 214#define EVP_CIPH_NO_PADDING 0x100
217/* cipher handles random key generation */ 215/* cipher handles random key generation */
@@ -241,7 +239,6 @@ extern "C" {
241/* ctrl() values */ 239/* ctrl() values */
242 240
243#define EVP_CTRL_INIT 0x0 241#define EVP_CTRL_INIT 0x0
244#define EVP_CTRL_SET_KEY_LENGTH 0x1
245#define EVP_CTRL_GET_RC2_KEY_BITS 0x2 242#define EVP_CTRL_GET_RC2_KEY_BITS 0x2
246#define EVP_CTRL_SET_RC2_KEY_BITS 0x3 243#define EVP_CTRL_SET_RC2_KEY_BITS 0x3
247#define EVP_CTRL_GET_RC5_ROUNDS 0x4 244#define EVP_CTRL_GET_RC5_ROUNDS 0x4