From: Juergen Christ Date: Tue, 26 Jan 2021 16:06:54 +0000 (+0100) Subject: Remove superfluous EVP_KDF_CTRL_ defines. X-Git-Tag: openssl-3.0.0-alpha12~178 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d744934b756bc71344818a2cb60b13dd89954afb;p=thirdparty%2Fopenssl.git Remove superfluous EVP_KDF_CTRL_ defines. These defines were never used and not needed. Signed-off-by: Juergen Christ Reviewed-by: Richard Levitte Reviewed-by: Tomas Mraz Reviewed-by: Patrick Steuer (Merged from https://github.com/openssl/openssl/pull/13781) --- diff --git a/include/openssl/kdf.h b/include/openssl/kdf.h index dd485bcb016..f5a1dab62e6 100644 --- a/include/openssl/kdf.h +++ b/include/openssl/kdf.h @@ -56,31 +56,6 @@ void EVP_KDF_names_do_all(const EVP_KDF *kdf, void (*fn)(const char *name, void *data), void *data); -# define EVP_KDF_CTRL_SET_PASS 0x01 /* unsigned char *, size_t */ -# define EVP_KDF_CTRL_SET_SALT 0x02 /* unsigned char *, size_t */ -# define EVP_KDF_CTRL_SET_ITER 0x03 /* int */ -# define EVP_KDF_CTRL_SET_MD 0x04 /* EVP_MD * */ -# define EVP_KDF_CTRL_SET_KEY 0x05 /* unsigned char *, size_t */ -# define EVP_KDF_CTRL_SET_MAXMEM_BYTES 0x06 /* uint64_t */ -# define EVP_KDF_CTRL_SET_TLS_SECRET 0x07 /* unsigned char *, size_t */ -# define EVP_KDF_CTRL_ADD_TLS_SEED 0x08 /* unsigned char *, size_t */ -# define EVP_KDF_CTRL_RESET_HKDF_INFO 0x09 -# define EVP_KDF_CTRL_ADD_HKDF_INFO 0x0a /* unsigned char *, size_t */ -# define EVP_KDF_CTRL_SET_HKDF_MODE 0x0b /* int */ -# define EVP_KDF_CTRL_SET_SCRYPT_N 0x0c /* uint64_t */ -# define EVP_KDF_CTRL_SET_SCRYPT_R 0x0d /* uint32_t */ -# define EVP_KDF_CTRL_SET_SCRYPT_P 0x0e /* uint32_t */ -# define EVP_KDF_CTRL_SET_SSHKDF_XCGHASH 0x0f /* unsigned char *, size_t */ -# define EVP_KDF_CTRL_SET_SSHKDF_SESSION_ID 0x10 /* unsigned char *, size_t */ -# define EVP_KDF_CTRL_SET_SSHKDF_TYPE 0x11 /* int */ -# define EVP_KDF_CTRL_SET_MAC 0x12 /* EVP_MAC * */ -# define EVP_KDF_CTRL_SET_MAC_SIZE 0x13 /* size_t */ -# define EVP_KDF_CTRL_SET_SSKDF_INFO 0x14 /* unsigned char *, size_t */ -# define EVP_KDF_CTRL_SET_PBKDF2_PKCS5_MODE 0x15 /* int */ -# define EVP_KDF_CTRL_SET_UKM 0x16 /* unsigned char *, size_t */ -# define EVP_KDF_CTRL_SET_CEK_ALG 0x17 /* char * */ -# define EVP_KDF_CTRL_SET_SHARED_INFO EVP_KDF_CTRL_SET_SSKDF_INFO - # define EVP_KDF_HKDF_MODE_EXTRACT_AND_EXPAND 0 # define EVP_KDF_HKDF_MODE_EXTRACT_ONLY 1 # define EVP_KDF_HKDF_MODE_EXPAND_ONLY 2