The branch master has been updated
via 38cfa99122f5c34b25e1671639be4446d0fa2b15 (commit)
from 93689797a4f4c0ad040f83f264deecbda5df2031 (commit)
- Log -----------------------------------------------------------------
commit 38cfa99122f5c34b25e1671639be4446d0fa2b15
Author: Pauli <[email protected]>
Date: Mon Nov 5 14:30:37 2018 +1000
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 <[email protected]>
Reviewed-by: Paul Yang <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/7566)
-----------------------------------------------------------------------
Summary of changes:
include/openssl/evp.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 6661e2e..e803fa8 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,
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
