summaryrefslogtreecommitdiffstats
path: root/crypto/evp
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>2011-09-05 09:44:54 +0000
committerBodo Möller <bodo@openssl.org>2011-09-05 09:44:54 +0000
commitedf6b025b11919492af4e34cefbd78b26ece4c1c (patch)
tree619acaa4828df3bdb894a09fb98abee8a92ce323 /crypto/evp
parentd799df36b3477805237b0f1bdb66bc9aecdd506b (diff)
make update
Diffstat (limited to 'crypto/evp')
-rw-r--r--crypto/evp/evp.h1
-rw-r--r--crypto/evp/evp_err.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 1fd95dd125..828af5fb5c 100644
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -1255,6 +1255,7 @@ void ERR_load_EVP_strings(void);
#define EVP_F_AESNI_INIT_KEY 165
#define EVP_F_AES_INIT_KEY 133
#define EVP_F_AES_XTS 172
+#define EVP_F_AES_XTS_CIPHER 175
#define EVP_F_CAMELLIA_INIT_KEY 159
#define EVP_F_CMAC_INIT 173
#define EVP_F_D2I_PKEY 100
diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c
index e27d56f936..e3c7752968 100644
--- a/crypto/evp/evp_err.c
+++ b/crypto/evp/evp_err.c
@@ -73,6 +73,7 @@ static ERR_STRING_DATA EVP_str_functs[]=
{ERR_FUNC(EVP_F_AESNI_INIT_KEY), "AESNI_INIT_KEY"},
{ERR_FUNC(EVP_F_AES_INIT_KEY), "AES_INIT_KEY"},
{ERR_FUNC(EVP_F_AES_XTS), "AES_XTS"},
+{ERR_FUNC(EVP_F_AES_XTS_CIPHER), "AES_XTS_CIPHER"},
{ERR_FUNC(EVP_F_CAMELLIA_INIT_KEY), "CAMELLIA_INIT_KEY"},
{ERR_FUNC(EVP_F_CMAC_INIT), "CMAC_INIT"},
{ERR_FUNC(EVP_F_D2I_PKEY), "D2I_PKEY"},