4 files changed, 122 insertions, 148 deletions
diff --git a/src/lib/libssl/s23_clnt.c b/src/lib/libssl/s23_clnt.c
index 96b9ac9429..1078bc0155 100644
--- a/src/lib/libssl/s23_clnt.c
+++ b/src/lib/libssl/s23_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s23_clnt.c,v 1.44 2015/09/02 17:53:54 jsing Exp $ */
+/* $OpenBSD: s23_clnt.c,v 1.45 2015/09/11 14:39:05 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -117,60 +117,9 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
-static const SSL_METHOD *ssl23_get_client_method(int ver);
 static int ssl23_client_hello(SSL *s);
 static int ssl23_get_server_hello(SSL *s);
-const SSL_METHOD SSLv23_client_method_data = {
-        .version = TLS1_2_VERSION,
-        .ssl_new = tls1_new,
-        .ssl_clear = tls1_clear,
-        .ssl_free = tls1_free,
-        .ssl_accept = ssl_undefined_function,
-        .ssl_connect = ssl23_connect,
-        .ssl_read = ssl23_read,
-        .ssl_peek = ssl23_peek,
-        .ssl_write = ssl23_write,
-        .ssl_shutdown = ssl_undefined_function,
-        .ssl_renegotiate = ssl_undefined_function,
-        .ssl_renegotiate_check = ssl_ok,
-        .ssl_get_message = ssl3_get_message,
-        .ssl_read_bytes = ssl3_read_bytes,
-        .ssl_write_bytes = ssl3_write_bytes,
-        .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .ssl_ctrl = ssl3_ctrl,
-        .ssl_ctx_ctrl = ssl3_ctx_ctrl,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
-        .ssl_pending = ssl_undefined_const_function,
-        .num_ciphers = ssl3_num_ciphers,
-        .get_cipher = ssl3_get_cipher,
-        .get_ssl_method = ssl23_get_client_method,
-        .get_timeout = ssl23_default_timeout,
-        .ssl3_enc = &ssl3_undef_enc_method,
-        .ssl_version = ssl_undefined_void_function,
-        .ssl_callback_ctrl = ssl3_callback_ctrl,
-        .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
-};
-const SSL_METHOD *
-SSLv23_client_method(void)
-{
-        return &SSLv23_client_method_data;
-}
-static const SSL_METHOD *
-ssl23_get_client_method(int ver)
-{
-        if (ver == TLS1_VERSION)
-                return (TLSv1_client_method());
-        if (ver == TLS1_1_VERSION)
-                return (TLSv1_1_client_method());
-        if (ver == TLS1_2_VERSION)
-                return (TLSv1_2_client_method());
-        return (NULL);
-}
 int
 ssl23_connect(SSL *s)
 {
@@ -529,9 +478,3 @@ ssl23_get_server_hello(SSL *s)
 err:
        return (-1);
 }
-const SSL_METHOD *
-TLS_client_method(void)
-{
-        return &SSLv23_client_method_data;
-}
diff --git a/src/lib/libssl/src/ssl/s23_clnt.c b/src/lib/libssl/src/ssl/s23_clnt.c
index 96b9ac9429..1078bc0155 100644
--- a/src/lib/libssl/src/ssl/s23_clnt.c
+++ b/src/lib/libssl/src/ssl/s23_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s23_clnt.c,v 1.44 2015/09/02 17:53:54 jsing Exp $ */
+/* $OpenBSD: s23_clnt.c,v 1.45 2015/09/11 14:39:05 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -117,60 +117,9 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
-static const SSL_METHOD *ssl23_get_client_method(int ver);
 static int ssl23_client_hello(SSL *s);
 static int ssl23_get_server_hello(SSL *s);
-const SSL_METHOD SSLv23_client_method_data = {
-        .version = TLS1_2_VERSION,
-        .ssl_new = tls1_new,
-        .ssl_clear = tls1_clear,
-        .ssl_free = tls1_free,
-        .ssl_accept = ssl_undefined_function,
-        .ssl_connect = ssl23_connect,
-        .ssl_read = ssl23_read,
-        .ssl_peek = ssl23_peek,
-        .ssl_write = ssl23_write,
-        .ssl_shutdown = ssl_undefined_function,
-        .ssl_renegotiate = ssl_undefined_function,
-        .ssl_renegotiate_check = ssl_ok,
-        .ssl_get_message = ssl3_get_message,
-        .ssl_read_bytes = ssl3_read_bytes,
-        .ssl_write_bytes = ssl3_write_bytes,
-        .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .ssl_ctrl = ssl3_ctrl,
-        .ssl_ctx_ctrl = ssl3_ctx_ctrl,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
-        .ssl_pending = ssl_undefined_const_function,
-        .num_ciphers = ssl3_num_ciphers,
-        .get_cipher = ssl3_get_cipher,
-        .get_ssl_method = ssl23_get_client_method,
-        .get_timeout = ssl23_default_timeout,
-        .ssl3_enc = &ssl3_undef_enc_method,
-        .ssl_version = ssl_undefined_void_function,
-        .ssl_callback_ctrl = ssl3_callback_ctrl,
-        .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
-};
-const SSL_METHOD *
-SSLv23_client_method(void)
-{
-        return &SSLv23_client_method_data;
-}
-static const SSL_METHOD *
-ssl23_get_client_method(int ver)
-{
-        if (ver == TLS1_VERSION)
-                return (TLSv1_client_method());
-        if (ver == TLS1_1_VERSION)
-                return (TLSv1_1_client_method());
-        if (ver == TLS1_2_VERSION)
-                return (TLSv1_2_client_method());
-        return (NULL);
-}
 int
 ssl23_connect(SSL *s)
 {
@@ -529,9 +478,3 @@ ssl23_get_server_hello(SSL *s)
 err:
        return (-1);
 }
-const SSL_METHOD *
-TLS_client_method(void)
-{
-        return &SSLv23_client_method_data;
-}
diff --git a/src/lib/libssl/src/ssl/t1_clnt.c b/src/lib/libssl/src/ssl/t1_clnt.c
index 0dc41af5b3..0853a3cb33 100644
--- a/src/lib/libssl/src/ssl/t1_clnt.c
+++ b/src/lib/libssl/src/ssl/t1_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_clnt.c,v 1.17 2015/02/06 08:30:23 jsing Exp $ */
+/* $OpenBSD: t1_clnt.c,v 1.18 2015/09/11 14:39:05 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -66,6 +66,38 @@
 static const SSL_METHOD *tls1_get_client_method(int ver);
+const SSL_METHOD TLS_client_method_data = {
+        .version = TLS1_2_VERSION,
+        .ssl_new = tls1_new,
+        .ssl_clear = tls1_clear,
+        .ssl_free = tls1_free,
+        .ssl_accept = ssl_undefined_function,
+        .ssl_connect = ssl23_connect,
+        .ssl_read = ssl23_read,
+        .ssl_peek = ssl23_peek,
+        .ssl_write = ssl23_write,
+        .ssl_shutdown = ssl_undefined_function,
+        .ssl_renegotiate = ssl_undefined_function,
+        .ssl_renegotiate_check = ssl_ok,
+        .ssl_get_message = ssl3_get_message,
+        .ssl_read_bytes = ssl3_read_bytes,
+        .ssl_write_bytes = ssl3_write_bytes,
+        .ssl_dispatch_alert = ssl3_dispatch_alert,
+        .ssl_ctrl = ssl3_ctrl,
+        .ssl_ctx_ctrl = ssl3_ctx_ctrl,
+        .get_cipher_by_char = ssl3_get_cipher_by_char,
+        .put_cipher_by_char = ssl3_put_cipher_by_char,
+        .ssl_pending = ssl_undefined_const_function,
+        .num_ciphers = ssl3_num_ciphers,
+        .get_cipher = ssl3_get_cipher,
+        .get_ssl_method = tls1_get_client_method,
+        .get_timeout = ssl23_default_timeout,
+        .ssl3_enc = &ssl3_undef_enc_method,
+        .ssl_version = ssl_undefined_void_function,
+        .ssl_callback_ctrl = ssl3_callback_ctrl,
+        .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
+};
 const SSL_METHOD TLSv1_client_method_data = {
        .version = TLS1_VERSION,
        .ssl_new = tls1_new,
@@ -162,32 +194,44 @@ const SSL_METHOD TLSv1_2_client_method_data = {
        .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
 };
+static const SSL_METHOD *
+tls1_get_client_method(int ver)
+{
+        if (ver == TLS1_2_VERSION)
+                return (TLSv1_2_client_method());
+        if (ver == TLS1_1_VERSION)
+                return (TLSv1_1_client_method());
+        if (ver == TLS1_VERSION)
+                return (TLSv1_client_method());
+        return (NULL);
+}
 const SSL_METHOD *
-TLSv1_client_method(void)
+SSLv23_client_method(void)
 {
-        return &TLSv1_client_method_data;
+        return (TLS_client_method());
 }
 const SSL_METHOD *
-TLSv1_1_client_method(void)
+TLS_client_method(void)
 {
-        return &TLSv1_1_client_method_data;
+        return (&TLS_client_method_data);
 }
 const SSL_METHOD *
-TLSv1_2_client_method(void)
+TLSv1_client_method(void)
 {
-        return &TLSv1_2_client_method_data;
+        return (&TLSv1_client_method_data);
 }
-static const SSL_METHOD *
+const SSL_METHOD *
-tls1_get_client_method(int ver)
+TLSv1_1_client_method(void)
 {
-        if (ver == TLS1_2_VERSION)
+        return (&TLSv1_1_client_method_data);
-                return (TLSv1_2_client_method());
+}
-        if (ver == TLS1_1_VERSION)
-                return (TLSv1_1_client_method());
+const SSL_METHOD *
-        if (ver == TLS1_VERSION)
+TLSv1_2_client_method(void)
-                return (TLSv1_client_method());
+{
-        return (NULL);
+        return (&TLSv1_2_client_method_data);
 }
diff --git a/src/lib/libssl/t1_clnt.c b/src/lib/libssl/t1_clnt.c
index 0dc41af5b3..0853a3cb33 100644
--- a/src/lib/libssl/t1_clnt.c
+++ b/src/lib/libssl/t1_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_clnt.c,v 1.17 2015/02/06 08:30:23 jsing Exp $ */
+/* $OpenBSD: t1_clnt.c,v 1.18 2015/09/11 14:39:05 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -66,6 +66,38 @@
 static const SSL_METHOD *tls1_get_client_method(int ver);
+const SSL_METHOD TLS_client_method_data = {
+        .version = TLS1_2_VERSION,
+        .ssl_new = tls1_new,
+        .ssl_clear = tls1_clear,
+        .ssl_free = tls1_free,
+        .ssl_accept = ssl_undefined_function,
+        .ssl_connect = ssl23_connect,
+        .ssl_read = ssl23_read,
+        .ssl_peek = ssl23_peek,
+        .ssl_write = ssl23_write,
+        .ssl_shutdown = ssl_undefined_function,
+        .ssl_renegotiate = ssl_undefined_function,
+        .ssl_renegotiate_check = ssl_ok,
+        .ssl_get_message = ssl3_get_message,
+        .ssl_read_bytes = ssl3_read_bytes,
+        .ssl_write_bytes = ssl3_write_bytes,
+        .ssl_dispatch_alert = ssl3_dispatch_alert,
+        .ssl_ctrl = ssl3_ctrl,
+        .ssl_ctx_ctrl = ssl3_ctx_ctrl,
+        .get_cipher_by_char = ssl3_get_cipher_by_char,
+        .put_cipher_by_char = ssl3_put_cipher_by_char,
+        .ssl_pending = ssl_undefined_const_function,
+        .num_ciphers = ssl3_num_ciphers,
+        .get_cipher = ssl3_get_cipher,
+        .get_ssl_method = tls1_get_client_method,
+        .get_timeout = ssl23_default_timeout,
+        .ssl3_enc = &ssl3_undef_enc_method,
+        .ssl_version = ssl_undefined_void_function,
+        .ssl_callback_ctrl = ssl3_callback_ctrl,
+        .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
+};
 const SSL_METHOD TLSv1_client_method_data = {
        .version = TLS1_VERSION,
        .ssl_new = tls1_new,
@@ -162,32 +194,44 @@ const SSL_METHOD TLSv1_2_client_method_data = {
        .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
 };
+static const SSL_METHOD *
+tls1_get_client_method(int ver)
+{
+        if (ver == TLS1_2_VERSION)
+                return (TLSv1_2_client_method());
+        if (ver == TLS1_1_VERSION)
+                return (TLSv1_1_client_method());
+        if (ver == TLS1_VERSION)
+                return (TLSv1_client_method());
+        return (NULL);
+}
 const SSL_METHOD *
-TLSv1_client_method(void)
+SSLv23_client_method(void)
 {
-        return &TLSv1_client_method_data;
+        return (TLS_client_method());
 }
 const SSL_METHOD *
-TLSv1_1_client_method(void)
+TLS_client_method(void)
 {
-        return &TLSv1_1_client_method_data;
+        return (&TLS_client_method_data);
 }
 const SSL_METHOD *
-TLSv1_2_client_method(void)
+TLSv1_client_method(void)
 {
-        return &TLSv1_2_client_method_data;
+        return (&TLSv1_client_method_data);
 }
-static const SSL_METHOD *
+const SSL_METHOD *
-tls1_get_client_method(int ver)
+TLSv1_1_client_method(void)
 {
-        if (ver == TLS1_2_VERSION)
+        return (&TLSv1_1_client_method_data);
-                return (TLSv1_2_client_method());
+}
-        if (ver == TLS1_1_VERSION)
-                return (TLSv1_1_client_method());
+const SSL_METHOD *
-        if (ver == TLS1_VERSION)
+TLSv1_2_client_method(void)
-                return (TLSv1_client_method());
+{
-        return (NULL);
+        return (&TLSv1_2_client_method_data);
 }

diff --git a/src/lib/libssl/s23_clnt.c b/src/lib/libssl/s23_clnt.c index 96b9ac9429..1078bc0155 100644 --- a/src/lib/libssl/s23_clnt.c +++ b/src/lib/libssl/s23_clnt.c
@@ -1,4 +1,4 @@
1	/* $OpenBSD: s23_clnt.c,v 1.44 2015/09/02 17:53:54 jsing Exp $ */	1	/* $OpenBSD: s23_clnt.c,v 1.45 2015/09/11 14:39:05 jsing Exp $ */
2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)	2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3	* All rights reserved.	3	* All rights reserved.
4	*	4	*
@@ -117,60 +117,9 @@
117	#include <openssl/evp.h>	117	#include <openssl/evp.h>
118	#include <openssl/objects.h>	118	#include <openssl/objects.h>
119		119
120	static const SSL_METHOD *ssl23_get_client_method(int ver);
121	static int ssl23_client_hello(SSL *s);	120	static int ssl23_client_hello(SSL *s);
122	static int ssl23_get_server_hello(SSL *s);	121	static int ssl23_get_server_hello(SSL *s);
123		122
124	const SSL_METHOD SSLv23_client_method_data = {
125	.version = TLS1_2_VERSION,
126	.ssl_new = tls1_new,
127	.ssl_clear = tls1_clear,
128	.ssl_free = tls1_free,
129	.ssl_accept = ssl_undefined_function,
130	.ssl_connect = ssl23_connect,
131	.ssl_read = ssl23_read,
132	.ssl_peek = ssl23_peek,
133	.ssl_write = ssl23_write,
134	.ssl_shutdown = ssl_undefined_function,
135	.ssl_renegotiate = ssl_undefined_function,
136	.ssl_renegotiate_check = ssl_ok,
137	.ssl_get_message = ssl3_get_message,
138	.ssl_read_bytes = ssl3_read_bytes,
139	.ssl_write_bytes = ssl3_write_bytes,
140	.ssl_dispatch_alert = ssl3_dispatch_alert,
141	.ssl_ctrl = ssl3_ctrl,
142	.ssl_ctx_ctrl = ssl3_ctx_ctrl,
143	.get_cipher_by_char = ssl3_get_cipher_by_char,
144	.put_cipher_by_char = ssl3_put_cipher_by_char,
145	.ssl_pending = ssl_undefined_const_function,
146	.num_ciphers = ssl3_num_ciphers,
147	.get_cipher = ssl3_get_cipher,
148	.get_ssl_method = ssl23_get_client_method,
149	.get_timeout = ssl23_default_timeout,
150	.ssl3_enc = &ssl3_undef_enc_method,
151	.ssl_version = ssl_undefined_void_function,
152	.ssl_callback_ctrl = ssl3_callback_ctrl,
153	.ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
154	};
155
156	const SSL_METHOD *
157	SSLv23_client_method(void)
158	{
159	return &SSLv23_client_method_data;
160	}
161
162	static const SSL_METHOD *
163	ssl23_get_client_method(int ver)
164	{
165	if (ver == TLS1_VERSION)
166	return (TLSv1_client_method());
167	if (ver == TLS1_1_VERSION)
168	return (TLSv1_1_client_method());
169	if (ver == TLS1_2_VERSION)
170	return (TLSv1_2_client_method());
171	return (NULL);
172	}
173
174	int	123	int
175	ssl23_connect(SSL *s)	124	ssl23_connect(SSL *s)
176	{	125	{
@@ -529,9 +478,3 @@ ssl23_get_server_hello(SSL *s)
529	err:	478	err:
530	return (-1);	479	return (-1);
531	}	480	}
532
533	const SSL_METHOD *
534	TLS_client_method(void)
535	{
536	return &SSLv23_client_method_data;
537	}


