From: Marcel Poul <marcel.poul@cern.ch>
Date: Thu, 15 Dec 2011 16:48:51 +0000 (+0000)
Subject: ssl library init while creating context
X-Git-Tag: emi-canl-c_R_1_0_0_0~122
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=7c127e9b5d590b7f1652a76e4eace9f40ad6eb7c;p=jra1mw.git

ssl library init while creating context
---

diff --git a/emi.canl.canl-c/src/canl.c b/emi.canl.canl-c/src/canl.c
index 0459408..f5d6523 100644
--- a/emi.canl.canl-c/src/canl.c
+++ b/emi.canl.canl-c/src/canl.c
@@ -13,6 +13,9 @@ canl_ctx canl_create_ctx()
     ctx = (glb_ctx *) calloc(1, sizeof(*ctx));
     if (!ctx) 
         return NULL;
+
+    SSL_library_init();
+    SSL_load_error_strings();
     return ctx;
 }
 
@@ -53,9 +56,6 @@ canl_io_handler canl_create_io_handler(canl_ctx cc)
         goto end;
     }
 
-    SSL_library_init();
-    SSL_load_error_strings();
-
 end:
     if (err) {
         update_error(g_cc,"cannot create canl_io_handler");
diff --git a/emi.canl.canl-c/src/canl_ssl.c b/emi.canl.canl-c/src/canl_ssl.c
index fb17a2e..eba8d3a 100644
--- a/emi.canl.canl-c/src/canl_ssl.c
+++ b/emi.canl.canl-c/src/canl_ssl.c
@@ -416,8 +416,8 @@ static int do_ssl_accept( glb_ctx *cc, io_handler *io, struct timeval *timeout)
             set_error (cc, err, posix_error, "Connection stuck"
                     " during handshake: timeout reached"); 
         }
-        else if (ret2 < 0)
-            set_error (cc, 0, unknown_error, "connection closed by"
+        else if (ret2 <= 0)
+            set_error (cc, ssl_err, ssl_error, "Connection closed by"
 		    " the other side");
 	else
 	    set_error (cc, 0, unknown_error, "Error during SSL handshake");