diff options
| author |   jsing <jsing@openbsd.org> | 2018-08-24 17:30:32 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2018-08-24 17:30:32 +0000 |
| commit | 312b4b1422822c9900672bc9d1c64b6955ac6641 (patch) | |
| tree | 1e7d95aeaa0894d327b32c66fa3922758beb021a /lib/libssl/ssl_both.c | |
| parent | Add common Ethernet interface attributes to vio(4)'s build config. (diff) | |
| download | wireguard-openbsd-312b4b1422822c9900672bc9d1c64b6955ac6641.tar.xz wireguard-openbsd-312b4b1422822c9900672bc9d1c64b6955ac6641.zip | |
Clean up handshake message start/finish functions.
Now that all handshake messages are created using CBB, remove the non-CBB
ssl3_handshake_msg_start()/ssl3_handshake_msg_finish() functions. Rename
the CBB variants by dropping the _cbb suffix.
ok bcook@ inoguchi@ 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 03f95977f75..788505e6027 100644 --- a/lib/libssl/ssl_both.c +++ b/lib/libssl/ssl_both.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_both.c,v 1.11 2017/10/08 16:24:02 jsing Exp $ */ +/* $OpenBSD: ssl_both.c,v 1.12 2018/08/24 17:30:32 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -191,12 +191,12 @@ ssl3_send_finished(SSL *s, int a, int b, const char *sender, int slen) S3I(s)->previous_server_finished_len = md_len; } - if (!ssl3_handshake_msg_start_cbb(s, &cbb, &finished, + if (!ssl3_handshake_msg_start(s, &cbb, &finished, SSL3_MT_FINISHED)) goto err; if (!CBB_add_bytes(&finished, S3I(s)->tmp.finish_md, md_len)) goto err; - if (!ssl3_handshake_msg_finish_cbb(s, &cbb)) + if (!ssl3_handshake_msg_finish(s, &cbb)) goto err; S3I(s)->hs.state = b; |