diff options
author | jsing <> | 2017-10-10 15:13:26 +0000 |
---|---|---|
committer | jsing <> | 2017-10-10 15:13:26 +0000 |
commit | 50b0edb9d3ae72d9c4ace7aa8779e76a2b64068f (patch) | |
tree | f95f7f0c3a406dd1dd25069a69ae5946e7eb8ad5 /src/lib/libssl/d1_meth.c | |
parent | dd1d617d105867f42195ad190923c6c1fe92e710 (diff) | |
download | openbsd-50b0edb9d3ae72d9c4ace7aa8779e76a2b64068f.tar.gz openbsd-50b0edb9d3ae72d9c4ace7aa8779e76a2b64068f.tar.bz2 openbsd-50b0edb9d3ae72d9c4ace7aa8779e76a2b64068f.zip |
Merge dtls1_connect() into ssl3_connect(), removing a large amount of
duplicated code. For now this is essentially adds a diff of the two
functions with 'if (SSL_IS_DTLS(s))' - further clean up and improvement
will follow.
ok inoguchi@
Diffstat (limited to '')
-rw-r--r-- | src/lib/libssl/d1_meth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/d1_meth.c b/src/lib/libssl/d1_meth.c index fcd8906c45..e513c4a9be 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.13 2017/01/23 13:36:13 jsing Exp $ */ | 1 | /* $OpenBSD: d1_meth.c,v 1.14 2017/10/10 15:13:26 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. |
@@ -73,7 +73,7 @@ static const SSL_METHOD_INTERNAL DTLSv1_method_internal_data = { | |||
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 = dtls1_accept, |
76 | .ssl_connect = dtls1_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, |
79 | .ssl_write = ssl3_write, | 79 | .ssl_write = ssl3_write, |