From cdc5318f3392ee736d9e0f3c5a79d0e0de3f9f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Tue, 26 Jun 2007 14:22:34 +0000
Subject: [PATCH] Allow export some of the request parameters.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21344 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/hx509/req.c | 131 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 92 insertions(+), 39 deletions(-)

diff --git a/lib/hx509/req.c b/lib/hx509/req.c
index 4e71a45d0..cb63e2643 100644
--- a/lib/hx509/req.c
+++ b/lib/hx509/req.c
@@ -84,6 +84,18 @@ _hx509_request_set_name(hx509_context context,
     return 0;
 }
 
+int
+_hx509_request_get_name(hx509_context context,
+			hx509_request req,
+			hx509_name *name)
+{
+    if (req->name == NULL) {
+	hx509_set_error_string(context, 0, EINVAL, "Request have no name");
+	return EINVAL;
+    }
+    return hx509_name_copy(context, req->name, name);
+}
+
 int
 _hx509_request_set_SubjectPublicKeyInfo(hx509_context context,
 					hx509_request req,
@@ -93,6 +105,14 @@ _hx509_request_set_SubjectPublicKeyInfo(hx509_context context,
     return copy_SubjectPublicKeyInfo(key, &req->key);
 }
 
+int
+_hx509_request_get_SubjectPublicKeyInfo(hx509_context context,
+					hx509_request req,
+					SubjectPublicKeyInfo *key)
+{
+    return copy_SubjectPublicKeyInfo(&req->key, key);
+}
+
 int
 _hx509_request_add_eku(hx509_context context,
 		       hx509_request req,
@@ -217,56 +237,89 @@ out:
 }
 
 int
-_hx509_request_print(hx509_context context, FILE *f, const void *data, size_t len)
+_hx509_request_parse(hx509_context context, 
+		     const char *path,
+		     hx509_request *req)
 {
-    CertificationRequest req;
+    CertificationRequest r;
     CertificationRequestInfo *rinfo;
-    size_t size;
+    hx509_name subject;
+    size_t len, size;
+    void *p;
     int ret;
 
-    ret = decode_CertificationRequest(data, len, &req, &size);
+    if (strncmp(path, "PKCS10:", 7) != 0) {
+	hx509_set_error_string(context, 0, HX509_UNSUPPORTED_OPERATION,
+			       "unsupport type in %s", path);
+	return HX509_UNSUPPORTED_OPERATION;
+    }
+    path += 7;
+
+    /* XXX PEM request */
+
+    ret = _hx509_map_file(path, &p, &len, NULL);
     if (ret) {
-	hx509_set_error_string(context, 0, ret, "Failed to decode request");
+	hx509_set_error_string(context, 0, ret, "Failed to map file %s", path);
 	return ret;
     }
 
-    rinfo = &req.certificationRequestInfo;
-
-    {
-	char *subject;
-	hx509_name n;
-	
-	ret = _hx509_name_from_Name(&rinfo->subject, &n);
-	if (ret) {
-	    hx509_set_error_string(context, 0, ret, "Failed to extract name");
-	    free_CertificationRequest(&req);
-	    return ret;
-	}
-	ret = hx509_name_to_string(n, &subject);
-	hx509_name_free(&n);
-	if (ret) {
-	    hx509_set_error_string(context, 0, ret, "Failed to print name");
-	    free_CertificationRequest(&req);
-	    return ret;
-	}
-	
-	fprintf(f, "name: %s\n", subject);
-	free(subject);
+    ret = decode_CertificationRequest(p, len, &r, &size);
+    _hx509_unmap_file(p, len);
+    if (ret) {
+	hx509_set_error_string(context, 0, ret, "Failed to decode %s", path);
+	return ret;
     }
-    
-    if (rinfo->attributes && rinfo->attributes->len) {
-	int j;
 
-	fprintf(f, "Attributes:\n");
-	
-	for (j = 0; j < rinfo->attributes->len; j++) {
-	    char *str;
-	    hx509_oid_sprint(&rinfo->attributes->val[j].type, &str);
-	    fprintf(f, "\toid: %s\n", str);
-	    free(str);
-	}
+    ret = _hx509_request_init(context, req);
+    if (ret) {
+	free_CertificationRequest(&r);
+	return ret;
     }
-    free_CertificationRequest(&req);
+
+    rinfo = &r.certificationRequestInfo;
+
+    ret = _hx509_request_set_SubjectPublicKeyInfo(context, *req,
+						  &rinfo->subjectPKInfo);
+    if (ret) {
+	free_CertificationRequest(&r);
+	_hx509_request_free(req);
+	return ret;
+    }
+
+    ret = _hx509_name_from_Name(&rinfo->subject, &subject);
+    if (ret) {
+	free_CertificationRequest(&r);
+	_hx509_request_free(req);
+	return ret;
+    }
+    ret = _hx509_request_set_name(context, *req, subject);
+    hx509_name_free(&subject);
+    free_CertificationRequest(&r);
+    if (ret) {
+	_hx509_request_free(req);
+	return ret;
+    }
+
+    return 0;
+}
+
+
+int
+_hx509_request_print(hx509_context context, hx509_request req, FILE *f)
+{
+    int ret;
+
+    if (req->name) {
+	char *subject;
+	ret = hx509_name_to_string(req->name, &subject);
+	if (ret) {
+	    hx509_set_error_string(context, 0, ret, "Failed to print name");
+	    return ret;
+	}
+        fprintf(f, "name: %s\n", subject);
+	free(subject);
+    }
+    
     return 0;
 }