From: Pauli Date: Mon, 5 Nov 2018 04:30:37 +0000 (+1000) Subject: EVP_MAC ctrl numbering duplicate removal. X-Git-Tag: openssl-3.0.0-alpha1~2943 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=38cfa99122f5c34b25e1671639be4446d0fa2b15;p=oweals%2Fopenssl.git EVP_MAC ctrl numbering duplicate removal. Both EVP_MAC_CTRL_SET_MD and EVP_MAC_CTRL_SET_CIPHER were numbered 4. This would preclude any future MAC from using both. Reviewed-by: Richard Levitte Reviewed-by: Paul Yang (Merged from https://github.com/openssl/openssl/pull/7566) --- diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 6661e2ed29..e803fa81e7 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -1024,9 +1024,9 @@ void EVP_MAC_do_all_sorted(void (*fn) # define EVP_MAC_CTRL_SET_FLAGS 0x02 /* unsigned long */ # define EVP_MAC_CTRL_SET_ENGINE 0x03 /* ENGINE * */ # define EVP_MAC_CTRL_SET_MD 0x04 /* EVP_MD * */ -# define EVP_MAC_CTRL_SET_CIPHER 0x04 /* EVP_CIPHER * */ -# define EVP_MAC_CTRL_SET_SIZE 0x05 /* size_t */ -# define EVP_MAC_CTRL_SET_IV 0x06 /* unsigned char *, size_t */ +# define EVP_MAC_CTRL_SET_CIPHER 0x05 /* EVP_CIPHER * */ +# define EVP_MAC_CTRL_SET_SIZE 0x06 /* size_t */ +# define EVP_MAC_CTRL_SET_IV 0x07 /* unsigned char *, size_t */ /* PKEY stuff */ int EVP_PKEY_decrypt_old(unsigned char *dec_key,