From: Marcel Poul <marcel.poul@cern.ch>
Date: Sat, 30 Jun 2012 22:17:21 +0000 (+0000)
Subject: map openssl error codes of the form X509_V_ERR... to out CANL_ERR_...
X-Git-Tag: gridsite-core_R_1_7_22~46
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=d357cace3317ad7ea4ba02b5c7f79daa7eca6800;p=jra1mw.git

map openssl error codes of the form X509_V_ERR... to out CANL_ERR_...
---

diff --git a/emi.canl.canl-c/src/canl_ssl.c b/emi.canl.canl-c/src/canl_ssl.c
index 9a6d7fd..5346591 100644
--- a/emi.canl.canl-c/src/canl_ssl.c
+++ b/emi.canl.canl-c/src/canl_ssl.c
@@ -61,6 +61,7 @@ static int set_ocsp_url(char *url);
 static int set_ocsp_issuer(X509 *issuer);
 static canl_x509store_t * store_dup(canl_x509store_t *store_from);
 static X509_STORE * canl_create_x509store(canl_x509store_t *store);
+static canl_error get_verify_result(unsigned long ssl_err, const SSL *ssl);
 
 #ifdef DEBUG
 static void dbg_print_ssl_error(int errorcode);
@@ -776,6 +777,7 @@ static int do_ssl_connect(glb_ctx *cc, io_handler *io,
     long errorcode = 0;
     int expected = 0;
     int locl_timeout = -1;
+    canl_error canl_err = 0;
 
     /* do not take tv_usec into account in this function*/
     if (timeout)
@@ -807,8 +809,15 @@ static int do_ssl_connect(glb_ctx *cc, io_handler *io,
             update_error (cc, ETIMEDOUT, POSIX_ERROR, "Connection stuck during"
 		   " handshake: timeout reached");
         }
-        else if (ret2 < 0 && ssl_err)
-            update_error(cc, ssl_err, e_orig, "Error during SSL handshake");
+        else if (ret2 < 0 && ssl_err){
+            canl_err = get_verify_result(ssl_err, ssl);
+            if (canl_err)
+                update_error (cc, canl_err, CANL_ERROR,
+                        "Error during SSL handshake");
+            else
+                update_error(cc, ssl_err, SSL_ERROR,
+                        "Error during SSL handshake");
+        }
         else if (ret2 == 0)//TODO is 0 (conn closed by the other side) error?
             update_error (cc, ECONNREFUSED, POSIX_ERROR, "Connection closed"
                     " by the other side");
@@ -830,6 +839,7 @@ static int do_ssl_accept(glb_ctx *cc, io_handler *io,
     long errorcode = 0;
     int expected = 0;
     int locl_timeout = -1;
+    canl_error canl_err = 0;
 
     /* do not take tv_usec into account in this function*/
     if (timeout)
@@ -881,8 +891,15 @@ timeout->tv_sec = timeout->tv_sec - (curtime - starttime);
         else if (ret2 == 0)
             set_error (cc, ECONNREFUSED, POSIX_ERROR, "Connection closed by"
 		    " the other side");
-        else if (ret2 < 0 && ssl_err)
-            set_error (cc, ssl_err, SSL_ERROR, "Error during SSL handshake");
+        else if (ret2 < 0 && ssl_err){
+            canl_err = get_verify_result(ssl_err, ssl);
+            if (canl_err)
+                set_error(cc, canl_err, CANL_ERROR,
+                        "Error during SSL handshake");
+            else
+                set_error(cc, ssl_err, SSL_ERROR,
+                        "Error during SSL handshake");
+        }
 	else
             /*ret2 < 0 && !ssl_err*/
             set_error (cc, 0, UNKNOWN_ERROR, "Error during SSL handshake"
@@ -892,6 +909,24 @@ timeout->tv_sec = timeout->tv_sec - (curtime - starttime);
     return 0;
 }
 
+static canl_error
+get_verify_result(unsigned long ssl_err, const SSL *ssl)
+{
+    long result = 0;
+    canl_error canl_err = 0;
+
+    result = SSL_get_verify_result(ssl);
+    switch (result) {
+        case X509_V_ERR_CERT_CHAIN_TOO_LONG:
+            canl_err = CANL_ERR_pathLenghtExtended;
+            break;
+        default:
+            break;
+    }
+
+    return canl_err;
+}
+
 /* this function has to return # bytes written or ret < 0 when sth went wrong*/
 static size_t
 ssl_write(glb_ctx *cc, io_handler *io, void *auth_ctx,