From: Bodo Möller <bodo@openssl.org>
Date: Mon, 5 Sep 2011 09:44:54 +0000 (+0000)
Subject: make update
X-Git-Tag: OpenSSL_1_0_1-beta1~161
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=edf6b025b11919492af4e34cefbd78b26ece4c1c;p=oweals%2Fopenssl.git

make update
---

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"},
diff --git a/crypto/objects/obj_xref.h b/crypto/objects/obj_xref.h
index d5b9b8e198..7836f01d95 100644
--- a/crypto/objects/obj_xref.h
+++ b/crypto/objects/obj_xref.h
@@ -1,4 +1,4 @@
-/* AUTOGENERATED BY objxref.pl, DO NOT EDIT */
+/* AUTOGENERATED BY crypto/objects/objxref.pl, DO NOT EDIT */
 
 typedef struct
 	{