diff options
| author |   jsing <jsing@openbsd.org> | 2014-06-13 11:52:03 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-06-13 11:52:03 +0000 |
| commit | 2b8e119025cfbe42397f47ae081135bb7d2ce422 (patch) | |
| tree | d182374e20f2fe60c107153990a2b7d4488cab62 /lib/libssl/src/ssl/ssl3.h | |
| parent | Add an SSL_AEAD_CTX to enable the use of EVP_AEAD with an SSL cipher. (diff) | |
| download | wireguard-openbsd-2b8e119025cfbe42397f47ae081135bb7d2ce422.tar.xz wireguard-openbsd-2b8e119025cfbe42397f47ae081135bb7d2ce422.zip | |
Add support for handling SSL_CIPHER_ALGORITHM2_AEAD ciphers, which are
those that use EVP_AEAD instead ov EVP_CIPHER. This means being able to
change cipher state with an EVP_AEAD and being able to encrypt/decrypt
TLS using the EVP_AEAD. This has no change on existing
non-SSL_CIPHER_ALGORITHM2_AEAD ciphers.
Based on Adam Langley's chromium patches.
Rides the recent libssl bump.
Tested by sthen@
Diffstat (limited to 'lib/libssl/src/ssl/ssl3.h')
| -rw-r--r-- | lib/libssl/src/ssl/ssl3.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libssl/src/ssl/ssl3.h b/lib/libssl/src/ssl/ssl3.h index 7fd00be2d32..235c359af28 100644 --- a/lib/libssl/src/ssl/ssl3.h +++ b/lib/libssl/src/ssl/ssl3.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl3.h,v 1.22 2014/06/13 04:29:13 miod Exp $ */ +/* $OpenBSD: ssl3.h,v 1.23 2014/06/13 11:52:03 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -488,6 +488,7 @@ typedef struct ssl3_state_st { unsigned char *key_block; const EVP_CIPHER *new_sym_enc; + const EVP_AEAD *new_aead; const EVP_MD *new_hash; int new_mac_pkey_type; int new_mac_secret_size; |