diff options
author | jsing <> | 2017-01-26 05:31:25 +0000 |
---|---|---|
committer | jsing <> | 2017-01-26 05:31:25 +0000 |
commit | 9366f4ef0d67a19fe5eca3feedbc756a4a8966b2 (patch) | |
tree | 4e54623d2ff33c8bd1295cf166bf8253188d9d34 /src/lib/libssl/d1_clnt.c | |
parent | c7118cf7a1b4ff8cec6c52fba26ecfbfba0d7919 (diff) | |
download | openbsd-9366f4ef0d67a19fe5eca3feedbc756a4a8966b2.tar.gz openbsd-9366f4ef0d67a19fe5eca3feedbc756a4a8966b2.tar.bz2 openbsd-9366f4ef0d67a19fe5eca3feedbc756a4a8966b2.zip |
Merge the client/server version negotiation into the existing (currently
fixed version) client/server code.
ok beck@
Diffstat (limited to 'src/lib/libssl/d1_clnt.c')
-rw-r--r-- | src/lib/libssl/d1_clnt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c index 6b5510c1e3..5f8b56ebed 100644 --- a/src/lib/libssl/d1_clnt.c +++ b/src/lib/libssl/d1_clnt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: d1_clnt.c,v 1.69 2017/01/23 13:36:13 jsing Exp $ */ | 1 | /* $OpenBSD: d1_clnt.c,v 1.70 2017/01/26 05:31:25 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. |
@@ -127,7 +127,6 @@ | |||
127 | 127 | ||
128 | #include "bytestring.h" | 128 | #include "bytestring.h" |
129 | 129 | ||
130 | static const SSL_METHOD *dtls1_get_client_method(int ver); | ||
131 | static int dtls1_get_hello_verify(SSL *s); | 130 | static int dtls1_get_hello_verify(SSL *s); |
132 | 131 | ||
133 | static const SSL_METHOD_INTERNAL DTLSv1_client_method_internal_data = { | 132 | static const SSL_METHOD_INTERNAL DTLSv1_client_method_internal_data = { |
@@ -170,7 +169,7 @@ DTLSv1_client_method(void) | |||
170 | return &DTLSv1_client_method_data; | 169 | return &DTLSv1_client_method_data; |
171 | } | 170 | } |
172 | 171 | ||
173 | static const SSL_METHOD * | 172 | const SSL_METHOD * |
174 | dtls1_get_client_method(int ver) | 173 | dtls1_get_client_method(int ver) |
175 | { | 174 | { |
176 | if (ver == DTLS1_VERSION) | 175 | if (ver == DTLS1_VERSION) |