diff options
| author |   jsing <jsing@openbsd.org> | 2017-01-26 05:31:25 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2017-01-26 05:31:25 +0000 |
| commit | 24a1aa5b34fff2e842d539a6e9ac5421f50dd93d (patch) | |
| tree | 907ad852ab87d1c5824b18446bddef464254e89b /lib/libssl/s3_both.c | |
| parent | deactivate the existing pledge regress tests, they need (diff) | |
| download | wireguard-openbsd-24a1aa5b34fff2e842d539a6e9ac5421f50dd93d.tar.xz wireguard-openbsd-24a1aa5b34fff2e842d539a6e9ac5421f50dd93d.zip | |
Merge the client/server version negotiation into the existing (currently
fixed version) client/server code.
ok beck@
Diffstat (limited to 'lib/libssl/s3_both.c')
| -rw-r--r-- | lib/libssl/s3_both.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lib/libssl/s3_both.c b/lib/libssl/s3_both.c index 033831e23d8..41b35e5de6a 100644 --- a/lib/libssl/s3_both.c +++ b/lib/libssl/s3_both.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_both.c,v 1.56 2017/01/23 14:35:42 jsing Exp $ */ +/* $OpenBSD: s3_both.c,v 1.57 2017/01/26 05:31:25 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -524,11 +524,17 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) ssl3_take_mac(s); /* Feed this message into MAC computation. */ - tls1_finish_mac(s, (unsigned char *)s->internal->init_buf->data, s->internal->init_num + 4); - if (s->internal->msg_callback) - s->internal->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, - s->internal->init_buf->data, (size_t)s->internal->init_num + 4, s, - s->internal->msg_callback_arg); + if (s->internal->mac_packet) { + tls1_finish_mac(s, (unsigned char *)s->internal->init_buf->data, + s->internal->init_num + 4); + s->internal->mac_packet = 0; + + if (s->internal->msg_callback) + s->internal->msg_callback(0, s->version, + SSL3_RT_HANDSHAKE, s->internal->init_buf->data, + (size_t)s->internal->init_num + 4, s, + s->internal->msg_callback_arg); + } *ok = 1; return (s->internal->init_num); |