From 28014cb4f29ca235dbb12bc0cef601e1500977ef Mon Sep 17 00:00:00 2001
From: David Benjamin <davidben@chromium.org>
Date: Thu, 11 Dec 2014 01:30:25 -0500
Subject: [PATCH] Remove s_accept and s_connect parameters IMPLEMENT* macros.

They're always known now. Also fix the SSLv23_{client,server}_method
definitions still had their own macro invocations.

Change-Id: Ia13f29a27f2331d25a4051e83f2d5abc62fab981
Reviewed-on: https://boringssl-review.googlesource.com/2562
Reviewed-by: Adam Langley <agl@google.com>
---
 ssl/d1_meth.c  | 18 +++---------------
 ssl/s23_clnt.c |  4 ----
 ssl/s23_meth.c | 14 +++++++++++---
 ssl/s23_srvr.c |  4 ----
 ssl/s3_meth.c  | 20 ++++----------------
 ssl/ssl_locl.h | 20 +++++++++-----------
 6 files changed, 27 insertions(+), 53 deletions(-)

diff --git a/ssl/d1_meth.c b/ssl/d1_meth.c
index 15b289214..b2b9a75bb 100644
--- a/ssl/d1_meth.c
+++ b/ssl/d1_meth.c
@@ -58,23 +58,11 @@
 #include "ssl_locl.h"
 
 
-IMPLEMENT_dtls1_meth_func(DTLS1_VERSION,
-			DTLSv1_method,
-			dtls1_accept,
-			dtls1_connect,
-			DTLSv1_enc_data)
+IMPLEMENT_dtls1_meth_func(DTLS1_VERSION, DTLSv1_method, DTLSv1_enc_data)
 
-IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION,
-			DTLSv1_2_method,
-			dtls1_accept,
-			dtls1_connect,
-			DTLSv1_2_enc_data)
+IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION, DTLSv1_2_method, DTLSv1_2_enc_data)
 
-IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION,
-			DTLS_method,
-			dtls1_accept,
-			dtls1_connect,
-			DTLSv1_2_enc_data)
+IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION, DTLS_method, DTLSv1_2_enc_data)
 
 const SSL_METHOD *DTLSv1_2_server_method(void)
 	{
diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c
index cc1b41b9d..a181ec68b 100644
--- a/ssl/s23_clnt.c
+++ b/ssl/s23_clnt.c
@@ -120,10 +120,6 @@
 static int ssl23_client_hello(SSL *s);
 static int ssl23_get_server_hello(SSL *s);
 
-IMPLEMENT_ssl23_meth_func(SSLv23_client_method,
-			ssl23_accept,
-			ssl23_connect)
-
 int ssl23_connect(SSL *s)
 	{
 	BUF_MEM *buf=NULL;
diff --git a/ssl/s23_meth.c b/ssl/s23_meth.c
index 8f365997e..d019c54e4 100644
--- a/ssl/s23_meth.c
+++ b/ssl/s23_meth.c
@@ -58,6 +58,14 @@
 #include "ssl_locl.h"
 
 
-IMPLEMENT_ssl23_meth_func(SSLv23_method,
-			ssl23_accept,
-			ssl23_connect)
+IMPLEMENT_ssl23_meth_func(SSLv23_method)
+
+const SSL_METHOD *SSLv23_server_method(void)
+	{
+	return SSLv23_method();
+	}
+
+const SSL_METHOD *SSLv23_client_method(void)
+	{
+	return SSLv23_method();
+	}
diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c
index 70e6961d6..20352897c 100644
--- a/ssl/s23_srvr.c
+++ b/ssl/s23_srvr.c
@@ -135,10 +135,6 @@ static const SSL_METHOD *ssl23_get_server_method(int ver)
 		return(NULL);
 	}
 
-IMPLEMENT_ssl23_meth_func(SSLv23_server_method,
-			ssl23_accept,
-			ssl23_connect)
-
 int ssl23_accept(SSL *s)
 	{
 	BUF_MEM *buf;
diff --git a/ssl/s3_meth.c b/ssl/s3_meth.c
index 7c061a2fd..3bdb7a7fc 100644
--- a/ssl/s3_meth.c
+++ b/ssl/s3_meth.c
@@ -58,25 +58,13 @@
 #include "ssl_locl.h"
 
 
-IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_method,
-			ssl3_accept,
-			ssl3_connect,
-			TLSv1_2_enc_data)
+IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_method, TLSv1_2_enc_data)
 
-IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_method,
-			ssl3_accept,
-			ssl3_connect,
-			TLSv1_1_enc_data)
+IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_method, TLSv1_1_enc_data)
 
-IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_method,
-			ssl3_accept,
-			ssl3_connect,
-			TLSv1_enc_data)
+IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_method, TLSv1_enc_data)
 
-IMPLEMENT_tls_meth_func(SSL3_VERSION, SSLv3_method,
-			ssl3_accept,
-			ssl3_connect,
-			SSLv3_enc_data)
+IMPLEMENT_tls_meth_func(SSL3_VERSION, SSLv3_method, SSLv3_enc_data)
 
 const SSL_METHOD *TLSv1_2_server_method(void)
 	{
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 00ba20299..1c8137068 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -644,8 +644,7 @@ extern const SSL3_ENC_METHOD SSLv3_enc_data;
 extern const SSL3_ENC_METHOD DTLSv1_enc_data;
 extern const SSL3_ENC_METHOD DTLSv1_2_enc_data;
 
-#define IMPLEMENT_tls_meth_func(version, func_name, s_accept, s_connect, \
-				enc_data) \
+#define IMPLEMENT_tls_meth_func(version, func_name, enc_data) \
 const SSL_METHOD *func_name(void)  \
 	{ \
 	static const SSL_METHOD func_name##_data= { \
@@ -653,8 +652,8 @@ const SSL_METHOD *func_name(void)  \
 		ssl3_new, \
 		ssl3_clear, \
 		ssl3_free, \
-		s_accept, \
-		s_connect, \
+		ssl3_accept, \
+		ssl3_connect, \
 		ssl3_read, \
 		ssl3_peek, \
 		ssl3_write, \
@@ -678,7 +677,7 @@ const SSL_METHOD *func_name(void)  \
 	return &func_name##_data; \
 	}
 
-#define IMPLEMENT_ssl23_meth_func(func_name, s_accept, s_connect) \
+#define IMPLEMENT_ssl23_meth_func(func_name) \
 const SSL_METHOD *func_name(void)  \
 	{ \
 	static const SSL_METHOD func_name##_data= { \
@@ -686,8 +685,8 @@ const SSL_METHOD *func_name(void)  \
 	ssl3_new, \
 	ssl3_clear, \
 	ssl3_free, \
-	s_accept, \
-	s_connect, \
+	ssl23_accept, \
+	ssl23_connect, \
 	ssl23_read, \
 	ssl23_peek, \
 	ssl23_write, \
@@ -711,8 +710,7 @@ const SSL_METHOD *func_name(void)  \
 	return &func_name##_data; \
 	}
 
-#define IMPLEMENT_dtls1_meth_func(version, func_name, s_accept, s_connect, \
-					enc_data) \
+#define IMPLEMENT_dtls1_meth_func(version, func_name, enc_data) \
 const SSL_METHOD *func_name(void)  \
 	{ \
 	static const SSL_METHOD func_name##_data= { \
@@ -720,8 +718,8 @@ const SSL_METHOD *func_name(void)  \
 		dtls1_new, \
 		dtls1_clear, \
 		dtls1_free, \
-		s_accept, \
-		s_connect, \
+		dtls1_accept, \
+		dtls1_connect, \
 		ssl3_read, \
 		ssl3_peek, \
 		ssl3_write, \