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 6f2aa0363654ccaa66b552f495b8a71d9f803f03..126907f99c2627660a536889d141263d4fda4e33 100644 (file)
--- 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);
       }