diff --git a/src/lib/libssl/src/ssl/s23_clnt.c b/src/lib/libssl/src/ssl/s23_clnt.c index 96b9ac9429..1078bc0155 100644 --- a/src/lib/libssl/src/ssl/s23_clnt.c +++ b/src/lib/libssl/src/ssl/s23_clnt.c
@@ -1,4 +1,4 @@
1	/* $OpenBSD: s23_clnt.c,v 1.44 2015/09/02 17:53:54 jsing Exp $ */	1	/* $OpenBSD: s23_clnt.c,v 1.45 2015/09/11 14:39:05 jsing Exp $ */
2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)	2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3	* All rights reserved.	3	* All rights reserved.
4	*	4	*
@@ -117,60 +117,9 @@
117	#include <openssl/evp.h>	117	#include <openssl/evp.h>
118	#include <openssl/objects.h>	118	#include <openssl/objects.h>
119		119
120	static const SSL_METHOD *ssl23_get_client_method(int ver);
121	static int ssl23_client_hello(SSL *s);	120	static int ssl23_client_hello(SSL *s);
122	static int ssl23_get_server_hello(SSL *s);	121	static int ssl23_get_server_hello(SSL *s);
123		122
124	const SSL_METHOD SSLv23_client_method_data = {
125	.version = TLS1_2_VERSION,
126	.ssl_new = tls1_new,
127	.ssl_clear = tls1_clear,
128	.ssl_free = tls1_free,
129	.ssl_accept = ssl_undefined_function,
130	.ssl_connect = ssl23_connect,
131	.ssl_read = ssl23_read,
132	.ssl_peek = ssl23_peek,
133	.ssl_write = ssl23_write,
134	.ssl_shutdown = ssl_undefined_function,
135	.ssl_renegotiate = ssl_undefined_function,
136	.ssl_renegotiate_check = ssl_ok,
137	.ssl_get_message = ssl3_get_message,
138	.ssl_read_bytes = ssl3_read_bytes,
139	.ssl_write_bytes = ssl3_write_bytes,
140	.ssl_dispatch_alert = ssl3_dispatch_alert,
141	.ssl_ctrl = ssl3_ctrl,
142	.ssl_ctx_ctrl = ssl3_ctx_ctrl,
143	.get_cipher_by_char = ssl3_get_cipher_by_char,
144	.put_cipher_by_char = ssl3_put_cipher_by_char,
145	.ssl_pending = ssl_undefined_const_function,
146	.num_ciphers = ssl3_num_ciphers,
147	.get_cipher = ssl3_get_cipher,
148	.get_ssl_method = ssl23_get_client_method,
149	.get_timeout = ssl23_default_timeout,
150	.ssl3_enc = &ssl3_undef_enc_method,
151	.ssl_version = ssl_undefined_void_function,
152	.ssl_callback_ctrl = ssl3_callback_ctrl,
153	.ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
154	};
155
156	const SSL_METHOD *
157	SSLv23_client_method(void)
158	{
159	return &SSLv23_client_method_data;
160	}
161
162	static const SSL_METHOD *
163	ssl23_get_client_method(int ver)
164	{
165	if (ver == TLS1_VERSION)
166	return (TLSv1_client_method());
167	if (ver == TLS1_1_VERSION)
168	return (TLSv1_1_client_method());
169	if (ver == TLS1_2_VERSION)
170	return (TLSv1_2_client_method());
171	return (NULL);
172	}
173
174	int	123	int
175	ssl23_connect(SSL *s)	124	ssl23_connect(SSL *s)
176	{	125	{
@@ -529,9 +478,3 @@ ssl23_get_server_hello(SSL *s)
529	err:	478	err:
530	return (-1);	479	return (-1);
531	}	480	}
532
533	const SSL_METHOD *
534	TLS_client_method(void)
535	{
536	return &SSLv23_client_method_data;
537	}


