diff options
| author |   jsing <jsing@openbsd.org> | 2018-11-08 22:28:52 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2018-11-08 22:28:52 +0000 |
| commit | cef855dc927554ea6cd8f8b5125b409ddf3d5bf6 (patch) | |
| tree | bb455d9d7adf43bda78d9743ebaf3c63cec89e12 /lib/libssl/ssl_both.c | |
| parent | Add missing NULL checks on allocation, style(9) and consistently use (diff) | |
| download | wireguard-openbsd-cef855dc927554ea6cd8f8b5125b409ddf3d5bf6.tar.xz wireguard-openbsd-cef855dc927554ea6cd8f8b5125b409ddf3d5bf6.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 'lib/libssl/ssl_both.c')
| -rw-r--r-- | lib/libssl/ssl_both.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libssl/ssl_both.c b/lib/libssl/ssl_both.c index 81fd1f80c5e..77ab26e8b53 100644 --- a/lib/libssl/ssl_both.c +++ b/lib/libssl/ssl_both.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_both.c,v 1.13 2018/10/24 18:04:50 jsing Exp $ */ +/* $OpenBSD: ssl_both.c,v 1.14 2018/11/08 22:28:52 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -146,7 +146,7 @@ ssl3_do_write(SSL *s, int type) * Should not be done for 'Hello Request's, but in that case * we'll ignore the result anyway. */ - tls1_finish_mac(s, + tls1_transcript_record(s, (unsigned char *)&s->internal->init_buf->data[s->internal->init_off], ret); 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) /* Feed this message into MAC computation. */ if (s->internal->mac_packet) { - tls1_finish_mac(s, (unsigned char *)s->internal->init_buf->data, + tls1_transcript_record(s, (unsigned char *)s->internal->init_buf->data, s->internal->init_num + 4); if (s->internal->msg_callback) |