oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

filter out dup openssl engine keys, parse user options first

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14286 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-10-03 17:46:01 +00:00
parent 0ce5cfb84d
commit ee9f6e571b
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/krb5/pkinit.c
View File

@@ -1816,17 +1816,25 @@ add_pair(krb5_context context, char *str, char ***cmds, int *num)
{ {
char **c; char **c;
char *p; 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)); c = realloc(*cmds, sizeof(*c) * ((*num + 1) * 2));
if (c == NULL) { if (c == NULL) {
krb5_set_error_string(context, "out of memory"); krb5_set_error_string(context, "out of memory");
return ENOMEM; return ENOMEM;
} }
p = strchr(str, ':');
if (p) {
*p = '\0';
p++;
}
c[(*num * 2)] = str; c[(*num * 2)] = str;
c[(*num * 2) + 1] = p; c[(*num * 2) + 1] = p;
*num += 1; *num += 1;
@@ -1923,6 +1931,16 @@ load_openssl_engine(krb5_context context,
ENGINE_load_builtin_engines(); 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, f = krb5_config_get_string_default(context, NULL, NULL,
"libdefaults", "libdefaults",
"pkinit-openssl-engine", "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) { if (ctx.cert_file == NULL) {
krb5_set_error_string(context, "openssl engine missing certificate"); krb5_set_error_string(context, "openssl engine missing certificate");
ret = HEIM_PKINIT_NO_CERTIFICATE; ret = HEIM_PKINIT_NO_CERTIFICATE;