diff --git a/src/lib/libssl/src/ssl/t1_clnt.c b/src/lib/libssl/src/ssl/t1_clnt.c index 0dc41af5b3..0853a3cb33 100644 --- a/src/lib/libssl/src/ssl/t1_clnt.c +++ b/src/lib/libssl/src/ssl/t1_clnt.c
@@ -1,4 +1,4 @@
1	/* $OpenBSD: t1_clnt.c,v 1.17 2015/02/06 08:30:23 jsing Exp $ */	1	/* $OpenBSD: t1_clnt.c,v 1.18 2015/09/11 14:39:05 jsing Exp $ */
2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)	2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3	* All rights reserved.	3	* All rights reserved.
4	*	4	*
@@ -66,6 +66,38 @@
66		66
67	static const SSL_METHOD *tls1_get_client_method(int ver);	67	static const SSL_METHOD *tls1_get_client_method(int ver);
68		68
		69	const SSL_METHOD TLS_client_method_data = {
		70	.version = TLS1_2_VERSION,
		71	.ssl_new = tls1_new,
		72	.ssl_clear = tls1_clear,
		73	.ssl_free = tls1_free,
		74	.ssl_accept = ssl_undefined_function,
		75	.ssl_connect = ssl23_connect,
		76	.ssl_read = ssl23_read,
		77	.ssl_peek = ssl23_peek,
		78	.ssl_write = ssl23_write,
		79	.ssl_shutdown = ssl_undefined_function,
		80	.ssl_renegotiate = ssl_undefined_function,
		81	.ssl_renegotiate_check = ssl_ok,
		82	.ssl_get_message = ssl3_get_message,
		83	.ssl_read_bytes = ssl3_read_bytes,
		84	.ssl_write_bytes = ssl3_write_bytes,
		85	.ssl_dispatch_alert = ssl3_dispatch_alert,
		86	.ssl_ctrl = ssl3_ctrl,
		87	.ssl_ctx_ctrl = ssl3_ctx_ctrl,
		88	.get_cipher_by_char = ssl3_get_cipher_by_char,
		89	.put_cipher_by_char = ssl3_put_cipher_by_char,
		90	.ssl_pending = ssl_undefined_const_function,
		91	.num_ciphers = ssl3_num_ciphers,
		92	.get_cipher = ssl3_get_cipher,
		93	.get_ssl_method = tls1_get_client_method,
		94	.get_timeout = ssl23_default_timeout,
		95	.ssl3_enc = &ssl3_undef_enc_method,
		96	.ssl_version = ssl_undefined_void_function,
		97	.ssl_callback_ctrl = ssl3_callback_ctrl,
		98	.ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
		99	};
		100
