summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c
diff options
context:
space:
mode:
authormiod <>2016-11-05 10:47:57 +0000
committermiod <>2016-11-05 10:47:57 +0000
commit5aa2e085e19005aca2c0e2c6db7a36a00bda9f11 (patch)
treedc28c6350d7fef8fdfe042d24642e558d6562318 /src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c
parent28d717bf56d50dbe9a57929a435ffcb93b8dd6ed (diff)
downloadopenbsd-5aa2e085e19005aca2c0e2c6db7a36a00bda9f11.tar.gz
openbsd-5aa2e085e19005aca2c0e2c6db7a36a00bda9f11.tar.bz2
openbsd-5aa2e085e19005aca2c0e2c6db7a36a00bda9f11.zip
No need to duplicate definitions from evp.h locally.
ok bock@ jsing@
Diffstat (limited to 'src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c')
-rw-r--r--src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c8
1 files changed, 1 insertions, 7 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
73typedef struct { 67typedef struct {