From 829746feb121e6eece08d250837aab71d1a741bd Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Fri, 9 Oct 2015 16:53:21 +0200 Subject: [PATCH] fix line endings --- NetSSL_OpenSSL/src/Context.cpp | 42 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/NetSSL_OpenSSL/src/Context.cpp b/NetSSL_OpenSSL/src/Context.cpp index a6976f795..20c2ff6be 100644 --- a/NetSSL_OpenSSL/src/Context.cpp +++ b/NetSSL_OpenSSL/src/Context.cpp @@ -333,7 +333,7 @@ void Context::createSSLContext() case SERVER_USE: _pSSLContext = SSL_CTX_new(SSLv23_server_method()); break; -#if defined(SSL_OP_NO_TLSv1) && !defined(OPENSSL_NO_TLS1) +#if defined(SSL_OP_NO_TLSv1) && !defined(OPENSSL_NO_TLS1) case TLSV1_CLIENT_USE: _pSSLContext = SSL_CTX_new(TLSv1_client_method()); break; @@ -341,26 +341,26 @@ void Context::createSSLContext() _pSSLContext = SSL_CTX_new(TLSv1_server_method()); break; #endif -#if defined(SSL_OP_NO_TLSv1_1) && !defined(OPENSSL_NO_TLS1) -/* SSL_OP_NO_TLSv1_1 is defined in ssl.h if the library version supports TLSv1.1. - * OPENSSL_NO_TLS1 is defined in opensslconf.h or on the compiler command line - * if TLS1.x was removed at OpenSSL library build time via Configure options. - */ - case TLSV1_1_CLIENT_USE: - _pSSLContext = SSL_CTX_new(TLSv1_1_client_method()); - break; - case TLSV1_1_SERVER_USE: - _pSSLContext = SSL_CTX_new(TLSv1_1_server_method()); - break; -#endif -#if defined(SSL_OP_NO_TLSv1_2) && !defined(OPENSSL_NO_TLS1) - case TLSV1_2_CLIENT_USE: - _pSSLContext = SSL_CTX_new(TLSv1_2_client_method()); - break; - case TLSV1_2_SERVER_USE: - _pSSLContext = SSL_CTX_new(TLSv1_2_server_method()); - break; -#endif +#if defined(SSL_OP_NO_TLSv1_1) && !defined(OPENSSL_NO_TLS1) +/* SSL_OP_NO_TLSv1_1 is defined in ssl.h if the library version supports TLSv1.1. + * OPENSSL_NO_TLS1 is defined in opensslconf.h or on the compiler command line + * if TLS1.x was removed at OpenSSL library build time via Configure options. + */ + case TLSV1_1_CLIENT_USE: + _pSSLContext = SSL_CTX_new(TLSv1_1_client_method()); + break; + case TLSV1_1_SERVER_USE: + _pSSLContext = SSL_CTX_new(TLSv1_1_server_method()); + break; +#endif +#if defined(SSL_OP_NO_TLSv1_2) && !defined(OPENSSL_NO_TLS1) + case TLSV1_2_CLIENT_USE: + _pSSLContext = SSL_CTX_new(TLSv1_2_client_method()); + break; + case TLSV1_2_SERVER_USE: + _pSSLContext = SSL_CTX_new(TLSv1_2_server_method()); + break; +#endif default: throw Poco::InvalidArgumentException("Invalid or unsupported usage"); }