diff options
| author | Pauli <paul.dale@oracle.com> | 2018-11-05 07:30:37 +0300 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2018-11-06 00:04:36 +0300 |
| commit | 38cfa99122f5c34b25e1671639be4446d0fa2b15 (patch) | |
| tree | 939cf859df98b07b6ccb775d1c970093145a8a4f | |
| parent | 93689797a4f4c0ad040f83f264deecbda5df2031 (diff) | |
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 <levitte@openssl.org>
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/7566)
| -rw-r--r-- | include/openssl/evp.h | 6 |
1 files changed, 3 insertions, 3 deletions
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, |