diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 32766de1cf..3b08f8c772 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.221 2018/11/08 20:55:18 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.222 2018/11/08 22:28:52 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 | * |
@@ -780,8 +780,8 @@ typedef struct ssl3_state_internal_st { | |||
780 | int wpend_ret; /* number of bytes submitted */ | 780 | int wpend_ret; /* number of bytes submitted */ |
781 | const unsigned char *wpend_buf; | 781 | const unsigned char *wpend_buf; |
782 | 782 | ||
783 | /* used during startup, digest all incoming/outgoing packets */ | 783 | /* Transcript of handshake messages that have been sent and received. */ |
784 | BIO *handshake_buffer; | 784 | BUF_MEM *handshake_transcript; |
785 | 785 | ||
786 | /* Rolling hash of handshake messages. */ | 786 | /* Rolling hash of handshake messages. */ |
787 | EVP_MD_CTX *handshake_hash; | 787 | EVP_MD_CTX *handshake_hash; |
@@ -1238,11 +1238,14 @@ int tls1_handshake_hash_value(SSL *s, const unsigned char *out, size_t len, | |||
1238 | size_t *outlen); | 1238 | size_t *outlen); |
1239 | void tls1_handshake_hash_free(SSL *s); | 1239 | void tls1_handshake_hash_free(SSL *s); |
1240 | 1240 | ||
1241 | int tls1_init_finished_mac(SSL *s); | 1241 | int tls1_transcript_init(SSL *s); |
1242 | int tls1_finish_mac(SSL *s, const unsigned char *buf, int len); | 1242 | void tls1_transcript_free(SSL *s); |
1243 | void tls1_free_digest_list(SSL *s); | 1243 | int tls1_transcript_append(SSL *s, const unsigned char *buf, size_t len); |
1244 | int tls1_transcript_data(SSL *s, const unsigned char **data, size_t *len); | ||
1245 | void tls1_transcript_freeze(SSL *s); | ||
1246 | int tls1_transcript_record(SSL *s, const unsigned char *buf, size_t len); | ||
1247 | |||
1244 | void tls1_cleanup_key_block(SSL *s); | 1248 | void tls1_cleanup_key_block(SSL *s); |
1245 | int tls1_digest_cached_records(SSL *s); | ||
1246 | int tls1_change_cipher_state(SSL *s, int which); | 1249 | int tls1_change_cipher_state(SSL *s, int which); |
1247 | int tls1_setup_key_block(SSL *s); | 1250 | int tls1_setup_key_block(SSL *s); |
1248 | int tls1_enc(SSL *s, int snd); | 1251 | int tls1_enc(SSL *s, int snd); |