projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
45fcfcb
)
Sync error codes with 1.0.1-stable.
author
Dr. Stephen Henson
<steve@openssl.org>
Sat, 17 Sep 2011 00:17:46 +0000
(
00:17
+0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Sat, 17 Sep 2011 00:17:46 +0000
(
00:17
+0000)
crypto/evp/evp.h
patch
|
blob
|
history
diff --git
a/crypto/evp/evp.h
b/crypto/evp/evp.h
index 6757a3d620d5d46f68023e3364f445c111d61fc0..2557ad3ab707c42fa8bb62aa38fda26b9b1df78d 100644
(file)
--- a/
crypto/evp/evp.h
+++ b/
crypto/evp/evp.h
@@
-1280,11
+1280,12
@@
void ERR_load_EVP_strings(void);
/* Function codes. */
#define EVP_F_AESNI_INIT_KEY 165
/* Function codes. */
#define EVP_F_AESNI_INIT_KEY 165
-#define EVP_F_AESNI_XTS_CIPHER 17
3
+#define EVP_F_AESNI_XTS_CIPHER 17
6
#define EVP_F_AES_INIT_KEY 133
#define EVP_F_AES_XTS 172
#define EVP_F_AES_INIT_KEY 133
#define EVP_F_AES_XTS 172
-#define EVP_F_AES_XTS_CIPHER 17
4
+#define EVP_F_AES_XTS_CIPHER 17
5
#define EVP_F_CAMELLIA_INIT_KEY 159
#define EVP_F_CAMELLIA_INIT_KEY 159
+#define EVP_F_CMAC_INIT 173
#define EVP_F_D2I_PKEY 100
#define EVP_F_DO_SIGVER_INIT 161
#define EVP_F_DSAPKEY2PKCS8 134
#define EVP_F_D2I_PKEY 100
#define EVP_F_DO_SIGVER_INIT 161
#define EVP_F_DSAPKEY2PKCS8 134
@@
-1345,6
+1346,7
@@
void ERR_load_EVP_strings(void);
#define EVP_F_FIPS_CIPHER_CTX_SET_KEY_LENGTH 171
#define EVP_F_FIPS_DIGESTINIT 168
#define EVP_F_FIPS_MD_CTX_COPY 169
#define EVP_F_FIPS_CIPHER_CTX_SET_KEY_LENGTH 171
#define EVP_F_FIPS_DIGESTINIT 168
#define EVP_F_FIPS_MD_CTX_COPY 169
+#define EVP_F_HMAC_INIT_EX 174
#define EVP_F_INT_CTX_NEW 157
#define EVP_F_PKCS5_PBE_KEYIVGEN 117
#define EVP_F_PKCS5_V2_PBE_KEYIVGEN 118
#define EVP_F_INT_CTX_NEW 157
#define EVP_F_PKCS5_PBE_KEYIVGEN 117
#define EVP_F_PKCS5_V2_PBE_KEYIVGEN 118