diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c | 8 | ||||
| -rw-r--r-- | src/lib/libcrypto/evp/e_rc4_hmac_md5.c | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c b/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c index 3f82cf5967..f25b927aeb 100644 --- a/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c +++ b/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: e_aes_cbc_hmac_sha1.c,v 1.13 2016/11/04 17:30:30 miod Exp $ */ | 1 | /* $OpenBSD: e_aes_cbc_hmac_sha1.c,v 1.14 2016/11/05 10:47:57 miod Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 2011-2013 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2011-2013 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -62,12 +62,6 @@ | |||
| 62 | #include "evp_locl.h" | 62 | #include "evp_locl.h" |
| 63 | #include "constant_time_locl.h" | 63 | #include "constant_time_locl.h" |
| 64 | 64 | ||
| 65 | #ifndef EVP_CIPH_FLAG_AEAD_CIPHER | ||
| 66 | #define EVP_CIPH_FLAG_AEAD_CIPHER 0x200000 | ||
| 67 | #define EVP_CTRL_AEAD_TLS1_AAD 0x16 | ||
| 68 | #define EVP_CTRL_AEAD_SET_MAC_KEY 0x17 | ||
| 69 | #endif | ||
| 70 | |||
| 71 | #define TLS1_1_VERSION 0x0302 | 65 | #define TLS1_1_VERSION 0x0302 |
| 72 | 66 | ||
| 73 | typedef struct { | 67 | typedef struct { |
diff --git a/src/lib/libcrypto/evp/e_rc4_hmac_md5.c b/src/lib/libcrypto/evp/e_rc4_hmac_md5.c index 39527cafe6..a1fc0066e6 100644 --- a/src/lib/libcrypto/evp/e_rc4_hmac_md5.c +++ b/src/lib/libcrypto/evp/e_rc4_hmac_md5.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: e_rc4_hmac_md5.c,v 1.6 2016/11/04 17:30:30 miod Exp $ */ | 1 | /* $OpenBSD: e_rc4_hmac_md5.c,v 1.7 2016/11/05 10:47:57 miod Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 2011 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2011 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -60,12 +60,6 @@ | |||
| 60 | #include <openssl/rc4.h> | 60 | #include <openssl/rc4.h> |
| 61 | #include <openssl/md5.h> | 61 | #include <openssl/md5.h> |
| 62 | 62 | ||
| 63 | #ifndef EVP_CIPH_FLAG_AEAD_CIPHER | ||
| 64 | #define EVP_CIPH_FLAG_AEAD_CIPHER 0x200000 | ||
| 65 | #define EVP_CTRL_AEAD_TLS1_AAD 0x16 | ||
| 66 | #define EVP_CTRL_AEAD_SET_MAC_KEY 0x17 | ||
| 67 | #endif | ||
| 68 | |||
| 69 | /* FIXME: surely this is available elsewhere? */ | 63 | /* FIXME: surely this is available elsewhere? */ |
| 70 | #define EVP_RC4_KEY_SIZE 16 | 64 | #define EVP_RC4_KEY_SIZE 16 |
| 71 | 65 | ||
