The *_method_data structures can be static

ok jsing@

6 files changed, 21 insertions, 21 deletions

diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c
index e018874f0d..d1372326b4 100644
--- a/src/lib/libssl/d1_clnt.c
+++ b/src/lib/libssl/d1_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_clnt.c,v 1.56 2016/03/11 07:08:45 mmcc Exp $ */
+/* $OpenBSD: d1_clnt.c,v 1.57 2016/11/04 18:30:21 guenther Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -130,7 +130,7 @@
 static const SSL_METHOD *dtls1_get_client_method(int ver);
 static int dtls1_get_hello_verify(SSL *s);
 
-const SSL_METHOD DTLSv1_client_method_data = {
+static const SSL_METHOD DTLSv1_client_method_data = {
         .version = DTLS1_VERSION,
         .ssl_new = dtls1_new,
         .ssl_clear = dtls1_clear,
diff --git a/src/lib/libssl/d1_meth.c b/src/lib/libssl/d1_meth.c
index 7f279a4f50..83917e336d 100644
--- a/src/lib/libssl/d1_meth.c
+++ b/src/lib/libssl/d1_meth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_meth.c,v 1.9 2015/02/06 08:30:23 jsing Exp $ */
+/* $OpenBSD: d1_meth.c,v 1.10 2016/11/04 18:30:21 guenther Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -65,7 +65,7 @@
 
 static const SSL_METHOD *dtls1_get_method(int ver);
 
-const SSL_METHOD DTLSv1_method_data = {
+static const SSL_METHOD DTLSv1_method_data = {
         .version = DTLS1_VERSION,
         .ssl_new = dtls1_new,
         .ssl_clear = dtls1_clear,
diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c
index f6664237ae..8027e44123 100644
--- a/src/lib/libssl/d1_srvr.c
+++ b/src/lib/libssl/d1_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_srvr.c,v 1.67 2015/09/13 09:20:19 jsing Exp $ */
+/* $OpenBSD: d1_srvr.c,v 1.68 2016/11/04 18:30:21 guenther Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -128,7 +128,7 @@
 static const SSL_METHOD *dtls1_get_server_method(int ver);
 static int dtls1_send_hello_verify_request(SSL *s);
 
-const SSL_METHOD DTLSv1_server_method_data = {
+static const SSL_METHOD DTLSv1_server_method_data = {
         .version = DTLS1_VERSION,
         .ssl_new = dtls1_new,
         .ssl_clear = dtls1_clear,
diff --git a/src/lib/libssl/t1_clnt.c b/src/lib/libssl/t1_clnt.c
index 0853a3cb33..9107f3976e 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.18 2015/09/11 14:39:05 jsing Exp $ */
+/* $OpenBSD: t1_clnt.c,v 1.19 2016/11/04 18:30:21 guenther Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -66,7 +66,7 @@
 
 static const SSL_METHOD *tls1_get_client_method(int ver);
 
-const SSL_METHOD TLS_client_method_data = {
+static const SSL_METHOD TLS_client_method_data = {
         .version = TLS1_2_VERSION,
         .ssl_new = tls1_new,
         .ssl_clear = tls1_clear,
@@ -98,7 +98,7 @@ const SSL_METHOD TLS_client_method_data = {
         .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
 };
 
-const SSL_METHOD TLSv1_client_method_data = {
+static const SSL_METHOD TLSv1_client_method_data = {
         .version = TLS1_VERSION,
         .ssl_new = tls1_new,
         .ssl_clear = tls1_clear,
@@ -130,7 +130,7 @@ const SSL_METHOD TLSv1_client_method_data = {
         .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
 };
 
-const SSL_METHOD TLSv1_1_client_method_data = {
+static const SSL_METHOD TLSv1_1_client_method_data = {
         .version = TLS1_1_VERSION,
         .ssl_new = tls1_new,
         .ssl_clear = tls1_clear,
@@ -162,7 +162,7 @@ const SSL_METHOD TLSv1_1_client_method_data = {
         .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
 };
 
-const SSL_METHOD TLSv1_2_client_method_data = {
+static const SSL_METHOD TLSv1_2_client_method_data = {
         .version = TLS1_2_VERSION,
         .ssl_new = tls1_new,
         .ssl_clear = tls1_clear,
diff --git a/src/lib/libssl/t1_meth.c b/src/lib/libssl/t1_meth.c
index aea4c04547..261ab192be 100644
--- a/src/lib/libssl/t1_meth.c
+++ b/src/lib/libssl/t1_meth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_meth.c,v 1.17 2015/09/11 14:52:17 jsing Exp $ */
+/* $OpenBSD: t1_meth.c,v 1.18 2016/11/04 18:30:21 guenther Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -64,7 +64,7 @@
 
 static const SSL_METHOD *tls1_get_method(int ver);
 
-const SSL_METHOD TLS_method_data = {
+static const SSL_METHOD TLS_method_data = {
         .version = TLS1_2_VERSION,
         .ssl_new = tls1_new,
         .ssl_clear = tls1_clear,
@@ -96,7 +96,7 @@ const SSL_METHOD TLS_method_data = {
         .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
 };
 
-const SSL_METHOD TLSv1_method_data = {
+static const SSL_METHOD TLSv1_method_data = {
         .version = TLS1_VERSION,
         .ssl_new = tls1_new,
         .ssl_clear = tls1_clear,
@@ -128,7 +128,7 @@ const SSL_METHOD TLSv1_method_data = {
         .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
 };
 
-const SSL_METHOD TLSv1_1_method_data = {
+static const SSL_METHOD TLSv1_1_method_data = {
         .version = TLS1_1_VERSION,
         .ssl_new = tls1_new,
         .ssl_clear = tls1_clear,
@@ -160,7 +160,7 @@ const SSL_METHOD TLSv1_1_method_data = {
         .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
 };
 
-const SSL_METHOD TLSv1_2_method_data = {
+static const SSL_METHOD TLSv1_2_method_data = {
         .version = TLS1_2_VERSION,
         .ssl_new = tls1_new,
         .ssl_clear = tls1_clear,
diff --git a/src/lib/libssl/t1_srvr.c b/src/lib/libssl/t1_srvr.c
index 902cd93cd7..74c73a4337 100644
--- a/src/lib/libssl/t1_srvr.c
+++ b/src/lib/libssl/t1_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_srvr.c,v 1.19 2015/09/11 14:47:56 jsing Exp $ */
+/* $OpenBSD: t1_srvr.c,v 1.20 2016/11/04 18:30:21 guenther Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -67,7 +67,7 @@
 
 static const SSL_METHOD *tls1_get_server_method(int ver);
 
-const SSL_METHOD TLS_server_method_data = {
+static const SSL_METHOD TLS_server_method_data = {
         .version = TLS1_2_VERSION,
         .ssl_new = tls1_new,
         .ssl_clear = tls1_clear,
@@ -99,7 +99,7 @@ const SSL_METHOD TLS_server_method_data = {
         .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
 };
 
-const SSL_METHOD TLSv1_server_method_data = {
+static const SSL_METHOD TLSv1_server_method_data = {
         .version = TLS1_VERSION,
         .ssl_new = tls1_new,
         .ssl_clear = tls1_clear,
@@ -131,7 +131,7 @@ const SSL_METHOD TLSv1_server_method_data = {
         .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
 };
 
-const SSL_METHOD TLSv1_1_server_method_data = {
+static const SSL_METHOD TLSv1_1_server_method_data = {
         .version = TLS1_1_VERSION,
         .ssl_new = tls1_new,
         .ssl_clear = tls1_clear,
@@ -163,7 +163,7 @@ const SSL_METHOD TLSv1_1_server_method_data = {
         .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
 };
 
-const SSL_METHOD TLSv1_2_server_method_data = {
+static const SSL_METHOD TLSv1_2_server_method_data = {
         .version = TLS1_2_VERSION,
         .ssl_new = tls1_new,
         .ssl_clear = tls1_clear,