69	const SSL_METHOD TLSv1_client_method_data = {	101	const SSL_METHOD TLSv1_client_method_data = {
70	.version = TLS1_VERSION,	102	.version = TLS1_VERSION,
71	.ssl_new = tls1_new,	103	.ssl_new = tls1_new,
@@ -162,32 +194,44 @@ const SSL_METHOD TLSv1_2_client_method_data = {
162	.ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,	194	.ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
163	};	195	};
164		196
		197	static const SSL_METHOD *
		198	tls1_get_client_method(int ver)
		199	{
		200	if (ver == TLS1_2_VERSION)
		201	return (TLSv1_2_client_method());
		202	if (ver == TLS1_1_VERSION)
		203	return (TLSv1_1_client_method());
		204	if (ver == TLS1_VERSION)
		205	return (TLSv1_client_method());
		206	return (NULL);
		207	}
		208
165	const SSL_METHOD *	209	const SSL_METHOD *
166	TLSv1_client_method(void)	210	SSLv23_client_method(void)
167	{	211	{
168	return &TLSv1_client_method_data;	212	return (TLS_client_method());
169	}	213	}
170		214
171	const SSL_METHOD *	215	const SSL_METHOD *
172	TLSv1_1_client_method(void)	216	TLS_client_method(void)
173	{	217	{
174	return &TLSv1_1_client_method_data;	218	return (&TLS_client_method_data);
175	}	219	}
176		220
177	const SSL_METHOD *	221	const SSL_METHOD *
178	TLSv1_2_client_method(void)	222	TLSv1_client_method(void)
179	{	223	{
180	return &TLSv1_2_client_method_data;	224	return (&TLSv1_client_method_data);
181	}	225	}
182		226
183	static const SSL_METHOD *	227	const SSL_METHOD *
184	tls1_get_client_method(int ver)	228	TLSv1_1_client_method(void)
185	{	229	{
186	if (ver == TLS1_2_VERSION)	230	return (&TLSv1_1_client_method_data);
187	return (TLSv1_2_client_method());	231	}
188	if (ver == TLS1_1_VERSION)	232
189	return (TLSv1_1_client_method());	233	const SSL_METHOD *
190	if (ver == TLS1_VERSION)	234	TLSv1_2_client_method(void)
191	return (TLSv1_client_method());	235	{
192	return (NULL);	236	return (&TLSv1_2_client_method_data);
193	}	237	}


diff --git a/src/lib/libssl/t1_clnt.c b/src/lib/libssl/t1_clnt.c index 0dc41af5b3..0853a3cb33 100644 --- a/src/lib/libssl/t1_clnt.c +++ b/src/lib/libssl/t1_clnt.c
@@ -1,4 +1,4 @@
1	/* $OpenBSD: t1_clnt.c,v 1.17 2015/02/06 08:30:23 jsing Exp $ */	1	/* $OpenBSD: t1_clnt.c,v 1.18 2015/09/11 14:39:05 jsing Exp $ */
2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)	2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3	* All rights reserved.	3	* All rights reserved.
4	*	4	*
@@ -66,6 +66,38 @@
66		66
67	static const SSL_METHOD *tls1_get_client_method(int ver);	67	static const SSL_METHOD *tls1_get_client_method(int ver);
68		68
		69	const SSL_METHOD TLS_client_method_data = {
		70	.version = TLS1_2_VERSION,
		71	.ssl_new = tls1_new,
		72	.ssl_clear = tls1_clear,
		73	.ssl_free = tls1_free,
		74	.ssl_accept = ssl_undefined_function,
		75	.ssl_connect = ssl23_connect,
		76	.ssl_read = ssl23_read,
		77	.ssl_peek = ssl23_peek,
		78	.ssl_write = ssl23_write,
		79	.ssl_shutdown = ssl_undefined_function,
		80	.ssl_renegotiate = ssl_undefined_function,
		81	.ssl_renegotiate_check = ssl_ok,
		82	.ssl_get_message = ssl3_get_message,
		83	.ssl_read_bytes = ssl3_read_bytes,
		84	.ssl_write_bytes = ssl3_write_bytes,
		85	.ssl_dispatch_alert = ssl3_dispatch_alert,
		86	.ssl_ctrl = ssl3_ctrl,
		87	.ssl_ctx_ctrl = ssl3_ctx_ctrl,
		88	.get_cipher_by_char = ssl3_get_cipher_by_char,
		89	.put_cipher_by_char = ssl3_put_cipher_by_char,
		90	.ssl_pending = ssl_undefined_const_function,
		91	.num_ciphers = ssl3_num_ciphers,
		92	.get_cipher = ssl3_get_cipher,
		93	.get_ssl_method = tls1_get_client_method,
		94	.get_timeout = ssl23_default_timeout,
		95	.ssl3_enc = &ssl3_undef_enc_method,
		96	.ssl_version = ssl_undefined_void_function,
		97	.ssl_callback_ctrl = ssl3_callback_ctrl,
		98	.ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
		99	};
		100
