diff options
| author | jsing <> | 2018-11-08 22:28:52 +0000 |
|---|---|---|
| committer | jsing <> | 2018-11-08 22:28:52 +0000 |
| commit | 3ddaece0e07a9c99e3a1f04d188c5ece7176ee46 (patch) | |
| tree | ea0388ba51cbbc63fa62e563b9694fedd9ef0f74 /src/lib/libssl/d1_both.c | |
| parent | 638a717c204f5dd9a5b399e3c095815fb6d15124 (diff) | |
| download | openbsd-3ddaece0e07a9c99e3a1f04d188c5ece7176ee46.tar.gz openbsd-3ddaece0e07a9c99e3a1f04d188c5ece7176ee46.tar.bz2 openbsd-3ddaece0e07a9c99e3a1f04d188c5ece7176ee46.zip | |
Clean up and simplify the handshake transcript code.
This provides a cleaner, simpler and more readable API, with code that uses
a BUF_MEM instead of a BIO.
ok beck@ ("hurry up") and tb@.
Diffstat (limited to 'src/lib/libssl/d1_both.c')
| -rw-r--r-- | src/lib/libssl/d1_both.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/d1_both.c b/src/lib/libssl/d1_both.c index 95157630f5..f75604ef68 100644 --- a/src/lib/libssl/d1_both.c +++ b/src/lib/libssl/d1_both.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: d1_both.c,v 1.55 2018/09/05 16:58:59 jsing Exp $ */ | 1 | /* $OpenBSD: d1_both.c,v 1.56 2018/11/08 22:28:52 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
| 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
| @@ -360,7 +360,7 @@ dtls1_do_write(SSL *s, int type) | |||
| 360 | xlen = ret - DTLS1_HM_HEADER_LENGTH; | 360 | xlen = ret - DTLS1_HM_HEADER_LENGTH; |
| 361 | } | 361 | } |
| 362 | 362 | ||
| 363 | tls1_finish_mac(s, p, xlen); | 363 | tls1_transcript_record(s, p, xlen); |
| 364 | } | 364 | } |
| 365 | 365 | ||
| 366 | if (ret == s->internal->init_num) { | 366 | if (ret == s->internal->init_num) { |
| @@ -436,7 +436,7 @@ again: | |||
| 436 | 436 | ||
| 437 | msg_len += DTLS1_HM_HEADER_LENGTH; | 437 | msg_len += DTLS1_HM_HEADER_LENGTH; |
| 438 | 438 | ||
| 439 | tls1_finish_mac(s, p, msg_len); | 439 | tls1_transcript_record(s, p, msg_len); |
| 440 | if (s->internal->msg_callback) | 440 | if (s->internal->msg_callback) |
| 441 | s->internal->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, p, msg_len, | 441 | s->internal->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, p, msg_len, |
| 442 | s, s->internal->msg_callback_arg); | 442 | s, s->internal->msg_callback_arg); |