diff options
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index d022d21568..9a018547ab 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.215 2018/09/08 14:29:52 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.216 2018/10/24 18:04:50 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 | * |
@@ -748,6 +748,14 @@ typedef struct ssl3_state_internal_st { | |||
748 | int write_mac_secret_size; | 748 | int write_mac_secret_size; |
749 | unsigned char write_mac_secret[EVP_MAX_MD_SIZE]; | 749 | unsigned char write_mac_secret[EVP_MAX_MD_SIZE]; |
750 | 750 | ||
751 | SSL3_BUFFER rbuf; /* read IO goes into here */ | ||
752 | SSL3_BUFFER wbuf; /* write IO goes into here */ | ||
753 | |||
754 | /* we allow one fatal and one warning alert to be outstanding, | ||
755 | * send close alert via the warning alert */ | ||
756 | int alert_dispatch; | ||
757 | unsigned char send_alert[2]; | ||
758 | |||
751 | /* flags for countermeasure against known-IV weakness */ | 759 | /* flags for countermeasure against known-IV weakness */ |
752 | int need_empty_fragments; | 760 | int need_empty_fragments; |
753 | int empty_fragment_done; | 761 | int empty_fragment_done; |
@@ -793,6 +801,8 @@ typedef struct ssl3_state_internal_st { | |||
793 | SSL_HANDSHAKE hs; | 801 | SSL_HANDSHAKE hs; |
794 | 802 | ||
795 | struct { | 803 | struct { |
804 | int new_mac_secret_size; | ||
805 | |||
796 | /* actually only needs to be 16+20 */ | 806 | /* actually only needs to be 16+20 */ |
797 | unsigned char cert_verify_md[EVP_MAX_MD_SIZE*2]; | 807 | unsigned char cert_verify_md[EVP_MAX_MD_SIZE*2]; |
798 | 808 | ||