From ee9f6e571bf9a1812512523c872af671848cb92d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Sun, 3 Oct 2004 17:46:01 +0000
Subject: [PATCH] filter out dup openssl engine keys, parse user options first

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14286 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/krb5/pkinit.c | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/lib/krb5/pkinit.c b/lib/krb5/pkinit.c
index 6957304e0..4ebd08555 100644
--- a/lib/krb5/pkinit.c
+++ b/lib/krb5/pkinit.c
@@ -1816,17 +1816,25 @@ add_pair(krb5_context context, char *str, char ***cmds, int *num)
 {
     char **c;
     char *p;
+    int i;
+
+    p = strchr(str, ':');
+    if (p) {
+	*p = '\0';
+	p++;
+    }
+
+    /* filter out dup keys */
+    for (i = 0; i < *num; i++)
+	if (strcmp((*cmds)[i * 2], str) == 0)
+	    return 0;
 
     c = realloc(*cmds, sizeof(*c) * ((*num + 1) * 2));
     if (c == NULL) {
 	krb5_set_error_string(context, "out of memory");
 	return ENOMEM;
     }
-    p = strchr(str, ':');
-    if (p) {
-	*p = '\0';
-	p++;
-    }
+
     c[(*num * 2)] = str;
     c[(*num * 2) + 1] = p;
     *num += 1;
@@ -1923,6 +1931,16 @@ load_openssl_engine(krb5_context context,
 
     ENGINE_load_builtin_engines();
 
+    user_conf = strdup(string);
+    if (user_conf == NULL) {
+	krb5_set_error_string(context, "malloc: out of memory");
+	return ENOMEM;
+    }
+
+    ret = parse_openssl_engine_conf(context, &ctx, user_conf);
+    if (ret)
+	goto out;
+
     f = krb5_config_get_string_default(context, NULL, NULL,
 				       "libdefaults", 
 				       "pkinit-openssl-engine", 
@@ -1936,16 +1954,6 @@ load_openssl_engine(krb5_context context,
 	}
     }
 
-    user_conf = strdup(string);
-    if (user_conf == NULL) {
-	krb5_set_error_string(context, "malloc: out of memory");
-	return ENOMEM;
-    }
-
-    ret = parse_openssl_engine_conf(context, &ctx, user_conf);
-    if (ret)
-	goto out;
-
     if (ctx.cert_file == NULL) {
 	krb5_set_error_string(context, "openssl engine missing certificate");
 	ret = HEIM_PKINIT_NO_CERTIFICATE;