diff options
| author | Emilia Kasper <emilia@openssl.org> | 2016-08-05 19:03:17 +0200 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2016-08-18 14:02:29 +0200 |
| commit | a230b26e0959dc5f072fbbdadcc9ed45e904c50c (patch) | |
| tree | 85a928954cdf2f564c574138bbcd786f1ab1101e /ssl/methods.c | |
| parent | Convert X509_REVOKED* functions to use const getters (diff) | |
| download | openssl-a230b26e0959dc5f072fbbdadcc9ed45e904c50c.tar.xz openssl-a230b26e0959dc5f072fbbdadcc9ed45e904c50c.zip | |
Indent ssl/
Run util/openssl-format-source on ssl/
Some comments and hand-formatted tables were fixed up
manually by disabling auto-formatting.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl/methods.c')
| -rw-r--r-- | ssl/methods.c | 108 |
1 files changed, 27 insertions, 81 deletions
diff --git a/ssl/methods.c b/ssl/methods.c index 7d27f9d8ff..c846143277 100644 --- a/ssl/methods.c +++ b/ssl/methods.c @@ -11,7 +11,7 @@ #include <openssl/objects.h> #include "ssl_locl.h" -/* +/*- * TLS/SSLv3 methods */ @@ -19,201 +19,148 @@ IMPLEMENT_tls_meth_func(TLS_ANY_VERSION, 0, 0, TLS_method, ossl_statem_accept, ossl_statem_connect, TLSv1_2_enc_data) - #ifndef OPENSSL_NO_TLS1_2_METHOD IMPLEMENT_tls_meth_func(TLS1_2_VERSION, 0, SSL_OP_NO_TLSv1_2, tlsv1_2_method, ossl_statem_accept, ossl_statem_connect, TLSv1_2_enc_data) #endif - #ifndef OPENSSL_NO_TLS1_1_METHOD IMPLEMENT_tls_meth_func(TLS1_1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_TLSv1_1, tlsv1_1_method, ossl_statem_accept, ossl_statem_connect, TLSv1_1_enc_data) #endif - #ifndef OPENSSL_NO_TLS1_METHOD IMPLEMENT_tls_meth_func(TLS1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_TLSv1, tlsv1_method, - ossl_statem_accept, - ossl_statem_connect, TLSv1_enc_data) + ossl_statem_accept, ossl_statem_connect, TLSv1_enc_data) #endif - #ifndef OPENSSL_NO_SSL3_METHOD IMPLEMENT_ssl3_meth_func(sslv3_method, ossl_statem_accept, ossl_statem_connect) #endif - - -/* +/*- * TLS/SSLv3 server methods */ - IMPLEMENT_tls_meth_func(TLS_ANY_VERSION, 0, 0, TLS_server_method, ossl_statem_accept, - ssl_undefined_function, - TLSv1_2_enc_data) - + ssl_undefined_function, TLSv1_2_enc_data) #ifndef OPENSSL_NO_TLS1_2_METHOD IMPLEMENT_tls_meth_func(TLS1_2_VERSION, 0, SSL_OP_NO_TLSv1_2, tlsv1_2_server_method, ossl_statem_accept, - ssl_undefined_function, - TLSv1_2_enc_data) + ssl_undefined_function, TLSv1_2_enc_data) #endif - #ifndef OPENSSL_NO_TLS1_1_METHOD IMPLEMENT_tls_meth_func(TLS1_1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_TLSv1_1, tlsv1_1_server_method, ossl_statem_accept, - ssl_undefined_function, - TLSv1_1_enc_data) + ssl_undefined_function, TLSv1_1_enc_data) #endif - #ifndef OPENSSL_NO_TLS1_METHOD IMPLEMENT_tls_meth_func(TLS1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_TLSv1, tlsv1_server_method, ossl_statem_accept, - ssl_undefined_function, - TLSv1_enc_data) + ssl_undefined_function, TLSv1_enc_data) #endif - #ifndef OPENSSL_NO_SSL3_METHOD IMPLEMENT_ssl3_meth_func(sslv3_server_method, - ossl_statem_accept, - ssl_undefined_function) + ossl_statem_accept, ssl_undefined_function) #endif - - -/* +/*- * TLS/SSLv3 client methods */ - IMPLEMENT_tls_meth_func(TLS_ANY_VERSION, 0, 0, TLS_client_method, ssl_undefined_function, - ossl_statem_connect, - TLSv1_2_enc_data) - + ossl_statem_connect, TLSv1_2_enc_data) #ifndef OPENSSL_NO_TLS1_2_METHOD IMPLEMENT_tls_meth_func(TLS1_2_VERSION, 0, SSL_OP_NO_TLSv1_2, tlsv1_2_client_method, ssl_undefined_function, - ossl_statem_connect, - TLSv1_2_enc_data) + ossl_statem_connect, TLSv1_2_enc_data) #endif - #ifndef OPENSSL_NO_TLS1_1_METHOD IMPLEMENT_tls_meth_func(TLS1_1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_TLSv1_1, tlsv1_1_client_method, ssl_undefined_function, - ossl_statem_connect, - TLSv1_1_enc_data) + ossl_statem_connect, TLSv1_1_enc_data) #endif - #ifndef OPENSSL_NO_TLS1_METHOD IMPLEMENT_tls_meth_func(TLS1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_TLSv1, tlsv1_client_method, ssl_undefined_function, - ossl_statem_connect, - TLSv1_enc_data) + ossl_statem_connect, TLSv1_enc_data) #endif - #ifndef OPENSSL_NO_SSL3_METHOD IMPLEMENT_ssl3_meth_func(sslv3_client_method, - ssl_undefined_function, - ossl_statem_connect) + ssl_undefined_function, ossl_statem_connect) #endif - - -/* +/*- * DTLS methods */ - #ifndef OPENSSL_NO_DTLS1_METHOD IMPLEMENT_dtls1_meth_func(DTLS1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_DTLSv1, dtlsv1_method, ossl_statem_accept, - ossl_statem_connect, - DTLSv1_enc_data) + ossl_statem_connect, DTLSv1_enc_data) #endif - #ifndef OPENSSL_NO_DTLS1_2_METHOD IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION, 0, SSL_OP_NO_DTLSv1_2, dtlsv1_2_method, ossl_statem_accept, - ossl_statem_connect, - DTLSv1_2_enc_data) + ossl_statem_connect, DTLSv1_2_enc_data) #endif - IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION, 0, 0, DTLS_method, ossl_statem_accept, - ossl_statem_connect, - DTLSv1_2_enc_data) + ossl_statem_connect, DTLSv1_2_enc_data) -/* +/*- * DTLS server methods */ - #ifndef OPENSSL_NO_DTLS1_METHOD IMPLEMENT_dtls1_meth_func(DTLS1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_DTLSv1, dtlsv1_server_method, ossl_statem_accept, - ssl_undefined_function, - DTLSv1_enc_data) + ssl_undefined_function, DTLSv1_enc_data) #endif - #ifndef OPENSSL_NO_DTLS1_2_METHOD IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION, 0, SSL_OP_NO_DTLSv1_2, dtlsv1_2_server_method, ossl_statem_accept, - ssl_undefined_function, - DTLSv1_2_enc_data) + ssl_undefined_function, DTLSv1_2_enc_data) #endif - IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION, 0, 0, DTLS_server_method, ossl_statem_accept, - ssl_undefined_function, - DTLSv1_2_enc_data) - + ssl_undefined_function, DTLSv1_2_enc_data) -/* +/*- * DTLS client methods */ - #ifndef OPENSSL_NO_DTLS1_METHOD IMPLEMENT_dtls1_meth_func(DTLS1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_DTLSv1, dtlsv1_client_method, ssl_undefined_function, - ossl_statem_connect, - DTLSv1_enc_data) + ossl_statem_connect, DTLSv1_enc_data) IMPLEMENT_dtls1_meth_func(DTLS1_BAD_VER, SSL_METHOD_NO_SUITEB, SSL_OP_NO_DTLSv1, dtls_bad_ver_client_method, ssl_undefined_function, - ossl_statem_connect, - DTLSv1_enc_data) + ossl_statem_connect, DTLSv1_enc_data) #endif - #ifndef OPENSSL_NO_DTLS1_2_METHOD IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION, 0, SSL_OP_NO_DTLSv1_2, dtlsv1_2_client_method, ssl_undefined_function, - ossl_statem_connect, - DTLSv1_2_enc_data) + ossl_statem_connect, DTLSv1_2_enc_data) #endif - IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION, 0, 0, DTLS_client_method, ssl_undefined_function, - ossl_statem_connect, - DTLSv1_2_enc_data) - + ossl_statem_connect, DTLSv1_2_enc_data) #if OPENSSL_API_COMPAT < 0x10100000L - # ifndef OPENSSL_NO_TLS1_2_METHOD const SSL_METHOD *TLSv1_2_method(void) { @@ -317,4 +264,3 @@ const SSL_METHOD *DTLSv1_client_method(void) # endif #endif - |