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/ssl.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/ssl.h')
| -rw-r--r-- | lib/libssl/ssl.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h index 826d7c1696e..1a2bdf76285 100644 --- a/lib/libssl/ssl.h +++ b/lib/libssl/ssl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl.h,v 1.54 2014/06/13 10:52:24 jsing Exp $ */ +/* $OpenBSD: ssl.h,v 1.55 2014/06/13 11:52:03 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -2081,9 +2081,11 @@ void ERR_load_SSL_strings(void); #define SSL_F_SSL_USE_RSAPRIVATEKEY_FILE 206 #define SSL_F_SSL_VERIFY_CERT_CHAIN 207 #define SSL_F_SSL_WRITE 208 +#define SSL_F_TLS1_AEAD_CTX_INIT 339 #define SSL_F_TLS1_CERT_VERIFY_MAC 286 -#define SSL_F_TLS1_CHANGE_CIPHER_STATE_CIPHER 338 #define SSL_F_TLS1_CHANGE_CIPHER_STATE 209 +#define SSL_F_TLS1_CHANGE_CIPHER_STATE_AEAD 340 +#define SSL_F_TLS1_CHANGE_CIPHER_STATE_CIPHER 338 #define SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT 274 #define SSL_F_TLS1_ENC 210 #define SSL_F_TLS1_EXPORT_KEYING_MATERIAL 314 |