summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_meth.c
diff options
context:
space:
mode:
authorjsing <>2017-10-12 15:52:50 +0000
committerjsing <>2017-10-12 15:52:50 +0000
commit6492e6ac4af9a012fb3257450b5bb92e7a5b4554 (patch)
tree1093c3d22332b5684b872848e862f8389752b31e /src/lib/libssl/d1_meth.c
parent791837ff802d1b53615622a89e9ac0b79a61eb27 (diff)
downloadopenbsd-6492e6ac4af9a012fb3257450b5bb92e7a5b4554.tar.gz
openbsd-6492e6ac4af9a012fb3257450b5bb92e7a5b4554.tar.bz2
openbsd-6492e6ac4af9a012fb3257450b5bb92e7a5b4554.zip
Fold dtls1_accept() into ssl_accept(), removing a lot of duplicated code.
With review/feedback from inoguchi@
Diffstat (limited to 'src/lib/libssl/d1_meth.c')
-rw-r--r--src/lib/libssl/d1_meth.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/d1_meth.c b/src/lib/libssl/d1_meth.c
index e513c4a9be..9ecca0027c 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.14 2017/10/10 15:13:26 jsing Exp $ */ 1/* $OpenBSD: d1_meth.c,v 1.15 2017/10/12 15:52:50 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.
@@ -72,7 +72,7 @@ static const SSL_METHOD_INTERNAL DTLSv1_method_internal_data = {
72 .ssl_new = dtls1_new, 72 .ssl_new = dtls1_new,
73 .ssl_clear = dtls1_clear, 73 .ssl_clear = dtls1_clear,
74 .ssl_free = dtls1_free, 74 .ssl_free = dtls1_free,
75 .ssl_accept = dtls1_accept, 75 .ssl_accept = ssl3_accept,
76 .ssl_connect = ssl3_connect, 76 .ssl_connect = ssl3_connect,
77 .ssl_read = ssl3_read, 77 .ssl_read = ssl3_read,
78 .ssl_peek = ssl3_peek, 78 .ssl_peek = ssl3_peek,