diff options
| author | jsing <> | 2018-11-08 22:28:52 +0000 |
|---|---|---|
| committer | jsing <> | 2018-11-08 22:28:52 +0000 |
| commit | d1a7f20049bf29c61782397cffb632339b12ba54 (patch) | |
| tree | ea0388ba51cbbc63fa62e563b9694fedd9ef0f74 /src/lib/libssl/ssl_both.c | |
| parent | 80dc683994dcdda2b01fd893a5c06c06409e703a (diff) | |
| download | openbsd-d1a7f20049bf29c61782397cffb632339b12ba54.tar.gz openbsd-d1a7f20049bf29c61782397cffb632339b12ba54.tar.bz2 openbsd-d1a7f20049bf29c61782397cffb632339b12ba54.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/ssl_both.c')
| -rw-r--r-- | src/lib/libssl/ssl_both.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_both.c b/src/lib/libssl/ssl_both.c index 81fd1f80c5..77ab26e8b5 100644 --- a/src/lib/libssl/ssl_both.c +++ b/src/lib/libssl/ssl_both.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_both.c,v 1.13 2018/10/24 18:04:50 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_both.c,v 1.14 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 | * |
| @@ -146,7 +146,7 @@ ssl3_do_write(SSL *s, int type) | |||
| 146 | * Should not be done for 'Hello Request's, but in that case | 146 | * Should not be done for 'Hello Request's, but in that case |
| 147 | * we'll ignore the result anyway. | 147 | * we'll ignore the result anyway. |
| 148 | */ | 148 | */ |
| 149 | tls1_finish_mac(s, | 149 | tls1_transcript_record(s, |
| 150 | (unsigned char *)&s->internal->init_buf->data[s->internal->init_off], ret); | 150 | (unsigned char *)&s->internal->init_buf->data[s->internal->init_off], ret); |
| 151 | 151 | ||
| 152 | if (ret == s->internal->init_num) { | 152 | if (ret == s->internal->init_num) { |
| @@ -557,7 +557,7 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) | |||
| 557 | 557 | ||
| 558 | /* Feed this message into MAC computation. */ | 558 | /* Feed this message into MAC computation. */ |
| 559 | if (s->internal->mac_packet) { | 559 | if (s->internal->mac_packet) { |
| 560 | tls1_finish_mac(s, (unsigned char *)s->internal->init_buf->data, | 560 | tls1_transcript_record(s, (unsigned char *)s->internal->init_buf->data, |
| 561 | s->internal->init_num + 4); | 561 | s->internal->init_num + 4); |
| 562 | 562 | ||
| 563 | if (s->internal->msg_callback) | 563 | if (s->internal->msg_callback) |
