diff options
author | jsing <> | 2018-08-30 16:56:16 +0000 |
---|---|---|
committer | jsing <> | 2018-08-30 16:56:16 +0000 |
commit | aa46916ffff53f4d8fa6bd701c96da70c82b1547 (patch) | |
tree | 031b7e3310063f352295a693ac1da2c62ad5d8f1 /src/lib/libssl/d1_meth.c | |
parent | 6f960c595dec72229260d0e58fb8c9de5a26062e (diff) | |
download | openbsd-aa46916ffff53f4d8fa6bd701c96da70c82b1547.tar.gz openbsd-aa46916ffff53f4d8fa6bd701c96da70c82b1547.tar.bz2 openbsd-aa46916ffff53f4d8fa6bd701c96da70c82b1547.zip |
Nuke ssl_pending/ssl_shutdown function pointers.
ssl3_pending() is used for all protocols and dtls1_shutdown() just calls
ssl3_shutdown(), so just call the appropriate function directly instead.
ok beck@ inoguchi@ tb@
Diffstat (limited to 'src/lib/libssl/d1_meth.c')
-rw-r--r-- | src/lib/libssl/d1_meth.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libssl/d1_meth.c b/src/lib/libssl/d1_meth.c index d2e8a3be60..e157dc4d93 100644 --- a/src/lib/libssl/d1_meth.c +++ b/src/lib/libssl/d1_meth.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: d1_meth.c,v 1.16 2018/04/07 17:02:34 jsing Exp $ */ | 1 | /* $OpenBSD: d1_meth.c,v 1.17 2018/08/30 16:56:16 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
@@ -74,8 +74,6 @@ static const SSL_METHOD_INTERNAL DTLSv1_method_internal_data = { | |||
74 | .ssl_free = dtls1_free, | 74 | .ssl_free = dtls1_free, |
75 | .ssl_accept = ssl3_accept, | 75 | .ssl_accept = ssl3_accept, |
76 | .ssl_connect = ssl3_connect, | 76 | .ssl_connect = ssl3_connect, |
77 | .ssl_shutdown = dtls1_shutdown, | ||
78 | .ssl_pending = ssl3_pending, | ||
79 | .get_ssl_method = dtls1_get_method, | 77 | .get_ssl_method = dtls1_get_method, |
80 | .get_timeout = dtls1_default_timeout, | 78 | .get_timeout = dtls1_default_timeout, |
81 | .ssl_version = ssl_undefined_void_function, | 79 | .ssl_version = ssl_undefined_void_function, |