diff options
author | jsing <> | 2014-06-13 11:52:03 +0000 |
---|---|---|
committer | jsing <> | 2014-06-13 11:52:03 +0000 |
commit | 180e6a8c04e46f1d6ee66dace2f5340c553c9d4c (patch) | |
tree | 429d2914dd3a540337d3b93bafbe6b0493e99de7 /src/lib/libssl/ssl3.h | |
parent | 87e30739835137951cf48dfa7f692aae2f40dc40 (diff) | |
download | openbsd-180e6a8c04e46f1d6ee66dace2f5340c553c9d4c.tar.gz openbsd-180e6a8c04e46f1d6ee66dace2f5340c553c9d4c.tar.bz2 openbsd-180e6a8c04e46f1d6ee66dace2f5340c553c9d4c.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 'src/lib/libssl/ssl3.h')
-rw-r--r-- | src/lib/libssl/ssl3.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl3.h b/src/lib/libssl/ssl3.h index 7fd00be2d3..235c359af2 100644 --- a/src/lib/libssl/ssl3.h +++ b/src/lib/libssl/ssl3.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl3.h,v 1.22 2014/06/13 04:29:13 miod Exp $ */ | 1 | /* $OpenBSD: ssl3.h,v 1.23 2014/06/13 11:52:03 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -488,6 +488,7 @@ typedef struct ssl3_state_st { | |||
488 | unsigned char *key_block; | 488 | unsigned char *key_block; |
489 | 489 | ||
490 | const EVP_CIPHER *new_sym_enc; | 490 | const EVP_CIPHER *new_sym_enc; |
491 | const EVP_AEAD *new_aead; | ||
491 | const EVP_MD *new_hash; | 492 | const EVP_MD *new_hash; |
492 | int new_mac_pkey_type; | 493 | int new_mac_pkey_type; |
493 | int new_mac_secret_size; | 494 | int new_mac_secret_size; |