From: Marcel Poul <marcel.poul@cern.ch>
Date: Mon, 2 Jul 2012 14:35:04 +0000 (+0000)
Subject: use flags to switch between RFC and openssl DN string format
X-Git-Tag: gridsite-core_R_1_7_22~40
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=9f1377d0ced57badde3c724aa88b2a2406e43cea;p=jra1mw.git

use flags to switch between RFC and openssl DN string format
---

diff --git a/emi.canl.canl-c/src/canl.h b/emi.canl.canl-c/src/canl.h
index ffac336..948d188 100644
--- a/emi.canl.canl-c/src/canl.h
+++ b/emi.canl.canl-c/src/canl.h
@@ -32,7 +32,7 @@ canl_create_io_handler(canl_ctx cc, canl_io_handler *io);
 canl_err_code CANL_CALLCONV
 canl_io_connect(canl_ctx cc, canl_io_handler io, const char *host,
 		const char *service, int port, gss_OID_set auth_mechs,
-		int flags, struct timeval *timeout);
+		int flags, canl_principal *peer, struct timeval *timeout);
 
 canl_err_code CANL_CALLCONV
 canl_io_accept(canl_ctx cc, canl_io_handler io, int fd, struct sockaddr s_addr,
diff --git a/emi.canl.canl-c/src/canl_ssl.c b/emi.canl.canl-c/src/canl_ssl.c
index 961ed6e..3f594b9 100644
--- a/emi.canl.canl-c/src/canl_ssl.c
+++ b/emi.canl.canl-c/src/canl_ssl.c
@@ -1251,6 +1251,9 @@ ssl_get_peer(glb_ctx *cc, io_handler *io, void *auth_ctx, canl_principal *peer)
     X509 *cert = NULL;
     X509_NAME *subject = NULL;
     int ret;
+    BIO *name_out = BIO_new(BIO_s_mem());
+    long name_len = 0;
+    mech_glb_ctx *m_ctx = (mech_glb_ctx *)cc->mech_ctx;
 
     if (peer == NULL)
 	return set_error(cc, EINVAL, POSIX_ERROR, "invalid parameter value");
@@ -1264,11 +1267,32 @@ ssl_get_peer(glb_ctx *cc, io_handler *io, void *auth_ctx, canl_principal *peer)
 	return set_error(cc, ENOMEM, POSIX_ERROR, "Not enough memory");
 
     subject = X509_get_subject_name(cert);
-    princ->name = strdup(X509_NAME_oneline(subject, NULL, 0));
-    if (princ->name == NULL) {
-	ret = set_error(cc, ENOMEM, POSIX_ERROR, "Not enough memory");
-	goto end;
+    if (CANL_DN_OSSL & m_ctx->flags)
+        ret = X509_NAME_print_ex(name_out, subject, 0, 0);
+    else
+        ret = X509_NAME_print_ex(name_out, subject, 0, XN_FLAG_RFC2253);
+    if (!ret){
+        ret = set_error(cc, CANL_ERR_unknown, CANL_ERROR,
+                "Cannot extract subject name out of"
+                " the peer's certificate"); //TODO error code
+        goto end;
     }
+    name_len = BIO_ctrl_pending(name_out);
+    if (name_len) {
+        princ->name = (char *) malloc((name_len +1) * sizeof(char));
+        if (princ->name == NULL) {
+            ret = set_error(cc, ENOMEM, POSIX_ERROR, "Not enough memory");
+            goto end;
+        }
+    }
+    else {
+        ret = set_error(cc, CANL_ERR_unknown, CANL_ERROR,
+                "Zero subject name length"); //TODO error code
+        goto end;
+    }
+
+    BIO_read(name_out, princ->name, name_len);
+    princ->name[name_len] = '\0';
 
     *peer = princ;
     princ = NULL;
@@ -1278,6 +1302,7 @@ end:
     if (princ)
 	free(princ);
 
+    BIO_vfree(name_out);
     return ret;
 }