Commit 0f5163bd authored by Richard Levitte's avatar Richard Levitte
Browse files

Fix number clash: EVP_F_AESNI_XTS_INIT_KEY vs EVP_F_EVP_MD_BLOCK_SIZE 



The three macros EVP_F_AESNI_XTS_INIT_KEY, EVP_F_AES_T4_XTS_INIT_KEY
and EVP_F_AES_XTS_INIT_KEY are affected.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8682)
parent 3538b0f7

crypto/err/openssl.txt

+3 −3
Original line number Diff line number Diff line
@@ -754,16 +754,16 @@ ESS_F_ESS_SIGNING_CERT_NEW_INIT:102:ESS_SIGNING_CERT_new_init 
ESS_F_ESS_SIGNING_CERT_V2_ADD:105:ESS_SIGNING_CERT_V2_add

ESS_F_ESS_SIGNING_CERT_V2_NEW_INIT:103:ESS_SIGNING_CERT_V2_new_init

EVP_F_AESNI_INIT_KEY:165:aesni_init_key

EVP_F_AESNI_XTS_INIT_KEY:232:aesni_xts_init_key

EVP_F_AESNI_XTS_INIT_KEY:233:aesni_xts_init_key

EVP_F_AES_GCM_CTRL:196:aes_gcm_ctrl

EVP_F_AES_GCM_TLS_CIPHER:207:aes_gcm_tls_cipher

EVP_F_AES_INIT_KEY:133:aes_init_key

EVP_F_AES_OCB_CIPHER:169:aes_ocb_cipher

EVP_F_AES_T4_INIT_KEY:178:aes_t4_init_key

EVP_F_AES_T4_XTS_INIT_KEY:233:aes_t4_xts_init_key

EVP_F_AES_T4_XTS_INIT_KEY:234:aes_t4_xts_init_key

EVP_F_AES_WRAP_CIPHER:170:aes_wrap_cipher

EVP_F_AES_XTS_CIPHER:229:aes_xts_cipher

EVP_F_AES_XTS_INIT_KEY:234:aes_xts_init_key

EVP_F_AES_XTS_INIT_KEY:235:aes_xts_init_key

EVP_F_ALG_MODULE_INIT:177:alg_module_init

EVP_F_ARIA_CCM_INIT_KEY:175:aria_ccm_init_key

EVP_F_ARIA_GCM_CTRL:197:aria_gcm_ctrl

include/openssl/evperr.h

+3 −3
Original line number Diff line number Diff line
@@ -24,16 +24,16 @@ int ERR_load_EVP_strings(void); 
 * EVP function codes.

 */

# define EVP_F_AESNI_INIT_KEY                             165

# define EVP_F_AESNI_XTS_INIT_KEY                         232

# define EVP_F_AESNI_XTS_INIT_KEY                         233

# define EVP_F_AES_GCM_CTRL                               196

# define EVP_F_AES_GCM_TLS_CIPHER                         207

# define EVP_F_AES_INIT_KEY                               133

# define EVP_F_AES_OCB_CIPHER                             169

# define EVP_F_AES_T4_INIT_KEY                            178

# define EVP_F_AES_T4_XTS_INIT_KEY                        233

# define EVP_F_AES_T4_XTS_INIT_KEY                        234

# define EVP_F_AES_WRAP_CIPHER                            170

# define EVP_F_AES_XTS_CIPHER                             229

# define EVP_F_AES_XTS_INIT_KEY                           234

# define EVP_F_AES_XTS_INIT_KEY                           235

# define EVP_F_ALG_MODULE_INIT                            177

# define EVP_F_ARIA_CCM_INIT_KEY                          175

# define EVP_F_ARIA_GCM_CTRL                              197