[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[monit-dev] [monit] r362 committed - cleanup
From: |
monit |
Subject: |
[monit-dev] [monit] r362 committed - cleanup |
Date: |
Wed, 06 Apr 2011 07:32:11 +0000 |
Revision: 362
Author: address@hidden
Date: Wed Apr 6 00:31:06 2011
Log: cleanup
http://code.google.com/p/monit/source/detail?r=362
Modified:
/trunk/ssl.c
=======================================
--- /trunk/ssl.c Wed Apr 6 00:27:58 2011
+++ /trunk/ssl.c Wed Apr 6 00:31:06 2011
@@ -319,10 +319,8 @@
if (FIPS_mode())
server_method = TLSv1_server_method();
else
- server_method = SSLv23_server_method();
-#else
- server_method = SSLv23_server_method();
#endif
+ server_method = SSLv23_server_method();
if (!(ssl_server->method = server_method)) {
LogError("%s: Cannot initialize the SSL method -- %s\n", prog,
SSLERROR);
goto sslerror;
@@ -627,12 +625,9 @@
#ifdef OPENSSL_FIPS
if (FIPS_mode()) {
ssl->method = TLSv1_client_method();
- } else {
+ } else
#endif
ssl->method = SSLv23_client_method();
-#ifdef OPENSSL_FIPS
- }
-#endif
break;
case SSL_VERSION_SSLV2:
@@ -643,12 +638,9 @@
if (FIPS_mode()) {
LogError("SSLv2 is not allowed in FIPS mode - use TLSv1");
goto sslerror;
- } else {
+ } else
#endif
ssl->method = SSLv2_client_method();
-#ifdef OPENSSL_FIPS
- }
-#endif
break;
case SSL_VERSION_SSLV3:
@@ -656,12 +648,9 @@
if (FIPS_mode()) {
LogError("SSLv3 is not allowed in FIPS mode - use TLSv1");
goto sslerror;
- } else {
+ } else
#endif
ssl->method = SSLv3_client_method();
-#ifdef OPENSSL_FIPS
- }
-#endif
break;
case SSL_VERSION_TLS:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [monit-dev] [monit] r362 committed - cleanup,
monit <=