From e7fb7b2ca65897bb75773e32acee48b352309c53 Mon Sep 17 00:00:00 2001 From: miod <> Date: Sat, 5 Nov 2016 10:47:57 +0000 Subject: No need to duplicate definitions from evp.h locally. ok bock@ jsing@ --- src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c | 8 +------- src/lib/libcrypto/evp/e_rc4_hmac_md5.c | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) (limited to 'src/lib') 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 @@ -/* $OpenBSD: e_aes_cbc_hmac_sha1.c,v 1.13 2016/11/04 17:30:30 miod Exp $ */ +/* $OpenBSD: e_aes_cbc_hmac_sha1.c,v 1.14 2016/11/05 10:47:57 miod Exp $ */ /* ==================================================================== * Copyright (c) 2011-2013 The OpenSSL Project. All rights reserved. * @@ -62,12 +62,6 @@ #include "evp_locl.h" #include "constant_time_locl.h" -#ifndef EVP_CIPH_FLAG_AEAD_CIPHER -#define EVP_CIPH_FLAG_AEAD_CIPHER 0x200000 -#define EVP_CTRL_AEAD_TLS1_AAD 0x16 -#define EVP_CTRL_AEAD_SET_MAC_KEY 0x17 -#endif - #define TLS1_1_VERSION 0x0302 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 @@ -/* $OpenBSD: e_rc4_hmac_md5.c,v 1.6 2016/11/04 17:30:30 miod Exp $ */ +/* $OpenBSD: e_rc4_hmac_md5.c,v 1.7 2016/11/05 10:47:57 miod Exp $ */ /* ==================================================================== * Copyright (c) 2011 The OpenSSL Project. All rights reserved. * @@ -60,12 +60,6 @@ #include #include -#ifndef EVP_CIPH_FLAG_AEAD_CIPHER -#define EVP_CIPH_FLAG_AEAD_CIPHER 0x200000 -#define EVP_CTRL_AEAD_TLS1_AAD 0x16 -#define EVP_CTRL_AEAD_SET_MAC_KEY 0x17 -#endif - /* FIXME: surely this is available elsewhere? */ #define EVP_RC4_KEY_SIZE 16 -- cgit v1.2.3-55-g6feb