summaryrefslogtreecommitdiffstats
path: root/lib/libssl/d1_clnt.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2020-01-23 10:48:37 +0000
committerjsing <jsing@openbsd.org>2020-01-23 10:48:37 +0000
commitdc77a1b6be2178ef3b10b1095ac8144db9bc6da5 (patch)
treee14cb0d1811858e59df6e7e89adbb9434bcec02d /lib/libssl/d1_clnt.c
parentImplement sending client certificate requests for 1.3 server (diff)
downloadwireguard-openbsd-dc77a1b6be2178ef3b10b1095ac8144db9bc6da5.tar.xz
wireguard-openbsd-dc77a1b6be2178ef3b10b1095ac8144db9bc6da5.zip
Remove the ssl_get_message function pointer from SSL_METHOD_INTERNAL.
ssl_get_message is essentially a switch between ssl3_get_message and dtls1_get_message, both only used by the legacy stack. Instead, use SSL_IS_DTLS() in ssl3_get_message to call the DTLS function when necessary. ok beck@ inoguchi@ tb@
Diffstat (limited to 'lib/libssl/d1_clnt.c')
-rw-r--r--lib/libssl/d1_clnt.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/libssl/d1_clnt.c b/lib/libssl/d1_clnt.c
index ee21a1bebc3..b660589d06d 100644
--- a/lib/libssl/d1_clnt.c
+++ b/lib/libssl/d1_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_clnt.c,v 1.82 2018/11/05 05:45:15 jsing Exp $ */
+/* $OpenBSD: d1_clnt.c,v 1.83 2020/01/23 10:48:37 jsing Exp $ */
/*
* DTLS implementation written by Nagendra Modadugu
* (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -136,9 +136,8 @@ dtls1_get_hello_verify(SSL *s)
uint16_t ssl_version;
CBS hello_verify_request, cookie;
- n = s->method->internal->ssl_get_message(s, DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A,
+ n = ssl3_get_message(s, DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A,
DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B, -1, s->internal->max_cert_list, &ok);
-
if (!ok)
return ((int)n);