69	const SSL_METHOD TLSv1_client_method_data = {	101	const SSL_METHOD TLSv1_client_method_data = {
70	.version = TLS1_VERSION,	102	.version = TLS1_VERSION,
71	.ssl_new = tls1_new,	103	.ssl_new = tls1_new,
@@ -162,32 +194,44 @@ const SSL_METHOD TLSv1_2_client_method_data = {
162	.ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,	194	.ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
163	};	195	};
164		196
		197	static const SSL_METHOD *
		198	tls1_get_client_method(int ver)
		199	{
		200	if (ver == TLS1_2_VERSION)
		201	return (TLSv1_2_client_method());
		202	if (ver == TLS1_1_VERSION)
		203	return (TLSv1_1_client_method());
		204	if (ver == TLS1_VERSION)
		205	return (TLSv1_client_method());
		206	return (NULL);
		207	}
		208
165	const SSL_METHOD *	209	const SSL_METHOD *
166	TLSv1_client_method(void)	210	SSLv23_client_method(void)
167	{	211	{
168	return &TLSv1_client_method_data;	212	return (TLS_client_method());
169	}	213	}
170		214
171	const SSL_METHOD *	215	const SSL_METHOD *
172	TLSv1_1_client_method(void)	216	TLS_client_method(void)
173	{	217	{
174	return &TLSv1_1_client_method_data;	218	return (&TLS_client_method_data);
175	}	219	}
176		220
177	const SSL_METHOD *	221	const SSL_METHOD *
178	TLSv1_2_client_method(void)	222	TLSv1_client_method(void)
179	{	223	{
180	return &TLSv1_2_client_method_data;	224	return (&TLSv1_client_method_data);
181	}	225	}
182		226
183	static const SSL_METHOD *	227	const SSL_METHOD *
184	tls1_get_client_method(int ver)	228	TLSv1_1_client_method(void)
185	{	229	{
186	if (ver == TLS1_2_VERSION)	230	return (&TLSv1_1_client_method_data);
187	return (TLSv1_2_client_method());	231	}
188	if (ver == TLS1_1_VERSION)	232
189	return (TLSv1_1_client_method());	233	const SSL_METHOD *
190	if (ver == TLS1_VERSION)	234	TLSv1_2_client_method(void)
191	return (TLSv1_client_method());	235	{
192	return (NULL);	236	return (&TLSv1_2_client_method_data);
193	}	237	}