diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libssl/src/crypto/evp/evp.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/libssl/src/crypto/evp/evp.h b/src/lib/libssl/src/crypto/evp/evp.h index dd4d2245e6..6de762a4ff 100644 --- a/src/lib/libssl/src/crypto/evp/evp.h +++ b/src/lib/libssl/src/crypto/evp/evp.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: evp.h,v 1.42 2015/02/08 22:22:13 miod Exp $ */ | 1 | /* $OpenBSD: evp.h,v 1.43 2015/02/10 09:52:35 miod Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1353,13 +1353,19 @@ void ERR_load_EVP_strings(void); | |||
1353 | #define EVP_F_EVP_AEAD_CTX_INIT 180 | 1353 | #define EVP_F_EVP_AEAD_CTX_INIT 180 |
1354 | #define EVP_F_EVP_AEAD_CTX_OPEN 190 | 1354 | #define EVP_F_EVP_AEAD_CTX_OPEN 190 |
1355 | #define EVP_F_EVP_AEAD_CTX_SEAL 191 | 1355 | #define EVP_F_EVP_AEAD_CTX_SEAL 191 |
1356 | #define EVP_F_EVP_BYTESTOKEY 200 | ||
1356 | #define EVP_F_EVP_CIPHERINIT_EX 123 | 1357 | #define EVP_F_EVP_CIPHERINIT_EX 123 |
1357 | #define EVP_F_EVP_CIPHER_CTX_COPY 163 | 1358 | #define EVP_F_EVP_CIPHER_CTX_COPY 163 |
1358 | #define EVP_F_EVP_CIPHER_CTX_CTRL 124 | 1359 | #define EVP_F_EVP_CIPHER_CTX_CTRL 124 |
1359 | #define EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH 122 | 1360 | #define EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH 122 |
1361 | #define EVP_F_EVP_CIPHER_GET_ASN1_IV 201 | ||
1362 | #define EVP_F_EVP_CIPHER_SET_ASN1_IV 202 | ||
1360 | #define EVP_F_EVP_DECRYPTFINAL_EX 101 | 1363 | #define EVP_F_EVP_DECRYPTFINAL_EX 101 |
1364 | #define EVP_F_EVP_DECRYPTUPDATE 199 | ||
1365 | #define EVP_F_EVP_DIGESTFINAL_EX 196 | ||
1361 | #define EVP_F_EVP_DIGESTINIT_EX 128 | 1366 | #define EVP_F_EVP_DIGESTINIT_EX 128 |
1362 | #define EVP_F_EVP_ENCRYPTFINAL_EX 127 | 1367 | #define EVP_F_EVP_ENCRYPTFINAL_EX 127 |
1368 | #define EVP_F_EVP_ENCRYPTUPDATE 198 | ||
1363 | #define EVP_F_EVP_MD_CTX_COPY_EX 110 | 1369 | #define EVP_F_EVP_MD_CTX_COPY_EX 110 |
1364 | #define EVP_F_EVP_MD_CTX_CTRL 195 | 1370 | #define EVP_F_EVP_MD_CTX_CTRL 195 |
1365 | #define EVP_F_EVP_MD_SIZE 162 | 1371 | #define EVP_F_EVP_MD_SIZE 162 |
@@ -1415,6 +1421,7 @@ void ERR_load_EVP_strings(void); | |||
1415 | #define EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN 164 | 1421 | #define EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN 164 |
1416 | #define EVP_F_PKCS8_SET_BROKEN 112 | 1422 | #define EVP_F_PKCS8_SET_BROKEN 112 |
1417 | #define EVP_F_PKEY_SET_TYPE 158 | 1423 | #define EVP_F_PKEY_SET_TYPE 158 |
1424 | #define EVP_F_RC2_GET_ASN1_TYPE_AND_IV 197 | ||
1418 | #define EVP_F_RC2_MAGIC_TO_METH 109 | 1425 | #define EVP_F_RC2_MAGIC_TO_METH 109 |
1419 | #define EVP_F_RC5_CTRL 125 | 1426 | #define EVP_F_RC5_CTRL 125 |
1420 | 1427 | ||