summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoug <>2015-07-19 07:30:06 +0000
committerdoug <>2015-07-19 07:30:06 +0000
commit11e1a704b0141f0bc09002ae44c62941ba74c537 (patch)
tree7abb60146170f61e7ffb17add50d04eecb4269ac
parent915e1bd09b87e5d7402cab53ddc89bd039968fd4 (diff)
downloadopenbsd-11e1a704b0141f0bc09002ae44c62941ba74c537.tar.gz
openbsd-11e1a704b0141f0bc09002ae44c62941ba74c537.tar.bz2
openbsd-11e1a704b0141f0bc09002ae44c62941ba74c537.zip
Fix symbol collision with libtls.
Pointed out by guenther. ok guenther@
Diffstat
-rw-r--r--src/lib/libssl/s23_clnt.c12
-rw-r--r--src/lib/libssl/s23_srvr.c12
-rw-r--r--src/lib/libssl/src/ssl/s23_clnt.c12
-rw-r--r--src/lib/libssl/src/ssl/s23_meth.c12
-rw-r--r--src/lib/libssl/src/ssl/s23_srvr.c12
-rw-r--r--src/lib/libssl/src/ssl/ssl_locl.h6
-rw-r--r--src/lib/libssl/ssl_locl.h6
7 files changed, 36 insertions, 36 deletions
diff --git a/src/lib/libssl/s23_clnt.c b/src/lib/libssl/s23_clnt.c
index 00954777fc..458eb37d5f 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.39 2015/07/19 06:31:32 doug Exp $ */ 1/* $OpenBSD: s23_clnt.c,v 1.40 2015/07/19 07:30:06 doug 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 *
@@ -120,7 +120,7 @@
120static const SSL_METHOD *ssl23_get_client_method(int ver); 120static const SSL_METHOD *ssl23_get_client_method(int ver);
121static int ssl23_client_hello(SSL *s); 121static int ssl23_client_hello(SSL *s);
122static int ssl23_get_server_hello(SSL *s); 122static int ssl23_get_server_hello(SSL *s);
123static const SSL_METHOD *tls_get_client_method(int ver); 123static const SSL_METHOD *tls_any_get_client_method(int ver);
124 124
125const SSL_METHOD SSLv23_client_method_data = { 125const SSL_METHOD SSLv23_client_method_data = {
126 .version = TLS1_2_VERSION, 126 .version = TLS1_2_VERSION,
@@ -160,7 +160,7 @@ const SSL_METHOD TLS_client_method_data = {
160 .ssl_clear = tls1_clear, 160 .ssl_clear = tls1_clear,
161 .ssl_free = tls1_free, 161 .ssl_free = tls1_free,
162 .ssl_accept = ssl_undefined_function, 162 .ssl_accept = ssl_undefined_function,
163 .ssl_connect = tls_connect, 163 .ssl_connect = tls_any_connect,
164 .ssl_read = ssl23_read, 164 .ssl_read = ssl23_read,
165 .ssl_peek = ssl23_peek, 165 .ssl_peek = ssl23_peek,
166 .ssl_write = ssl23_write, 166 .ssl_write = ssl23_write,
@@ -178,7 +178,7 @@ const SSL_METHOD TLS_client_method_data = {
178 .ssl_pending = ssl_undefined_const_function, 178 .ssl_pending = ssl_undefined_const_function,
179 .num_ciphers = ssl3_num_ciphers, 179 .num_ciphers = ssl3_num_ciphers,
180 .get_cipher = ssl3_get_cipher, 180 .get_cipher = ssl3_get_cipher,
181 .get_ssl_method = tls_get_client_method, 181 .get_ssl_method = tls_any_get_client_method,
182 .get_timeout = ssl23_default_timeout, 182 .get_timeout = ssl23_default_timeout,
183 .ssl3_enc = &ssl3_undef_enc_method, 183 .ssl3_enc = &ssl3_undef_enc_method,
184 .ssl_version = ssl_undefined_void_function, 184 .ssl_version = ssl_undefined_void_function,
@@ -586,7 +586,7 @@ TLS_client_method(void)
586} 586}
587 587
588static const SSL_METHOD * 588static const SSL_METHOD *
589tls_get_client_method(int ver) 589tls_any_get_client_method(int ver)
590{ 590{
591 if (ver == SSL3_VERSION) 591 if (ver == SSL3_VERSION)
592 return (NULL); 592 return (NULL);
@@ -595,7 +595,7 @@ tls_get_client_method(int ver)
595} 595}
596 596
597int 597int
598tls_connect(SSL *s) 598tls_any_connect(SSL *s)
599{ 599{
600 int ret; 600 int ret;
601 unsigned long old_options; 601 unsigned long old_options;
diff --git a/src/lib/libssl/s23_srvr.c b/src/lib/libssl/s23_srvr.c
index f1914e0e8e..b524124681 100644
--- a/src/lib/libssl/s23_srvr.c
+++ b/src/lib/libssl/s23_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s23_srvr.c,v 1.40 2015/07/19 06:31:32 doug Exp $ */ 1/* $OpenBSD: s23_srvr.c,v 1.41 2015/07/19 07:30:06 doug 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 *
@@ -119,7 +119,7 @@
119 119
120static const SSL_METHOD *ssl23_get_server_method(int ver); 120static const SSL_METHOD *ssl23_get_server_method(int ver);
121int ssl23_get_client_hello(SSL *s); 121int ssl23_get_client_hello(SSL *s);
122static const SSL_METHOD *tls_get_server_method(int ver); 122static const SSL_METHOD *tls_any_get_server_method(int ver);
123 123
124const SSL_METHOD SSLv23_server_method_data = { 124const SSL_METHOD SSLv23_server_method_data = {
125 .version = TLS1_2_VERSION, 125 .version = TLS1_2_VERSION,
@@ -158,7 +158,7 @@ const SSL_METHOD TLS_server_method_data = {
158 .ssl_new = tls1_new, 158 .ssl_new = tls1_new,
159 .ssl_clear = tls1_clear, 159 .ssl_clear = tls1_clear,
160 .ssl_free = tls1_free, 160 .ssl_free = tls1_free,
161 .ssl_accept = tls_accept, 161 .ssl_accept = tls_any_accept,
162 .ssl_connect = ssl_undefined_function, 162 .ssl_connect = ssl_undefined_function,
163 .ssl_read = ssl23_read, 163 .ssl_read = ssl23_read,
164 .ssl_peek = ssl23_peek, 164 .ssl_peek = ssl23_peek,
@@ -177,7 +177,7 @@ const SSL_METHOD TLS_server_method_data = {
177 .ssl_pending = ssl_undefined_const_function, 177 .ssl_pending = ssl_undefined_const_function,
178 .num_ciphers = ssl3_num_ciphers, 178 .num_ciphers = ssl3_num_ciphers,
179 .get_cipher = ssl3_get_cipher, 179 .get_cipher = ssl3_get_cipher,
180 .get_ssl_method = tls_get_server_method, 180 .get_ssl_method = tls_any_get_server_method,
181 .get_timeout = ssl23_default_timeout, 181 .get_timeout = ssl23_default_timeout,
182 .ssl3_enc = &ssl3_undef_enc_method, 182 .ssl3_enc = &ssl3_undef_enc_method,
183 .ssl_version = ssl_undefined_void_function, 183 .ssl_version = ssl_undefined_void_function,
@@ -611,7 +611,7 @@ TLS_server_method(void)
611} 611}
612 612
613static const SSL_METHOD * 613static const SSL_METHOD *
614tls_get_server_method(int ver) 614tls_any_get_server_method(int ver)
615{ 615{
616 if (ver == SSL3_VERSION) 616 if (ver == SSL3_VERSION)
617 return (NULL); 617 return (NULL);
@@ -620,7 +620,7 @@ tls_get_server_method(int ver)
620} 620}
621 621
622int 622int
623tls_accept(SSL *s) 623tls_any_accept(SSL *s)
624{ 624{
625 int ret; 625 int ret;
626 unsigned long old_options; 626 unsigned long old_options;
diff --git a/src/lib/libssl/src/ssl/s23_clnt.c b/src/lib/libssl/src/ssl/s23_clnt.c
index 00954777fc..458eb37d5f 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.39 2015/07/19 06:31:32 doug Exp $ */ 1/* $OpenBSD: s23_clnt.c,v 1.40 2015/07/19 07:30:06 doug 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 *
@@ -120,7 +120,7 @@
120static const SSL_METHOD *ssl23_get_client_method(int ver); 120static const SSL_METHOD *ssl23_get_client_method(int ver);
121static int ssl23_client_hello(SSL *s); 121static int ssl23_client_hello(SSL *s);
122static int ssl23_get_server_hello(SSL *s); 122static int ssl23_get_server_hello(SSL *s);
123static const SSL_METHOD *tls_get_client_method(int ver); 123static const SSL_METHOD *tls_any_get_client_method(int ver);
124 124
125const SSL_METHOD SSLv23_client_method_data = { 125const SSL_METHOD SSLv23_client_method_data = {
126 .version = TLS1_2_VERSION, 126 .version = TLS1_2_VERSION,
@@ -160,7 +160,7 @@ const SSL_METHOD TLS_client_method_data = {
160 .ssl_clear = tls1_clear, 160 .ssl_clear = tls1_clear,
161 .ssl_free = tls1_free, 161 .ssl_free = tls1_free,
162 .ssl_accept = ssl_undefined_function, 162 .ssl_accept = ssl_undefined_function,
163 .ssl_connect = tls_connect, 163 .ssl_connect = tls_any_connect,
164 .ssl_read = ssl23_read, 164 .ssl_read = ssl23_read,
165 .ssl_peek = ssl23_peek, 165 .ssl_peek = ssl23_peek,
166 .ssl_write = ssl23_write, 166 .ssl_write = ssl23_write,
@@ -178,7 +178,7 @@ const SSL_METHOD TLS_client_method_data = {
178 .ssl_pending = ssl_undefined_const_function, 178 .ssl_pending = ssl_undefined_const_function,
179 .num_ciphers = ssl3_num_ciphers, 179 .num_ciphers = ssl3_num_ciphers,
180 .get_cipher = ssl3_get_cipher, 180 .get_cipher = ssl3_get_cipher,
181 .get_ssl_method = tls_get_client_method, 181 .get_ssl_method = tls_any_get_client_method,
182 .get_timeout = ssl23_default_timeout, 182 .get_timeout = ssl23_default_timeout,
183 .ssl3_enc = &ssl3_undef_enc_method, 183 .ssl3_enc = &ssl3_undef_enc_method,
184 .ssl_version = ssl_undefined_void_function, 184 .ssl_version = ssl_undefined_void_function,
@@ -586,7 +586,7 @@ TLS_client_method(void)
586} 586}
587 587
588static const SSL_METHOD * 588static const SSL_METHOD *
589tls_get_client_method(int ver) 589tls_any_get_client_method(int ver)
590{ 590{
591 if (ver == SSL3_VERSION) 591 if (ver == SSL3_VERSION)
592 return (NULL); 592 return (NULL);
@@ -595,7 +595,7 @@ tls_get_client_method(int ver)
595} 595}
596 596
597int 597int
598tls_connect(SSL *s) 598tls_any_connect(SSL *s)
599{ 599{
600 int ret; 600 int ret;
601 unsigned long old_options; 601 unsigned long old_options;
diff --git a/src/lib/libssl/src/ssl/s23_meth.c b/src/lib/libssl/src/ssl/s23_meth.c
index 93a398d70b..04152eda41 100644
--- a/src/lib/libssl/src/ssl/s23_meth.c
+++ b/src/lib/libssl/src/ssl/s23_meth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s23_meth.c,v 1.18 2015/07/19 06:31:32 doug Exp $ */ 1/* $OpenBSD: s23_meth.c,v 1.19 2015/07/19 07:30:06 doug 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 *
@@ -63,7 +63,7 @@
63#include "ssl_locl.h" 63#include "ssl_locl.h"
64 64
65static const SSL_METHOD *ssl23_get_method(int ver); 65static const SSL_METHOD *ssl23_get_method(int ver);
66static const SSL_METHOD *tls_get_method(int ver); 66static const SSL_METHOD *tls_any_get_method(int ver);
67 67
68const SSL_METHOD SSLv23_method_data = { 68const SSL_METHOD SSLv23_method_data = {
69 .version = TLS1_2_VERSION, 69 .version = TLS1_2_VERSION,
@@ -122,8 +122,8 @@ const SSL_METHOD TLS_method_data = {
122 .ssl_new = tls1_new, 122 .ssl_new = tls1_new,
123 .ssl_clear = tls1_clear, 123 .ssl_clear = tls1_clear,
124 .ssl_free = tls1_free, 124 .ssl_free = tls1_free,
125 .ssl_accept = tls_accept, 125 .ssl_accept = tls_any_accept,
126 .ssl_connect = tls_connect, 126 .ssl_connect = tls_any_connect,
127 .ssl_read = ssl23_read, 127 .ssl_read = ssl23_read,
128 .ssl_peek = ssl23_peek, 128 .ssl_peek = ssl23_peek,
129 .ssl_write = ssl23_write, 129 .ssl_write = ssl23_write,
@@ -141,7 +141,7 @@ const SSL_METHOD TLS_method_data = {
141 .ssl_pending = ssl_undefined_const_function, 141 .ssl_pending = ssl_undefined_const_function,
142 .num_ciphers = ssl3_num_ciphers, 142 .num_ciphers = ssl3_num_ciphers,
143 .get_cipher = ssl3_get_cipher, 143 .get_cipher = ssl3_get_cipher,
144 .get_ssl_method = tls_get_method, 144 .get_ssl_method = tls_any_get_method,
145 .get_timeout = ssl23_default_timeout, 145 .get_timeout = ssl23_default_timeout,
146 .ssl3_enc = &ssl3_undef_enc_method, 146 .ssl3_enc = &ssl3_undef_enc_method,
147 .ssl_version = ssl_undefined_void_function, 147 .ssl_version = ssl_undefined_void_function,
@@ -156,7 +156,7 @@ TLS_method(void)
156} 156}
157 157
158static const SSL_METHOD * 158static const SSL_METHOD *
159tls_get_method(int ver) 159tls_any_get_method(int ver)
160{ 160{
161 if (ver == SSL3_VERSION) 161 if (ver == SSL3_VERSION)
162 return (NULL); 162 return (NULL);
diff --git a/src/lib/libssl/src/ssl/s23_srvr.c b/src/lib/libssl/src/ssl/s23_srvr.c
index f1914e0e8e..b524124681 100644
--- a/src/lib/libssl/src/ssl/s23_srvr.c
+++ b/src/lib/libssl/src/ssl/s23_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s23_srvr.c,v 1.40 2015/07/19 06:31:32 doug Exp $ */ 1/* $OpenBSD: s23_srvr.c,v 1.41 2015/07/19 07:30:06 doug 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 *
@@ -119,7 +119,7 @@
119 119
120static const SSL_METHOD *ssl23_get_server_method(int ver); 120static const SSL_METHOD *ssl23_get_server_method(int ver);
121int ssl23_get_client_hello(SSL *s); 121int ssl23_get_client_hello(SSL *s);
122static const SSL_METHOD *tls_get_server_method(int ver); 122static const SSL_METHOD *tls_any_get_server_method(int ver);
123 123
124const SSL_METHOD SSLv23_server_method_data = { 124const SSL_METHOD SSLv23_server_method_data = {
125 .version = TLS1_2_VERSION, 125 .version = TLS1_2_VERSION,
@@ -158,7 +158,7 @@ const SSL_METHOD TLS_server_method_data = {
158 .ssl_new = tls1_new, 158 .ssl_new = tls1_new,
159 .ssl_clear = tls1_clear, 159 .ssl_clear = tls1_clear,
160 .ssl_free = tls1_free, 160 .ssl_free = tls1_free,
161 .ssl_accept = tls_accept, 161 .ssl_accept = tls_any_accept,
162 .ssl_connect = ssl_undefined_function, 162 .ssl_connect = ssl_undefined_function,
163 .ssl_read = ssl23_read, 163 .ssl_read = ssl23_read,
164 .ssl_peek = ssl23_peek, 164 .ssl_peek = ssl23_peek,
@@ -177,7 +177,7 @@ const SSL_METHOD TLS_server_method_data = {
177 .ssl_pending = ssl_undefined_const_function, 177 .ssl_pending = ssl_undefined_const_function,
178 .num_ciphers = ssl3_num_ciphers, 178 .num_ciphers = ssl3_num_ciphers,
179 .get_cipher = ssl3_get_cipher, 179 .get_cipher = ssl3_get_cipher,
180 .get_ssl_method = tls_get_server_method, 180 .get_ssl_method = tls_any_get_server_method,
181 .get_timeout = ssl23_default_timeout, 181 .get_timeout = ssl23_default_timeout,
182 .ssl3_enc = &ssl3_undef_enc_method, 182 .ssl3_enc = &ssl3_undef_enc_method,
183 .ssl_version = ssl_undefined_void_function, 183 .ssl_version = ssl_undefined_void_function,
@@ -611,7 +611,7 @@ TLS_server_method(void)
611} 611}
612 612
613static const SSL_METHOD * 613static const SSL_METHOD *
614tls_get_server_method(int ver) 614tls_any_get_server_method(int ver)
615{ 615{
616 if (ver == SSL3_VERSION) 616 if (ver == SSL3_VERSION)
617 return (NULL); 617 return (NULL);
@@ -620,7 +620,7 @@ tls_get_server_method(int ver)
620} 620}
621 621
622int 622int
623tls_accept(SSL *s) 623tls_any_accept(SSL *s)
624{ 624{
625 int ret; 625 int ret;
626 unsigned long old_options; 626 unsigned long old_options;
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h
index 1c78770dfa..d05ef600e5 100644
--- a/src/lib/libssl/src/ssl/ssl_locl.h
+++ b/src/lib/libssl/src/ssl/ssl_locl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_locl.h,v 1.98 2015/07/19 06:31:32 doug Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.99 2015/07/19 07:30:06 doug 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 *
@@ -757,8 +757,8 @@ int ssl23_accept(SSL *s);
757int ssl23_connect(SSL *s); 757int ssl23_connect(SSL *s);
758int ssl23_read_bytes(SSL *s, int n); 758int ssl23_read_bytes(SSL *s, int n);
759int ssl23_write_bytes(SSL *s); 759int ssl23_write_bytes(SSL *s);
760int tls_accept(SSL *s); 760int tls_any_accept(SSL *s);
761int tls_connect(SSL *s); 761int tls_any_connect(SSL *s);
762 762
763int tls1_new(SSL *s); 763int tls1_new(SSL *s);
764void tls1_free(SSL *s); 764void tls1_free(SSL *s);
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 1c78770dfa..d05ef600e5 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_locl.h,v 1.98 2015/07/19 06:31:32 doug Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.99 2015/07/19 07:30:06 doug 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 *
@@ -757,8 +757,8 @@ int ssl23_accept(SSL *s);
757int ssl23_connect(SSL *s); 757int ssl23_connect(SSL *s);
758int ssl23_read_bytes(SSL *s, int n); 758int ssl23_read_bytes(SSL *s, int n);
759int ssl23_write_bytes(SSL *s); 759int ssl23_write_bytes(SSL *s);
760int tls_accept(SSL *s); 760int tls_any_accept(SSL *s);
761int tls_connect(SSL *s); 761int tls_any_connect(SSL *s);
762 762
763int tls1_new(SSL *s); 763int tls1_new(SSL *s);
764void tls1_free(SSL *s); 764void tls1_free(SSL *s);
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-20 19:40:46 +0000