From: Ton Voon <tonvoon@users.sourceforge.net>
Date: Thu, 18 Nov 2004 22:42:17 +0000 (+0000)
Subject: Enhance SSL initialization problems (Phil Dibowitz - 1055120)
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=43f7946598f062f80c2c92eb3757cb9a2c8ce1ec;p=nagiosplug.git

Enhance SSL initialization problems (Phil Dibowitz - 1055120)


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@902 f882894a-f735-0410-b71e-b25c423dba1c
---

diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 6f2aa03..126907f 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -529,8 +529,9 @@ connect_SSL (void)
 
   /* Initialize SSL context */
   SSLeay_add_ssl_algorithms ();
-  meth = SSLv2_client_method ();
+  meth = SSLv23_client_method ();
   SSL_load_error_strings ();
+  OpenSSL_add_all_algorithms();
   if ((ctx = SSL_CTX_new (meth)) == NULL)
     {
       printf (_("ERROR: Cannot create SSL context.\n"));
@@ -553,7 +554,7 @@ connect_SSL (void)
       if ((ssl = SSL_new (ctx)) != NULL)
       {
         SSL_set_fd (ssl, sd);
-        if (SSL_connect (ssl) != -1)
+        if (SSL_connect(ssl) == 1)
           return OK;
         ERR_print_errors_fp (stderr);
       }