diff options
| author |   bcook <bcook@openbsd.org> | 2019-05-15 09:13:16 +0000 |
|---|---|---|
| committer | bcook <bcook@openbsd.org> | 2019-05-15 09:13:16 +0000 |
| commit | 370b96472bf45a8174524306b33a55fc5f360bbc (patch) | |
| tree | 4a6e1732f6e27f25f2df1f6ef5c74df36073fc21 /lib/libssl/ssl_lib.c | |
| parent | Cleanup: (diff) | |
| download | wireguard-openbsd-370b96472bf45a8174524306b33a55fc5f360bbc.tar.xz wireguard-openbsd-370b96472bf45a8174524306b33a55fc5f360bbc.zip | |
s3 is never NULL since s2 (formerly used for SSLv2) does not exist, so there is
no need to check for it. Fixes COV-165788, identified with help from Alex
Bumstead.
ok jsing@
Diffstat (limited to 'lib/libssl/ssl_lib.c')
| -rw-r--r-- | lib/libssl/ssl_lib.c | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index adcaa1b3cca..bf370cbfb24 100644 --- a/lib/libssl/ssl_lib.c +++ b/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.204 2019/03/25 17:33:26 jsing Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.205 2019/05/15 09:13:16 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -696,14 +696,12 @@ err: size_t SSL_get_finished(const SSL *s, void *buf, size_t count) { - size_t ret = 0; + size_t ret; - if (s->s3 != NULL) { - ret = S3I(s)->tmp.finish_md_len; - if (count > ret) - count = ret; - memcpy(buf, S3I(s)->tmp.finish_md, count); - } + ret = S3I(s)->tmp.finish_md_len; + if (count > ret) + count = ret; + memcpy(buf, S3I(s)->tmp.finish_md, count); return (ret); } @@ -711,14 +709,12 @@ SSL_get_finished(const SSL *s, void *buf, size_t count) size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count) { - size_t ret = 0; + size_t ret; - if (s->s3 != NULL) { - ret = S3I(s)->tmp.peer_finish_md_len; - if (count > ret) - count = ret; - memcpy(buf, S3I(s)->tmp.peer_finish_md, count); - } + ret = S3I(s)->tmp.peer_finish_md_len; + if (count > ret) + count = ret; + memcpy(buf, S3I(s)->tmp.peer_finish_md, count); return (ret); } @@ -1637,10 +1633,8 @@ SSL_get0_alpn_selected(const SSL *ssl, const unsigned char **data, *data = NULL; *len = 0; - if (ssl->s3 != NULL) { - *data = ssl->s3->internal->alpn_selected; - *len = ssl->s3->internal->alpn_selected_len; - } + *data = ssl->s3->internal->alpn_selected; + *len = ssl->s3->internal->alpn_selected_len; } int |