Add language to support querying certificates to find a match. Support constructs like "1.3.6.1.5.2.3.5" IN %{certificate.eku} AND %{certificate.subject} TAILMATCH "C=SE"".

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22677 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-03-13 17:35:49 +00:00
parent 08cb59513f
commit 7776ed30a9
16 changed files with 1006 additions and 71 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2007 Kungliga Tekniska H<>gskolan
* Copyright (c) 2007 - 2008 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -40,36 +40,6 @@ RCSID("$Id$");
* See the library functions here: @ref hx509_env
*/
struct hx509_env {
struct {
char *key;
char *value;
} *val;
size_t len;
};
/**
* Allocate a new hx509_env container object.
*
* @param context A hx509 context.
* @param env return a hx509_env structure, free with hx509_env_free().
*
* @return An hx509 error code, see hx509_get_error_string().
*
* @ingroup hx509_env
*/
int
hx509_env_init(hx509_context context, hx509_env *env)
{
*env = calloc(1, sizeof(**env));
if (*env == NULL) {
hx509_set_error_string(context, 0, ENOMEM, "out of memory");
return ENOMEM;
}
return 0;
}
/**
* Add a new key/value pair to the hx509_env.
*
@@ -84,34 +54,92 @@ hx509_env_init(hx509_context context, hx509_env *env)
*/
int
hx509_env_add(hx509_context context, hx509_env env,
hx509_env_add(hx509_context context, hx509_env *env,
const char *key, const char *value)
{
void *ptr;
hx509_env n;
ptr = realloc(env->val, sizeof(env->val[0]) * (env->len + 1));
if (ptr == NULL) {
n = malloc(sizeof(*n));
if (n == NULL) {
hx509_set_error_string(context, 0, ENOMEM, "out of memory");
return ENOMEM;
}
env->val = ptr;
env->val[env->len].key = strdup(key);
if (env->val[env->len].key == NULL) {
hx509_set_error_string(context, 0, ENOMEM, "out of memory");
n->type = env_string;
n->next = NULL;
n->name = strdup(key);
if (n->name == NULL) {
free(n);
return ENOMEM;
}
env->val[env->len].value = strdup(value);
if (env->val[env->len].value == NULL) {
free(env->val[env->len].key);
hx509_set_error_string(context, 0, ENOMEM, "out of memory");
n->u.string = strdup(value);
if (n->u.string == NULL) {
free(n->name);
free(n);
return ENOMEM;
}
env->len++;
/* add to tail */
if (*env) {
hx509_env e = *env;
while (e->next)
e = e->next;
e->next = n;
} else
*env = n;
return 0;
}
/**
* Search the hx509_env for a key.
* Add a new key/binding pair to the hx509_env.
*
* @param context A hx509 context.
* @param env enviroment to add the enviroment variable too.
* @param key key to add
* @param list binding list to add
*
* @return An hx509 error code, see hx509_get_error_string().
*
* @ingroup hx509_env
*/
int
hx509_env_add_binding(hx509_context context, hx509_env *env,
const char *key, hx509_env list)
{
hx509_env n;
n = malloc(sizeof(*n));
if (n == NULL) {
hx509_set_error_string(context, 0, ENOMEM, "out of memory");
return ENOMEM;
}
n->type = env_list;
n->next = NULL;
n->name = strdup(key);
if (n->name == NULL) {
free(n);
return ENOMEM;
}
n->u.list = list;
/* add to tail */
if (*env) {
hx509_env e = *env;
while (e->next)
e = e->next;
e->next = n;
} else
*env = n;
return 0;
}
/**
* Search the hx509_env for a length based key.
*
* @param context A hx509 context.
* @param env enviroment to add the enviroment variable too.
@@ -127,16 +155,80 @@ const char *
hx509_env_lfind(hx509_context context, hx509_env env,
const char *key, size_t len)
{
size_t i;
for (i = 0; i < env->len; i++) {
char *s = env->val[i].key;
if (strncmp(key, s, len) == 0 && s[len] == '\0')
return env->val[i].value;
while(env) {
if (strncmp(key, env->name ,len) == 0
&& env->name[len] == '\0' && env->type == env_string)
return env->u.string;
env = env->next;
}
return NULL;
}
/**
* Search the hx509_env for a key.
*
* @param context A hx509 context.
* @param env enviroment to add the enviroment variable too.
* @param key key to search for.
*
* @return the value if the key is found, NULL otherwise.
*
* @ingroup hx509_env
*/
const char *
hx509_env_find(hx509_context context, hx509_env env, const char *key)
{
while(env) {
if (strcmp(key, env->name) == 0 && env->type == env_string)
return env->u.string;
env = env->next;
}
return NULL;
}
/**
* Search the hx509_env for a binding.
*
* @param context A hx509 context.
* @param env enviroment to add the enviroment variable too.
* @param key key to search for.
*
* @return the binding if the key is found, NULL if not found.
*
* @ingroup hx509_env
*/
hx509_env
hx509_env_find_binding(hx509_context context,
hx509_env env,
const char *key)
{
while(env) {
if (strcmp(key, env->name) == 0 && env->type == env_list)
return env->u.list;
env = env->next;
}
return NULL;
}
static void
env_free(hx509_env b)
{
while(b) {
hx509_env next = b->next;
if (b->type == env_string)
free(b->u.string);
else if (b->type == env_list)
env_free(b->u.list);
free(b->name);
free(b);
b = next;
}
}
/**
* Free an hx509_env enviroment context.
*
@@ -148,14 +240,7 @@ hx509_env_lfind(hx509_context context, hx509_env env,
void
hx509_env_free(hx509_env *env)
{
size_t i;
for (i = 0; i < (*env)->len; i++) {
free((*env)->val[i].key);
free((*env)->val[i].value);
}
free((*env)->val);
free(*env);
if (*env)
env_free(*env);
*env = NULL;
}