diff options
| author | David Benjamin <davidben@chromium.org> | 2014-12-11 09:30:25 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-12-14 01:29:45 +0300 |
| commit | 28014cb4f29ca235dbb12bc0cef601e1500977ef (patch) | |
| tree | 308782f87f6fc7769d935bf6ba4b64a19cca7219 /ssl/ssl_locl.h | |
| parent | 338fcafe763be2ba6e65f00e6a8c9b820e530fcc (diff) | |
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>
Diffstat (limited to 'ssl/ssl_locl.h')
| -rw-r--r-- | ssl/ssl_locl.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 00ba2029..1c813706 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, \ |