Run util/openssl-format-source -v -c .
Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
@@ -8,7 +8,8 @@
|
||||
#include <openssl/safestack.h>
|
||||
#include <openssl/e_os2.h>
|
||||
|
||||
/* Later versions of DEC C has started to add lnkage information to certain
|
||||
/*
|
||||
* Later versions of DEC C has started to add lnkage information to certain
|
||||
* functions, which makes it tricky to use them as values to regular function
|
||||
* pointers. One way is to define a macro that takes care of casting them
|
||||
* correctly.
|
||||
@@ -19,354 +20,344 @@
|
||||
# define OPENSSL_strcmp strcmp
|
||||
#endif
|
||||
|
||||
/* I use the ex_data stuff to manage the identifiers for the obj_name_types
|
||||
/*
|
||||
* I use the ex_data stuff to manage the identifiers for the obj_name_types
|
||||
* that applications may define. I only really use the free function field.
|
||||
*/
|
||||
DECLARE_LHASH_OF(OBJ_NAME);
|
||||
static LHASH_OF(OBJ_NAME) *names_lh=NULL;
|
||||
static int names_type_num=OBJ_NAME_TYPE_NUM;
|
||||
static LHASH_OF(OBJ_NAME) *names_lh = NULL;
|
||||
static int names_type_num = OBJ_NAME_TYPE_NUM;
|
||||
|
||||
typedef struct name_funcs_st
|
||||
{
|
||||
unsigned long (*hash_func)(const char *name);
|
||||
int (*cmp_func)(const char *a,const char *b);
|
||||
void (*free_func)(const char *, int, const char *);
|
||||
} NAME_FUNCS;
|
||||
typedef struct name_funcs_st {
|
||||
unsigned long (*hash_func) (const char *name);
|
||||
int (*cmp_func) (const char *a, const char *b);
|
||||
void (*free_func) (const char *, int, const char *);
|
||||
} NAME_FUNCS;
|
||||
|
||||
DECLARE_STACK_OF(NAME_FUNCS)
|
||||
IMPLEMENT_STACK_OF(NAME_FUNCS)
|
||||
|
||||
static STACK_OF(NAME_FUNCS) *name_funcs_stack;
|
||||
|
||||
/* The LHASH callbacks now use the raw "void *" prototypes and do per-variable
|
||||
* casting in the functions. This prevents function pointer casting without the
|
||||
* need for macro-generated wrapper functions. */
|
||||
/*
|
||||
* The LHASH callbacks now use the raw "void *" prototypes and do
|
||||
* per-variable casting in the functions. This prevents function pointer
|
||||
* casting without the need for macro-generated wrapper functions.
|
||||
*/
|
||||
|
||||
/* static unsigned long obj_name_hash(OBJ_NAME *a); */
|
||||
static unsigned long obj_name_hash(const void *a_void);
|
||||
/* static int obj_name_cmp(OBJ_NAME *a,OBJ_NAME *b); */
|
||||
static int obj_name_cmp(const void *a_void,const void *b_void);
|
||||
static int obj_name_cmp(const void *a_void, const void *b_void);
|
||||
|
||||
static IMPLEMENT_LHASH_HASH_FN(obj_name, OBJ_NAME)
|
||||
static IMPLEMENT_LHASH_COMP_FN(obj_name, OBJ_NAME)
|
||||
|
||||
int OBJ_NAME_init(void)
|
||||
{
|
||||
if (names_lh != NULL) return(1);
|
||||
MemCheck_off();
|
||||
names_lh=lh_OBJ_NAME_new();
|
||||
MemCheck_on();
|
||||
return(names_lh != NULL);
|
||||
}
|
||||
{
|
||||
if (names_lh != NULL)
|
||||
return (1);
|
||||
MemCheck_off();
|
||||
names_lh = lh_OBJ_NAME_new();
|
||||
MemCheck_on();
|
||||
return (names_lh != NULL);
|
||||
}
|
||||
|
||||
int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),
|
||||
int (*cmp_func)(const char *, const char *),
|
||||
void (*free_func)(const char *, int, const char *))
|
||||
{
|
||||
int ret;
|
||||
int i;
|
||||
NAME_FUNCS *name_funcs;
|
||||
int OBJ_NAME_new_index(unsigned long (*hash_func) (const char *),
|
||||
int (*cmp_func) (const char *, const char *),
|
||||
void (*free_func) (const char *, int, const char *))
|
||||
{
|
||||
int ret;
|
||||
int i;
|
||||
NAME_FUNCS *name_funcs;
|
||||
|
||||
if (name_funcs_stack == NULL)
|
||||
{
|
||||
MemCheck_off();
|
||||
name_funcs_stack=sk_NAME_FUNCS_new_null();
|
||||
MemCheck_on();
|
||||
}
|
||||
if (name_funcs_stack == NULL)
|
||||
{
|
||||
/* ERROR */
|
||||
return(0);
|
||||
}
|
||||
ret=names_type_num;
|
||||
names_type_num++;
|
||||
for (i=sk_NAME_FUNCS_num(name_funcs_stack); i<names_type_num; i++)
|
||||
{
|
||||
MemCheck_off();
|
||||
name_funcs = OPENSSL_malloc(sizeof(NAME_FUNCS));
|
||||
MemCheck_on();
|
||||
if (!name_funcs)
|
||||
{
|
||||
OBJerr(OBJ_F_OBJ_NAME_NEW_INDEX,ERR_R_MALLOC_FAILURE);
|
||||
return(0);
|
||||
}
|
||||
name_funcs->hash_func = lh_strhash;
|
||||
name_funcs->cmp_func = OPENSSL_strcmp;
|
||||
name_funcs->free_func = 0; /* NULL is often declared to
|
||||
* ((void *)0), which according
|
||||
* to Compaq C is not really
|
||||
* compatible with a function
|
||||
* pointer. -- Richard Levitte*/
|
||||
MemCheck_off();
|
||||
sk_NAME_FUNCS_push(name_funcs_stack,name_funcs);
|
||||
MemCheck_on();
|
||||
}
|
||||
name_funcs = sk_NAME_FUNCS_value(name_funcs_stack, ret);
|
||||
if (hash_func != NULL)
|
||||
name_funcs->hash_func = hash_func;
|
||||
if (cmp_func != NULL)
|
||||
name_funcs->cmp_func = cmp_func;
|
||||
if (free_func != NULL)
|
||||
name_funcs->free_func = free_func;
|
||||
return(ret);
|
||||
}
|
||||
if (name_funcs_stack == NULL) {
|
||||
MemCheck_off();
|
||||
name_funcs_stack = sk_NAME_FUNCS_new_null();
|
||||
MemCheck_on();
|
||||
}
|
||||
if (name_funcs_stack == NULL) {
|
||||
/* ERROR */
|
||||
return (0);
|
||||
}
|
||||
ret = names_type_num;
|
||||
names_type_num++;
|
||||
for (i = sk_NAME_FUNCS_num(name_funcs_stack); i < names_type_num; i++) {
|
||||
MemCheck_off();
|
||||
name_funcs = OPENSSL_malloc(sizeof(NAME_FUNCS));
|
||||
MemCheck_on();
|
||||
if (!name_funcs) {
|
||||
OBJerr(OBJ_F_OBJ_NAME_NEW_INDEX, ERR_R_MALLOC_FAILURE);
|
||||
return (0);
|
||||
}
|
||||
name_funcs->hash_func = lh_strhash;
|
||||
name_funcs->cmp_func = OPENSSL_strcmp;
|
||||
name_funcs->free_func = 0; /* NULL is often declared to * ((void
|
||||
* *)0), which according * to Compaq C is
|
||||
* not really * compatible with a function
|
||||
* * pointer. -- Richard Levitte */
|
||||
MemCheck_off();
|
||||
sk_NAME_FUNCS_push(name_funcs_stack, name_funcs);
|
||||
MemCheck_on();
|
||||
}
|
||||
name_funcs = sk_NAME_FUNCS_value(name_funcs_stack, ret);
|
||||
if (hash_func != NULL)
|
||||
name_funcs->hash_func = hash_func;
|
||||
if (cmp_func != NULL)
|
||||
name_funcs->cmp_func = cmp_func;
|
||||
if (free_func != NULL)
|
||||
name_funcs->free_func = free_func;
|
||||
return (ret);
|
||||
}
|
||||
|
||||
/* static int obj_name_cmp(OBJ_NAME *a, OBJ_NAME *b) */
|
||||
static int obj_name_cmp(const void *a_void, const void *b_void)
|
||||
{
|
||||
int ret;
|
||||
const OBJ_NAME *a = (const OBJ_NAME *)a_void;
|
||||
const OBJ_NAME *b = (const OBJ_NAME *)b_void;
|
||||
{
|
||||
int ret;
|
||||
const OBJ_NAME *a = (const OBJ_NAME *)a_void;
|
||||
const OBJ_NAME *b = (const OBJ_NAME *)b_void;
|
||||
|
||||
ret=a->type-b->type;
|
||||
if (ret == 0)
|
||||
{
|
||||
if ((name_funcs_stack != NULL)
|
||||
&& (sk_NAME_FUNCS_num(name_funcs_stack) > a->type))
|
||||
{
|
||||
ret=sk_NAME_FUNCS_value(name_funcs_stack,
|
||||
a->type)->cmp_func(a->name,b->name);
|
||||
}
|
||||
else
|
||||
ret=strcmp(a->name,b->name);
|
||||
}
|
||||
return(ret);
|
||||
}
|
||||
ret = a->type - b->type;
|
||||
if (ret == 0) {
|
||||
if ((name_funcs_stack != NULL)
|
||||
&& (sk_NAME_FUNCS_num(name_funcs_stack) > a->type)) {
|
||||
ret = sk_NAME_FUNCS_value(name_funcs_stack,
|
||||
a->type)->cmp_func(a->name, b->name);
|
||||
} else
|
||||
ret = strcmp(a->name, b->name);
|
||||
}
|
||||
return (ret);
|
||||
}
|
||||
|
||||
/* static unsigned long obj_name_hash(OBJ_NAME *a) */
|
||||
static unsigned long obj_name_hash(const void *a_void)
|
||||
{
|
||||
unsigned long ret;
|
||||
const OBJ_NAME *a = (const OBJ_NAME *)a_void;
|
||||
{
|
||||
unsigned long ret;
|
||||
const OBJ_NAME *a = (const OBJ_NAME *)a_void;
|
||||
|
||||
if ((name_funcs_stack != NULL) && (sk_NAME_FUNCS_num(name_funcs_stack) > a->type))
|
||||
{
|
||||
ret=sk_NAME_FUNCS_value(name_funcs_stack,
|
||||
a->type)->hash_func(a->name);
|
||||
}
|
||||
else
|
||||
{
|
||||
ret=lh_strhash(a->name);
|
||||
}
|
||||
ret^=a->type;
|
||||
return(ret);
|
||||
}
|
||||
if ((name_funcs_stack != NULL)
|
||||
&& (sk_NAME_FUNCS_num(name_funcs_stack) > a->type)) {
|
||||
ret =
|
||||
sk_NAME_FUNCS_value(name_funcs_stack,
|
||||
a->type)->hash_func(a->name);
|
||||
} else {
|
||||
ret = lh_strhash(a->name);
|
||||
}
|
||||
ret ^= a->type;
|
||||
return (ret);
|
||||
}
|
||||
|
||||
const char *OBJ_NAME_get(const char *name, int type)
|
||||
{
|
||||
OBJ_NAME on,*ret;
|
||||
int num=0,alias;
|
||||
{
|
||||
OBJ_NAME on, *ret;
|
||||
int num = 0, alias;
|
||||
|
||||
if (name == NULL) return(NULL);
|
||||
if ((names_lh == NULL) && !OBJ_NAME_init()) return(NULL);
|
||||
if (name == NULL)
|
||||
return (NULL);
|
||||
if ((names_lh == NULL) && !OBJ_NAME_init())
|
||||
return (NULL);
|
||||
|
||||
alias=type&OBJ_NAME_ALIAS;
|
||||
type&= ~OBJ_NAME_ALIAS;
|
||||
alias = type & OBJ_NAME_ALIAS;
|
||||
type &= ~OBJ_NAME_ALIAS;
|
||||
|
||||
on.name=name;
|
||||
on.type=type;
|
||||
on.name = name;
|
||||
on.type = type;
|
||||
|
||||
for (;;)
|
||||
{
|
||||
ret=lh_OBJ_NAME_retrieve(names_lh,&on);
|
||||
if (ret == NULL) return(NULL);
|
||||
if ((ret->alias) && !alias)
|
||||
{
|
||||
if (++num > 10) return(NULL);
|
||||
on.name=ret->data;
|
||||
}
|
||||
else
|
||||
{
|
||||
return(ret->data);
|
||||
}
|
||||
}
|
||||
}
|
||||
for (;;) {
|
||||
ret = lh_OBJ_NAME_retrieve(names_lh, &on);
|
||||
if (ret == NULL)
|
||||
return (NULL);
|
||||
if ((ret->alias) && !alias) {
|
||||
if (++num > 10)
|
||||
return (NULL);
|
||||
on.name = ret->data;
|
||||
} else {
|
||||
return (ret->data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int OBJ_NAME_add(const char *name, int type, const char *data)
|
||||
{
|
||||
OBJ_NAME *onp,*ret;
|
||||
int alias;
|
||||
{
|
||||
OBJ_NAME *onp, *ret;
|
||||
int alias;
|
||||
|
||||
if ((names_lh == NULL) && !OBJ_NAME_init()) return(0);
|
||||
if ((names_lh == NULL) && !OBJ_NAME_init())
|
||||
return (0);
|
||||
|
||||
alias=type&OBJ_NAME_ALIAS;
|
||||
type&= ~OBJ_NAME_ALIAS;
|
||||
alias = type & OBJ_NAME_ALIAS;
|
||||
type &= ~OBJ_NAME_ALIAS;
|
||||
|
||||
onp=(OBJ_NAME *)OPENSSL_malloc(sizeof(OBJ_NAME));
|
||||
if (onp == NULL)
|
||||
{
|
||||
/* ERROR */
|
||||
return(0);
|
||||
}
|
||||
onp = (OBJ_NAME *)OPENSSL_malloc(sizeof(OBJ_NAME));
|
||||
if (onp == NULL) {
|
||||
/* ERROR */
|
||||
return (0);
|
||||
}
|
||||
|
||||
onp->name=name;
|
||||
onp->alias=alias;
|
||||
onp->type=type;
|
||||
onp->data=data;
|
||||
onp->name = name;
|
||||
onp->alias = alias;
|
||||
onp->type = type;
|
||||
onp->data = data;
|
||||
|
||||
ret=lh_OBJ_NAME_insert(names_lh,onp);
|
||||
if (ret != NULL)
|
||||
{
|
||||
/* free things */
|
||||
if ((name_funcs_stack != NULL) && (sk_NAME_FUNCS_num(name_funcs_stack) > ret->type))
|
||||
{
|
||||
/* XXX: I'm not sure I understand why the free
|
||||
* function should get three arguments...
|
||||
* -- Richard Levitte
|
||||
*/
|
||||
sk_NAME_FUNCS_value(name_funcs_stack,
|
||||
ret->type)->free_func(ret->name,ret->type,ret->data);
|
||||
}
|
||||
OPENSSL_free(ret);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (lh_OBJ_NAME_error(names_lh))
|
||||
{
|
||||
/* ERROR */
|
||||
return(0);
|
||||
}
|
||||
}
|
||||
return(1);
|
||||
}
|
||||
ret = lh_OBJ_NAME_insert(names_lh, onp);
|
||||
if (ret != NULL) {
|
||||
/* free things */
|
||||
if ((name_funcs_stack != NULL)
|
||||
&& (sk_NAME_FUNCS_num(name_funcs_stack) > ret->type)) {
|
||||
/*
|
||||
* XXX: I'm not sure I understand why the free function should
|
||||
* get three arguments... -- Richard Levitte
|
||||
*/
|
||||
sk_NAME_FUNCS_value(name_funcs_stack,
|
||||
ret->type)->free_func(ret->name, ret->type,
|
||||
ret->data);
|
||||
}
|
||||
OPENSSL_free(ret);
|
||||
} else {
|
||||
if (lh_OBJ_NAME_error(names_lh)) {
|
||||
/* ERROR */
|
||||
return (0);
|
||||
}
|
||||
}
|
||||
return (1);
|
||||
}
|
||||
|
||||
int OBJ_NAME_remove(const char *name, int type)
|
||||
{
|
||||
OBJ_NAME on,*ret;
|
||||
{
|
||||
OBJ_NAME on, *ret;
|
||||
|
||||
if (names_lh == NULL) return(0);
|
||||
if (names_lh == NULL)
|
||||
return (0);
|
||||
|
||||
type&= ~OBJ_NAME_ALIAS;
|
||||
on.name=name;
|
||||
on.type=type;
|
||||
ret=lh_OBJ_NAME_delete(names_lh,&on);
|
||||
if (ret != NULL)
|
||||
{
|
||||
/* free things */
|
||||
if ((name_funcs_stack != NULL) && (sk_NAME_FUNCS_num(name_funcs_stack) > ret->type))
|
||||
{
|
||||
/* XXX: I'm not sure I understand why the free
|
||||
* function should get three arguments...
|
||||
* -- Richard Levitte
|
||||
*/
|
||||
sk_NAME_FUNCS_value(name_funcs_stack,
|
||||
ret->type)->free_func(ret->name,ret->type,ret->data);
|
||||
}
|
||||
OPENSSL_free(ret);
|
||||
return(1);
|
||||
}
|
||||
else
|
||||
return(0);
|
||||
}
|
||||
type &= ~OBJ_NAME_ALIAS;
|
||||
on.name = name;
|
||||
on.type = type;
|
||||
ret = lh_OBJ_NAME_delete(names_lh, &on);
|
||||
if (ret != NULL) {
|
||||
/* free things */
|
||||
if ((name_funcs_stack != NULL)
|
||||
&& (sk_NAME_FUNCS_num(name_funcs_stack) > ret->type)) {
|
||||
/*
|
||||
* XXX: I'm not sure I understand why the free function should
|
||||
* get three arguments... -- Richard Levitte
|
||||
*/
|
||||
sk_NAME_FUNCS_value(name_funcs_stack,
|
||||
ret->type)->free_func(ret->name, ret->type,
|
||||
ret->data);
|
||||
}
|
||||
OPENSSL_free(ret);
|
||||
return (1);
|
||||
} else
|
||||
return (0);
|
||||
}
|
||||
|
||||
struct doall
|
||||
{
|
||||
int type;
|
||||
void (*fn)(const OBJ_NAME *,void *arg);
|
||||
void *arg;
|
||||
};
|
||||
struct doall {
|
||||
int type;
|
||||
void (*fn) (const OBJ_NAME *, void *arg);
|
||||
void *arg;
|
||||
};
|
||||
|
||||
static void do_all_fn_doall_arg(const OBJ_NAME *name,struct doall *d)
|
||||
{
|
||||
if(name->type == d->type)
|
||||
d->fn(name,d->arg);
|
||||
}
|
||||
static void do_all_fn_doall_arg(const OBJ_NAME *name, struct doall *d)
|
||||
{
|
||||
if (name->type == d->type)
|
||||
d->fn(name, d->arg);
|
||||
}
|
||||
|
||||
static IMPLEMENT_LHASH_DOALL_ARG_FN(do_all_fn, const OBJ_NAME, struct doall)
|
||||
|
||||
void OBJ_NAME_do_all(int type,void (*fn)(const OBJ_NAME *,void *arg),void *arg)
|
||||
{
|
||||
struct doall d;
|
||||
void OBJ_NAME_do_all(int type, void (*fn) (const OBJ_NAME *, void *arg),
|
||||
void *arg)
|
||||
{
|
||||
struct doall d;
|
||||
|
||||
d.type=type;
|
||||
d.fn=fn;
|
||||
d.arg=arg;
|
||||
d.type = type;
|
||||
d.fn = fn;
|
||||
d.arg = arg;
|
||||
|
||||
lh_OBJ_NAME_doall_arg(names_lh, LHASH_DOALL_ARG_FN(do_all_fn),
|
||||
struct doall, &d);
|
||||
}
|
||||
lh_OBJ_NAME_doall_arg(names_lh, LHASH_DOALL_ARG_FN(do_all_fn),
|
||||
struct doall, &d);
|
||||
}
|
||||
|
||||
struct doall_sorted
|
||||
{
|
||||
int type;
|
||||
int n;
|
||||
const OBJ_NAME **names;
|
||||
};
|
||||
struct doall_sorted {
|
||||
int type;
|
||||
int n;
|
||||
const OBJ_NAME **names;
|
||||
};
|
||||
|
||||
static void do_all_sorted_fn(const OBJ_NAME *name,void *d_)
|
||||
{
|
||||
struct doall_sorted *d=d_;
|
||||
static void do_all_sorted_fn(const OBJ_NAME *name, void *d_)
|
||||
{
|
||||
struct doall_sorted *d = d_;
|
||||
|
||||
if(name->type != d->type)
|
||||
return;
|
||||
if (name->type != d->type)
|
||||
return;
|
||||
|
||||
d->names[d->n++]=name;
|
||||
}
|
||||
d->names[d->n++] = name;
|
||||
}
|
||||
|
||||
static int do_all_sorted_cmp(const void *n1_,const void *n2_)
|
||||
{
|
||||
const OBJ_NAME * const *n1=n1_;
|
||||
const OBJ_NAME * const *n2=n2_;
|
||||
static int do_all_sorted_cmp(const void *n1_, const void *n2_)
|
||||
{
|
||||
const OBJ_NAME *const *n1 = n1_;
|
||||
const OBJ_NAME *const *n2 = n2_;
|
||||
|
||||
return strcmp((*n1)->name,(*n2)->name);
|
||||
}
|
||||
return strcmp((*n1)->name, (*n2)->name);
|
||||
}
|
||||
|
||||
void OBJ_NAME_do_all_sorted(int type,void (*fn)(const OBJ_NAME *,void *arg),
|
||||
void *arg)
|
||||
{
|
||||
struct doall_sorted d;
|
||||
int n;
|
||||
void OBJ_NAME_do_all_sorted(int type,
|
||||
void (*fn) (const OBJ_NAME *, void *arg),
|
||||
void *arg)
|
||||
{
|
||||
struct doall_sorted d;
|
||||
int n;
|
||||
|
||||
d.type=type;
|
||||
d.names=OPENSSL_malloc(lh_OBJ_NAME_num_items(names_lh)*sizeof *d.names);
|
||||
d.n=0;
|
||||
OBJ_NAME_do_all(type,do_all_sorted_fn,&d);
|
||||
d.type = type;
|
||||
d.names =
|
||||
OPENSSL_malloc(lh_OBJ_NAME_num_items(names_lh) * sizeof *d.names);
|
||||
d.n = 0;
|
||||
OBJ_NAME_do_all(type, do_all_sorted_fn, &d);
|
||||
|
||||
qsort((void *)d.names,d.n,sizeof *d.names,do_all_sorted_cmp);
|
||||
qsort((void *)d.names, d.n, sizeof *d.names, do_all_sorted_cmp);
|
||||
|
||||
for(n=0 ; n < d.n ; ++n)
|
||||
fn(d.names[n],arg);
|
||||
for (n = 0; n < d.n; ++n)
|
||||
fn(d.names[n], arg);
|
||||
|
||||
OPENSSL_free((void *)d.names);
|
||||
}
|
||||
OPENSSL_free((void *)d.names);
|
||||
}
|
||||
|
||||
static int free_type;
|
||||
|
||||
static void names_lh_free_doall(OBJ_NAME *onp)
|
||||
{
|
||||
if (onp == NULL)
|
||||
return;
|
||||
{
|
||||
if (onp == NULL)
|
||||
return;
|
||||
|
||||
if (free_type < 0 || free_type == onp->type)
|
||||
OBJ_NAME_remove(onp->name,onp->type);
|
||||
}
|
||||
if (free_type < 0 || free_type == onp->type)
|
||||
OBJ_NAME_remove(onp->name, onp->type);
|
||||
}
|
||||
|
||||
static IMPLEMENT_LHASH_DOALL_FN(names_lh_free, OBJ_NAME)
|
||||
|
||||
static void name_funcs_free(NAME_FUNCS *ptr)
|
||||
{
|
||||
OPENSSL_free(ptr);
|
||||
}
|
||||
{
|
||||
OPENSSL_free(ptr);
|
||||
}
|
||||
|
||||
void OBJ_NAME_cleanup(int type)
|
||||
{
|
||||
unsigned long down_load;
|
||||
{
|
||||
unsigned long down_load;
|
||||
|
||||
if (names_lh == NULL) return;
|
||||
if (names_lh == NULL)
|
||||
return;
|
||||
|
||||
free_type=type;
|
||||
down_load=lh_OBJ_NAME_down_load(names_lh);
|
||||
lh_OBJ_NAME_down_load(names_lh)=0;
|
||||
|
||||
lh_OBJ_NAME_doall(names_lh,LHASH_DOALL_FN(names_lh_free));
|
||||
if (type < 0)
|
||||
{
|
||||
lh_OBJ_NAME_free(names_lh);
|
||||
sk_NAME_FUNCS_pop_free(name_funcs_stack,name_funcs_free);
|
||||
names_lh=NULL;
|
||||
name_funcs_stack = NULL;
|
||||
}
|
||||
else
|
||||
lh_OBJ_NAME_down_load(names_lh)=down_load;
|
||||
}
|
||||
free_type = type;
|
||||
down_load = lh_OBJ_NAME_down_load(names_lh);
|
||||
lh_OBJ_NAME_down_load(names_lh) = 0;
|
||||
|
||||
lh_OBJ_NAME_doall(names_lh, LHASH_DOALL_FN(names_lh_free));
|
||||
if (type < 0) {
|
||||
lh_OBJ_NAME_free(names_lh);
|
||||
sk_NAME_FUNCS_pop_free(name_funcs_stack, name_funcs_free);
|
||||
names_lh = NULL;
|
||||
name_funcs_stack = NULL;
|
||||
} else
|
||||
lh_OBJ_NAME_down_load(names_lh) = down_load;
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
@@ -7,7 +7,7 @@
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
@@ -53,7 +53,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
/* NOTE: this file was auto generated by the mkerr.pl script: any changes
|
||||
/*
|
||||
* NOTE: this file was auto generated by the mkerr.pl script: any changes
|
||||
* made to it will be overwritten when the script next updates this file,
|
||||
* only reason strings will be preserved.
|
||||
*/
|
||||
@@ -65,38 +66,35 @@
|
||||
/* BEGIN ERROR CODES */
|
||||
#ifndef OPENSSL_NO_ERR
|
||||
|
||||
#define ERR_FUNC(func) ERR_PACK(ERR_LIB_OBJ,func,0)
|
||||
#define ERR_REASON(reason) ERR_PACK(ERR_LIB_OBJ,0,reason)
|
||||
# define ERR_FUNC(func) ERR_PACK(ERR_LIB_OBJ,func,0)
|
||||
# define ERR_REASON(reason) ERR_PACK(ERR_LIB_OBJ,0,reason)
|
||||
|
||||
static ERR_STRING_DATA OBJ_str_functs[]=
|
||||
{
|
||||
{ERR_FUNC(OBJ_F_OBJ_ADD_OBJECT), "OBJ_add_object"},
|
||||
{ERR_FUNC(OBJ_F_OBJ_CREATE), "OBJ_create"},
|
||||
{ERR_FUNC(OBJ_F_OBJ_DUP), "OBJ_dup"},
|
||||
{ERR_FUNC(OBJ_F_OBJ_NAME_NEW_INDEX), "OBJ_NAME_new_index"},
|
||||
{ERR_FUNC(OBJ_F_OBJ_NID2LN), "OBJ_nid2ln"},
|
||||
{ERR_FUNC(OBJ_F_OBJ_NID2OBJ), "OBJ_nid2obj"},
|
||||
{ERR_FUNC(OBJ_F_OBJ_NID2SN), "OBJ_nid2sn"},
|
||||
{0,NULL}
|
||||
};
|
||||
static ERR_STRING_DATA OBJ_str_functs[] = {
|
||||
{ERR_FUNC(OBJ_F_OBJ_ADD_OBJECT), "OBJ_add_object"},
|
||||
{ERR_FUNC(OBJ_F_OBJ_CREATE), "OBJ_create"},
|
||||
{ERR_FUNC(OBJ_F_OBJ_DUP), "OBJ_dup"},
|
||||
{ERR_FUNC(OBJ_F_OBJ_NAME_NEW_INDEX), "OBJ_NAME_new_index"},
|
||||
{ERR_FUNC(OBJ_F_OBJ_NID2LN), "OBJ_nid2ln"},
|
||||
{ERR_FUNC(OBJ_F_OBJ_NID2OBJ), "OBJ_nid2obj"},
|
||||
{ERR_FUNC(OBJ_F_OBJ_NID2SN), "OBJ_nid2sn"},
|
||||
{0, NULL}
|
||||
};
|
||||
|
||||
static ERR_STRING_DATA OBJ_str_reasons[]=
|
||||
{
|
||||
{ERR_REASON(OBJ_R_MALLOC_FAILURE) ,"malloc failure"},
|
||||
{ERR_REASON(OBJ_R_UNKNOWN_NID) ,"unknown nid"},
|
||||
{0,NULL}
|
||||
};
|
||||
static ERR_STRING_DATA OBJ_str_reasons[] = {
|
||||
{ERR_REASON(OBJ_R_MALLOC_FAILURE), "malloc failure"},
|
||||
{ERR_REASON(OBJ_R_UNKNOWN_NID), "unknown nid"},
|
||||
{0, NULL}
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
void ERR_load_OBJ_strings(void)
|
||||
{
|
||||
{
|
||||
#ifndef OPENSSL_NO_ERR
|
||||
|
||||
if (ERR_func_error_string(OBJ_str_functs[0].error) == NULL)
|
||||
{
|
||||
ERR_load_strings(0,OBJ_str_functs);
|
||||
ERR_load_strings(0,OBJ_str_reasons);
|
||||
}
|
||||
if (ERR_func_error_string(OBJ_str_functs[0].error) == NULL) {
|
||||
ERR_load_strings(0, OBJ_str_functs);
|
||||
ERR_load_strings(0, OBJ_str_reasons);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
@@ -5,21 +5,21 @@
|
||||
* This package is an SSL implementation written
|
||||
* by Eric Young (eay@cryptsoft.com).
|
||||
* The implementation was written so as to conform with Netscapes SSL.
|
||||
*
|
||||
*
|
||||
* This library is free for commercial and non-commercial use as long as
|
||||
* the following conditions are aheared to. The following conditions
|
||||
* apply to all code found in this distribution, be it the RC4, RSA,
|
||||
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
||||
* included with this distribution is covered by the same copyright terms
|
||||
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
*
|
||||
* Copyright remains Eric Young's, and as such any Copyright notices in
|
||||
* the code are not to be removed.
|
||||
* If this package is used in a product, Eric Young should be given attribution
|
||||
* as the author of the parts of the library used.
|
||||
* This can be in the form of a textual message at program startup or
|
||||
* in documentation (online or textual) provided with the package.
|
||||
*
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
@@ -34,10 +34,10 @@
|
||||
* Eric Young (eay@cryptsoft.com)"
|
||||
* The word 'cryptographic' can be left out if the rouines from the library
|
||||
* being used are not cryptographic related :-).
|
||||
* 4. If you include any Windows specific code (or a derivative thereof) from
|
||||
* 4. If you include any Windows specific code (or a derivative thereof) from
|
||||
* the apps directory (application code) you must include an acknowledgement:
|
||||
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
||||
*
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
@@ -49,7 +49,7 @@
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
*
|
||||
* The licence and distribution terms for any publically available version or
|
||||
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
||||
* copied and put under another distribution licence
|
||||
@@ -63,67 +63,73 @@
|
||||
#include <openssl/buffer.h>
|
||||
|
||||
ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o)
|
||||
{
|
||||
ASN1_OBJECT *r;
|
||||
int i;
|
||||
char *ln=NULL,*sn=NULL;
|
||||
unsigned char *data=NULL;
|
||||
{
|
||||
ASN1_OBJECT *r;
|
||||
int i;
|
||||
char *ln = NULL, *sn = NULL;
|
||||
unsigned char *data = NULL;
|
||||
|
||||
if (o == NULL) return(NULL);
|
||||
if (!(o->flags & ASN1_OBJECT_FLAG_DYNAMIC))
|
||||
return((ASN1_OBJECT *)o); /* XXX: ugh! Why? What kind of
|
||||
duplication is this??? */
|
||||
if (o == NULL)
|
||||
return (NULL);
|
||||
if (!(o->flags & ASN1_OBJECT_FLAG_DYNAMIC))
|
||||
return ((ASN1_OBJECT *)o); /* XXX: ugh! Why? What kind of duplication
|
||||
* is this??? */
|
||||
|
||||
r=ASN1_OBJECT_new();
|
||||
if (r == NULL)
|
||||
{
|
||||
OBJerr(OBJ_F_OBJ_DUP,ERR_R_ASN1_LIB);
|
||||
return(NULL);
|
||||
}
|
||||
data=OPENSSL_malloc(o->length);
|
||||
if (data == NULL)
|
||||
goto err;
|
||||
if (o->data != NULL)
|
||||
memcpy(data,o->data,o->length);
|
||||
/* once data attached to object it remains const */
|
||||
r->data = data;
|
||||
r->length=o->length;
|
||||
r->nid=o->nid;
|
||||
r->ln=r->sn=NULL;
|
||||
if (o->ln != NULL)
|
||||
{
|
||||
i=strlen(o->ln)+1;
|
||||
ln=OPENSSL_malloc(i);
|
||||
if (ln == NULL) goto err;
|
||||
memcpy(ln,o->ln,i);
|
||||
r->ln=ln;
|
||||
}
|
||||
r = ASN1_OBJECT_new();
|
||||
if (r == NULL) {
|
||||
OBJerr(OBJ_F_OBJ_DUP, ERR_R_ASN1_LIB);
|
||||
return (NULL);
|
||||
}
|
||||
data = OPENSSL_malloc(o->length);
|
||||
if (data == NULL)
|
||||
goto err;
|
||||
if (o->data != NULL)
|
||||
memcpy(data, o->data, o->length);
|
||||
/* once data attached to object it remains const */
|
||||
r->data = data;
|
||||
r->length = o->length;
|
||||
r->nid = o->nid;
|
||||
r->ln = r->sn = NULL;
|
||||
if (o->ln != NULL) {
|
||||
i = strlen(o->ln) + 1;
|
||||
ln = OPENSSL_malloc(i);
|
||||
if (ln == NULL)
|
||||
goto err;
|
||||
memcpy(ln, o->ln, i);
|
||||
r->ln = ln;
|
||||
}
|
||||
|
||||
if (o->sn != NULL)
|
||||
{
|
||||
i=strlen(o->sn)+1;
|
||||
sn=OPENSSL_malloc(i);
|
||||
if (sn == NULL) goto err;
|
||||
memcpy(sn,o->sn,i);
|
||||
r->sn=sn;
|
||||
}
|
||||
r->flags=o->flags|(ASN1_OBJECT_FLAG_DYNAMIC|
|
||||
ASN1_OBJECT_FLAG_DYNAMIC_STRINGS|ASN1_OBJECT_FLAG_DYNAMIC_DATA);
|
||||
return(r);
|
||||
err:
|
||||
OBJerr(OBJ_F_OBJ_DUP,ERR_R_MALLOC_FAILURE);
|
||||
if (ln != NULL) OPENSSL_free(ln);
|
||||
if (sn != NULL) OPENSSL_free(sn);
|
||||
if (data != NULL) OPENSSL_free(data);
|
||||
if (r != NULL) OPENSSL_free(r);
|
||||
return(NULL);
|
||||
}
|
||||
if (o->sn != NULL) {
|
||||
i = strlen(o->sn) + 1;
|
||||
sn = OPENSSL_malloc(i);
|
||||
if (sn == NULL)
|
||||
goto err;
|
||||
memcpy(sn, o->sn, i);
|
||||
r->sn = sn;
|
||||
}
|
||||
r->flags = o->flags | (ASN1_OBJECT_FLAG_DYNAMIC |
|
||||
ASN1_OBJECT_FLAG_DYNAMIC_STRINGS |
|
||||
ASN1_OBJECT_FLAG_DYNAMIC_DATA);
|
||||
return (r);
|
||||
err:
|
||||
OBJerr(OBJ_F_OBJ_DUP, ERR_R_MALLOC_FAILURE);
|
||||
if (ln != NULL)
|
||||
OPENSSL_free(ln);
|
||||
if (sn != NULL)
|
||||
OPENSSL_free(sn);
|
||||
if (data != NULL)
|
||||
OPENSSL_free(data);
|
||||
if (r != NULL)
|
||||
OPENSSL_free(r);
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
int OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b)
|
||||
{
|
||||
int ret;
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret=(a->length-b->length);
|
||||
if (ret) return(ret);
|
||||
return(memcmp(a->data,b->data,a->length));
|
||||
}
|
||||
ret = (a->length - b->length);
|
||||
if (ret)
|
||||
return (ret);
|
||||
return (memcmp(a->data, b->data, a->length));
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,7 @@
|
||||
/* crypto/objects/obj_xref.c */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 2006.
|
||||
/*
|
||||
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
|
||||
* 2006.
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 2006 The OpenSSL Project. All rights reserved.
|
||||
@@ -10,7 +11,7 @@
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
@@ -63,172 +64,159 @@ DECLARE_STACK_OF(nid_triple)
|
||||
STACK_OF(nid_triple) *sig_app, *sigx_app;
|
||||
|
||||
static int sig_cmp(const nid_triple *a, const nid_triple *b)
|
||||
{
|
||||
return a->sign_id - b->sign_id;
|
||||
}
|
||||
{
|
||||
return a->sign_id - b->sign_id;
|
||||
}
|
||||
|
||||
DECLARE_OBJ_BSEARCH_CMP_FN(nid_triple, nid_triple, sig);
|
||||
IMPLEMENT_OBJ_BSEARCH_CMP_FN(nid_triple, nid_triple, sig);
|
||||
|
||||
static int sig_sk_cmp(const nid_triple * const *a, const nid_triple * const *b)
|
||||
{
|
||||
return (*a)->sign_id - (*b)->sign_id;
|
||||
}
|
||||
static int sig_sk_cmp(const nid_triple *const *a, const nid_triple *const *b)
|
||||
{
|
||||
return (*a)->sign_id - (*b)->sign_id;
|
||||
}
|
||||
|
||||
DECLARE_OBJ_BSEARCH_CMP_FN(const nid_triple *, const nid_triple *, sigx);
|
||||
|
||||
static int sigx_cmp(const nid_triple * const *a, const nid_triple * const *b)
|
||||
{
|
||||
int ret;
|
||||
ret = (*a)->hash_id - (*b)->hash_id;
|
||||
if (ret)
|
||||
return ret;
|
||||
return (*a)->pkey_id - (*b)->pkey_id;
|
||||
}
|
||||
static int sigx_cmp(const nid_triple *const *a, const nid_triple *const *b)
|
||||
{
|
||||
int ret;
|
||||
ret = (*a)->hash_id - (*b)->hash_id;
|
||||
if (ret)
|
||||
return ret;
|
||||
return (*a)->pkey_id - (*b)->pkey_id;
|
||||
}
|
||||
|
||||
IMPLEMENT_OBJ_BSEARCH_CMP_FN(const nid_triple *, const nid_triple *, sigx);
|
||||
|
||||
int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid)
|
||||
{
|
||||
nid_triple tmp;
|
||||
const nid_triple *rv = NULL;
|
||||
tmp.sign_id = signid;
|
||||
|
||||
if (sig_app)
|
||||
{
|
||||
int idx = sk_nid_triple_find(sig_app, &tmp);
|
||||
if (idx >= 0)
|
||||
rv = sk_nid_triple_value(sig_app, idx);
|
||||
}
|
||||
{
|
||||
nid_triple tmp;
|
||||
const nid_triple *rv = NULL;
|
||||
tmp.sign_id = signid;
|
||||
|
||||
if (sig_app) {
|
||||
int idx = sk_nid_triple_find(sig_app, &tmp);
|
||||
if (idx >= 0)
|
||||
rv = sk_nid_triple_value(sig_app, idx);
|
||||
}
|
||||
#ifndef OBJ_XREF_TEST2
|
||||
if (rv == NULL)
|
||||
{
|
||||
rv = OBJ_bsearch_sig(&tmp, sigoid_srt,
|
||||
sizeof(sigoid_srt) / sizeof(nid_triple));
|
||||
}
|
||||
if (rv == NULL) {
|
||||
rv = OBJ_bsearch_sig(&tmp, sigoid_srt,
|
||||
sizeof(sigoid_srt) / sizeof(nid_triple));
|
||||
}
|
||||
#endif
|
||||
if (rv == NULL)
|
||||
return 0;
|
||||
if (pdig_nid)
|
||||
*pdig_nid = rv->hash_id;
|
||||
if (ppkey_nid)
|
||||
*ppkey_nid = rv->pkey_id;
|
||||
return 1;
|
||||
}
|
||||
if (rv == NULL)
|
||||
return 0;
|
||||
if (pdig_nid)
|
||||
*pdig_nid = rv->hash_id;
|
||||
if (ppkey_nid)
|
||||
*ppkey_nid = rv->pkey_id;
|
||||
return 1;
|
||||
}
|
||||
|
||||
int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid)
|
||||
{
|
||||
nid_triple tmp;
|
||||
const nid_triple *t=&tmp;
|
||||
const nid_triple **rv = NULL;
|
||||
{
|
||||
nid_triple tmp;
|
||||
const nid_triple *t = &tmp;
|
||||
const nid_triple **rv = NULL;
|
||||
|
||||
tmp.hash_id = dig_nid;
|
||||
tmp.pkey_id = pkey_nid;
|
||||
|
||||
if (sigx_app)
|
||||
{
|
||||
int idx = sk_nid_triple_find(sigx_app, &tmp);
|
||||
if (idx >= 0)
|
||||
{
|
||||
t = sk_nid_triple_value(sigx_app, idx);
|
||||
rv = &t;
|
||||
}
|
||||
}
|
||||
tmp.hash_id = dig_nid;
|
||||
tmp.pkey_id = pkey_nid;
|
||||
|
||||
if (sigx_app) {
|
||||
int idx = sk_nid_triple_find(sigx_app, &tmp);
|
||||
if (idx >= 0) {
|
||||
t = sk_nid_triple_value(sigx_app, idx);
|
||||
rv = &t;
|
||||
}
|
||||
}
|
||||
#ifndef OBJ_XREF_TEST2
|
||||
if (rv == NULL)
|
||||
{
|
||||
rv = OBJ_bsearch_sigx(&t, sigoid_srt_xref,
|
||||
sizeof(sigoid_srt_xref) / sizeof(nid_triple *)
|
||||
);
|
||||
}
|
||||
if (rv == NULL) {
|
||||
rv = OBJ_bsearch_sigx(&t, sigoid_srt_xref,
|
||||
sizeof(sigoid_srt_xref) / sizeof(nid_triple *)
|
||||
);
|
||||
}
|
||||
#endif
|
||||
if (rv == NULL)
|
||||
return 0;
|
||||
if (psignid)
|
||||
*psignid = (*rv)->sign_id;
|
||||
return 1;
|
||||
}
|
||||
if (rv == NULL)
|
||||
return 0;
|
||||
if (psignid)
|
||||
*psignid = (*rv)->sign_id;
|
||||
return 1;
|
||||
}
|
||||
|
||||
int OBJ_add_sigid(int signid, int dig_id, int pkey_id)
|
||||
{
|
||||
nid_triple *ntr;
|
||||
if (!sig_app)
|
||||
sig_app = sk_nid_triple_new(sig_sk_cmp);
|
||||
if (!sig_app)
|
||||
return 0;
|
||||
if (!sigx_app)
|
||||
sigx_app = sk_nid_triple_new(sigx_cmp);
|
||||
if (!sigx_app)
|
||||
return 0;
|
||||
ntr = OPENSSL_malloc(sizeof(int) * 3);
|
||||
if (!ntr)
|
||||
return 0;
|
||||
ntr->sign_id = signid;
|
||||
ntr->hash_id = dig_id;
|
||||
ntr->pkey_id = pkey_id;
|
||||
{
|
||||
nid_triple *ntr;
|
||||
if (!sig_app)
|
||||
sig_app = sk_nid_triple_new(sig_sk_cmp);
|
||||
if (!sig_app)
|
||||
return 0;
|
||||
if (!sigx_app)
|
||||
sigx_app = sk_nid_triple_new(sigx_cmp);
|
||||
if (!sigx_app)
|
||||
return 0;
|
||||
ntr = OPENSSL_malloc(sizeof(int) * 3);
|
||||
if (!ntr)
|
||||
return 0;
|
||||
ntr->sign_id = signid;
|
||||
ntr->hash_id = dig_id;
|
||||
ntr->pkey_id = pkey_id;
|
||||
|
||||
if (!sk_nid_triple_push(sig_app, ntr))
|
||||
{
|
||||
OPENSSL_free(ntr);
|
||||
return 0;
|
||||
}
|
||||
if (!sk_nid_triple_push(sig_app, ntr)) {
|
||||
OPENSSL_free(ntr);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!sk_nid_triple_push(sigx_app, ntr))
|
||||
return 0;
|
||||
if (!sk_nid_triple_push(sigx_app, ntr))
|
||||
return 0;
|
||||
|
||||
sk_nid_triple_sort(sig_app);
|
||||
sk_nid_triple_sort(sigx_app);
|
||||
sk_nid_triple_sort(sig_app);
|
||||
sk_nid_triple_sort(sigx_app);
|
||||
|
||||
return 1;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void sid_free(nid_triple *tt)
|
||||
{
|
||||
OPENSSL_free(tt);
|
||||
}
|
||||
{
|
||||
OPENSSL_free(tt);
|
||||
}
|
||||
|
||||
void OBJ_sigid_free(void)
|
||||
{
|
||||
if (sig_app)
|
||||
{
|
||||
sk_nid_triple_pop_free(sig_app, sid_free);
|
||||
sig_app = NULL;
|
||||
}
|
||||
if (sigx_app)
|
||||
{
|
||||
sk_nid_triple_free(sigx_app);
|
||||
sigx_app = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
if (sig_app) {
|
||||
sk_nid_triple_pop_free(sig_app, sid_free);
|
||||
sig_app = NULL;
|
||||
}
|
||||
if (sigx_app) {
|
||||
sk_nid_triple_free(sigx_app);
|
||||
sigx_app = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef OBJ_XREF_TEST
|
||||
|
||||
main()
|
||||
{
|
||||
int n1, n2, n3;
|
||||
{
|
||||
int n1, n2, n3;
|
||||
|
||||
int i, rv;
|
||||
#ifdef OBJ_XREF_TEST2
|
||||
for (i = 0; i < sizeof(sigoid_srt) / sizeof(nid_triple); i++)
|
||||
{
|
||||
OBJ_add_sigid(sigoid_srt[i][0], sigoid_srt[i][1],
|
||||
sigoid_srt[i][2]);
|
||||
}
|
||||
#endif
|
||||
int i, rv;
|
||||
# ifdef OBJ_XREF_TEST2
|
||||
for (i = 0; i < sizeof(sigoid_srt) / sizeof(nid_triple); i++) {
|
||||
OBJ_add_sigid(sigoid_srt[i][0], sigoid_srt[i][1], sigoid_srt[i][2]);
|
||||
}
|
||||
# endif
|
||||
|
||||
for (i = 0; i < sizeof(sigoid_srt) / sizeof(nid_triple); i++) {
|
||||
n1 = sigoid_srt[i][0];
|
||||
rv = OBJ_find_sigid_algs(n1, &n2, &n3);
|
||||
printf("Forward: %d, %s %s %s\n", rv,
|
||||
OBJ_nid2ln(n1), OBJ_nid2ln(n2), OBJ_nid2ln(n3));
|
||||
n1 = 0;
|
||||
rv = OBJ_find_sigid_by_algs(&n1, n2, n3);
|
||||
printf("Reverse: %d, %s %s %s\n", rv,
|
||||
OBJ_nid2ln(n1), OBJ_nid2ln(n2), OBJ_nid2ln(n3));
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < sizeof(sigoid_srt) / sizeof(nid_triple); i++)
|
||||
{
|
||||
n1 = sigoid_srt[i][0];
|
||||
rv = OBJ_find_sigid_algs(n1, &n2, &n3);
|
||||
printf("Forward: %d, %s %s %s\n", rv,
|
||||
OBJ_nid2ln(n1), OBJ_nid2ln(n2), OBJ_nid2ln(n3));
|
||||
n1=0;
|
||||
rv = OBJ_find_sigid_by_algs(&n1, n2, n3);
|
||||
printf("Reverse: %d, %s %s %s\n", rv,
|
||||
OBJ_nid2ln(n1), OBJ_nid2ln(n2), OBJ_nid2ln(n3));
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@@ -1,94 +1,99 @@
|
||||
/* AUTOGENERATED BY objxref.pl, DO NOT EDIT */
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int sign_id;
|
||||
int hash_id;
|
||||
int pkey_id;
|
||||
} nid_triple;
|
||||
typedef struct {
|
||||
int sign_id;
|
||||
int hash_id;
|
||||
int pkey_id;
|
||||
} nid_triple;
|
||||
|
||||
static const nid_triple sigoid_srt[] =
|
||||
{
|
||||
{NID_md2WithRSAEncryption, NID_md2, NID_rsaEncryption},
|
||||
{NID_md5WithRSAEncryption, NID_md5, NID_rsaEncryption},
|
||||
{NID_shaWithRSAEncryption, NID_sha, NID_rsaEncryption},
|
||||
{NID_sha1WithRSAEncryption, NID_sha1, NID_rsaEncryption},
|
||||
{NID_dsaWithSHA, NID_sha, NID_dsa},
|
||||
{NID_dsaWithSHA1_2, NID_sha1, NID_dsa_2},
|
||||
{NID_mdc2WithRSA, NID_mdc2, NID_rsaEncryption},
|
||||
{NID_md5WithRSA, NID_md5, NID_rsa},
|
||||
{NID_dsaWithSHA1, NID_sha1, NID_dsa},
|
||||
{NID_sha1WithRSA, NID_sha1, NID_rsa},
|
||||
{NID_ripemd160WithRSA, NID_ripemd160, NID_rsaEncryption},
|
||||
{NID_md4WithRSAEncryption, NID_md4, NID_rsaEncryption},
|
||||
{NID_ecdsa_with_SHA1, NID_sha1, NID_X9_62_id_ecPublicKey},
|
||||
{NID_sha256WithRSAEncryption, NID_sha256, NID_rsaEncryption},
|
||||
{NID_sha384WithRSAEncryption, NID_sha384, NID_rsaEncryption},
|
||||
{NID_sha512WithRSAEncryption, NID_sha512, NID_rsaEncryption},
|
||||
{NID_sha224WithRSAEncryption, NID_sha224, NID_rsaEncryption},
|
||||
{NID_ecdsa_with_Recommended, NID_undef, NID_X9_62_id_ecPublicKey},
|
||||
{NID_ecdsa_with_Specified, NID_undef, NID_X9_62_id_ecPublicKey},
|
||||
{NID_ecdsa_with_SHA224, NID_sha224, NID_X9_62_id_ecPublicKey},
|
||||
{NID_ecdsa_with_SHA256, NID_sha256, NID_X9_62_id_ecPublicKey},
|
||||
{NID_ecdsa_with_SHA384, NID_sha384, NID_X9_62_id_ecPublicKey},
|
||||
{NID_ecdsa_with_SHA512, NID_sha512, NID_X9_62_id_ecPublicKey},
|
||||
{NID_dsa_with_SHA224, NID_sha224, NID_dsa},
|
||||
{NID_dsa_with_SHA256, NID_sha256, NID_dsa},
|
||||
{NID_id_GostR3411_94_with_GostR3410_2001, NID_id_GostR3411_94, NID_id_GostR3410_2001},
|
||||
{NID_id_GostR3411_94_with_GostR3410_94, NID_id_GostR3411_94, NID_id_GostR3410_94},
|
||||
{NID_id_GostR3411_94_with_GostR3410_94_cc, NID_id_GostR3411_94, NID_id_GostR3410_94_cc},
|
||||
{NID_id_GostR3411_94_with_GostR3410_2001_cc, NID_id_GostR3411_94, NID_id_GostR3410_2001_cc},
|
||||
{NID_rsassaPss, NID_undef, NID_rsaEncryption},
|
||||
{NID_dhSinglePass_stdDH_sha1kdf_scheme, NID_sha1, NID_dh_std_kdf},
|
||||
{NID_dhSinglePass_stdDH_sha224kdf_scheme, NID_sha224, NID_dh_std_kdf},
|
||||
{NID_dhSinglePass_stdDH_sha256kdf_scheme, NID_sha256, NID_dh_std_kdf},
|
||||
{NID_dhSinglePass_stdDH_sha384kdf_scheme, NID_sha384, NID_dh_std_kdf},
|
||||
{NID_dhSinglePass_stdDH_sha512kdf_scheme, NID_sha512, NID_dh_std_kdf},
|
||||
{NID_dhSinglePass_cofactorDH_sha1kdf_scheme, NID_sha1, NID_dh_cofactor_kdf},
|
||||
{NID_dhSinglePass_cofactorDH_sha224kdf_scheme, NID_sha224, NID_dh_cofactor_kdf},
|
||||
{NID_dhSinglePass_cofactorDH_sha256kdf_scheme, NID_sha256, NID_dh_cofactor_kdf},
|
||||
{NID_dhSinglePass_cofactorDH_sha384kdf_scheme, NID_sha384, NID_dh_cofactor_kdf},
|
||||
{NID_dhSinglePass_cofactorDH_sha512kdf_scheme, NID_sha512, NID_dh_cofactor_kdf},
|
||||
};
|
||||
|
||||
static const nid_triple * const sigoid_srt_xref[] =
|
||||
{
|
||||
&sigoid_srt[0],
|
||||
&sigoid_srt[1],
|
||||
&sigoid_srt[7],
|
||||
&sigoid_srt[2],
|
||||
&sigoid_srt[4],
|
||||
&sigoid_srt[3],
|
||||
&sigoid_srt[9],
|
||||
&sigoid_srt[5],
|
||||
&sigoid_srt[8],
|
||||
&sigoid_srt[12],
|
||||
&sigoid_srt[30],
|
||||
&sigoid_srt[35],
|
||||
&sigoid_srt[6],
|
||||
&sigoid_srt[10],
|
||||
&sigoid_srt[11],
|
||||
&sigoid_srt[13],
|
||||
&sigoid_srt[24],
|
||||
&sigoid_srt[20],
|
||||
&sigoid_srt[32],
|
||||
&sigoid_srt[37],
|
||||
&sigoid_srt[14],
|
||||
&sigoid_srt[21],
|
||||
&sigoid_srt[33],
|
||||
&sigoid_srt[38],
|
||||
&sigoid_srt[15],
|
||||
&sigoid_srt[22],
|
||||
&sigoid_srt[34],
|
||||
&sigoid_srt[39],
|
||||
&sigoid_srt[16],
|
||||
&sigoid_srt[23],
|
||||
&sigoid_srt[19],
|
||||
&sigoid_srt[31],
|
||||
&sigoid_srt[36],
|
||||
&sigoid_srt[25],
|
||||
&sigoid_srt[26],
|
||||
&sigoid_srt[27],
|
||||
&sigoid_srt[28],
|
||||
};
|
||||
static const nid_triple sigoid_srt[] = {
|
||||
{NID_md2WithRSAEncryption, NID_md2, NID_rsaEncryption},
|
||||
{NID_md5WithRSAEncryption, NID_md5, NID_rsaEncryption},
|
||||
{NID_shaWithRSAEncryption, NID_sha, NID_rsaEncryption},
|
||||
{NID_sha1WithRSAEncryption, NID_sha1, NID_rsaEncryption},
|
||||
{NID_dsaWithSHA, NID_sha, NID_dsa},
|
||||
{NID_dsaWithSHA1_2, NID_sha1, NID_dsa_2},
|
||||
{NID_mdc2WithRSA, NID_mdc2, NID_rsaEncryption},
|
||||
{NID_md5WithRSA, NID_md5, NID_rsa},
|
||||
{NID_dsaWithSHA1, NID_sha1, NID_dsa},
|
||||
{NID_sha1WithRSA, NID_sha1, NID_rsa},
|
||||
{NID_ripemd160WithRSA, NID_ripemd160, NID_rsaEncryption},
|
||||
{NID_md4WithRSAEncryption, NID_md4, NID_rsaEncryption},
|
||||
{NID_ecdsa_with_SHA1, NID_sha1, NID_X9_62_id_ecPublicKey},
|
||||
{NID_sha256WithRSAEncryption, NID_sha256, NID_rsaEncryption},
|
||||
{NID_sha384WithRSAEncryption, NID_sha384, NID_rsaEncryption},
|
||||
{NID_sha512WithRSAEncryption, NID_sha512, NID_rsaEncryption},
|
||||
{NID_sha224WithRSAEncryption, NID_sha224, NID_rsaEncryption},
|
||||
{NID_ecdsa_with_Recommended, NID_undef, NID_X9_62_id_ecPublicKey},
|
||||
{NID_ecdsa_with_Specified, NID_undef, NID_X9_62_id_ecPublicKey},
|
||||
{NID_ecdsa_with_SHA224, NID_sha224, NID_X9_62_id_ecPublicKey},
|
||||
{NID_ecdsa_with_SHA256, NID_sha256, NID_X9_62_id_ecPublicKey},
|
||||
{NID_ecdsa_with_SHA384, NID_sha384, NID_X9_62_id_ecPublicKey},
|
||||
{NID_ecdsa_with_SHA512, NID_sha512, NID_X9_62_id_ecPublicKey},
|
||||
{NID_dsa_with_SHA224, NID_sha224, NID_dsa},
|
||||
{NID_dsa_with_SHA256, NID_sha256, NID_dsa},
|
||||
{NID_id_GostR3411_94_with_GostR3410_2001, NID_id_GostR3411_94,
|
||||
NID_id_GostR3410_2001},
|
||||
{NID_id_GostR3411_94_with_GostR3410_94, NID_id_GostR3411_94,
|
||||
NID_id_GostR3410_94},
|
||||
{NID_id_GostR3411_94_with_GostR3410_94_cc, NID_id_GostR3411_94,
|
||||
NID_id_GostR3410_94_cc},
|
||||
{NID_id_GostR3411_94_with_GostR3410_2001_cc, NID_id_GostR3411_94,
|
||||
NID_id_GostR3410_2001_cc},
|
||||
{NID_rsassaPss, NID_undef, NID_rsaEncryption},
|
||||
{NID_dhSinglePass_stdDH_sha1kdf_scheme, NID_sha1, NID_dh_std_kdf},
|
||||
{NID_dhSinglePass_stdDH_sha224kdf_scheme, NID_sha224, NID_dh_std_kdf},
|
||||
{NID_dhSinglePass_stdDH_sha256kdf_scheme, NID_sha256, NID_dh_std_kdf},
|
||||
{NID_dhSinglePass_stdDH_sha384kdf_scheme, NID_sha384, NID_dh_std_kdf},
|
||||
{NID_dhSinglePass_stdDH_sha512kdf_scheme, NID_sha512, NID_dh_std_kdf},
|
||||
{NID_dhSinglePass_cofactorDH_sha1kdf_scheme, NID_sha1,
|
||||
NID_dh_cofactor_kdf},
|
||||
{NID_dhSinglePass_cofactorDH_sha224kdf_scheme, NID_sha224,
|
||||
NID_dh_cofactor_kdf},
|
||||
{NID_dhSinglePass_cofactorDH_sha256kdf_scheme, NID_sha256,
|
||||
NID_dh_cofactor_kdf},
|
||||
{NID_dhSinglePass_cofactorDH_sha384kdf_scheme, NID_sha384,
|
||||
NID_dh_cofactor_kdf},
|
||||
{NID_dhSinglePass_cofactorDH_sha512kdf_scheme, NID_sha512,
|
||||
NID_dh_cofactor_kdf},
|
||||
};
|
||||
|
||||
static const nid_triple *const sigoid_srt_xref[] = {
|
||||
&sigoid_srt[0],
|
||||
&sigoid_srt[1],
|
||||
&sigoid_srt[7],
|
||||
&sigoid_srt[2],
|
||||
&sigoid_srt[4],
|
||||
&sigoid_srt[3],
|
||||
&sigoid_srt[9],
|
||||
&sigoid_srt[5],
|
||||
&sigoid_srt[8],
|
||||
&sigoid_srt[12],
|
||||
&sigoid_srt[30],
|
||||
&sigoid_srt[35],
|
||||
&sigoid_srt[6],
|
||||
&sigoid_srt[10],
|
||||
&sigoid_srt[11],
|
||||
&sigoid_srt[13],
|
||||
&sigoid_srt[24],
|
||||
&sigoid_srt[20],
|
||||
&sigoid_srt[32],
|
||||
&sigoid_srt[37],
|
||||
&sigoid_srt[14],
|
||||
&sigoid_srt[21],
|
||||
&sigoid_srt[33],
|
||||
&sigoid_srt[38],
|
||||
&sigoid_srt[15],
|
||||
&sigoid_srt[22],
|
||||
&sigoid_srt[34],
|
||||
&sigoid_srt[39],
|
||||
&sigoid_srt[16],
|
||||
&sigoid_srt[23],
|
||||
&sigoid_srt[19],
|
||||
&sigoid_srt[31],
|
||||
&sigoid_srt[36],
|
||||
&sigoid_srt[25],
|
||||
&sigoid_srt[26],
|
||||
&sigoid_srt[27],
|
||||
&sigoid_srt[28],
|
||||
};
|
||||
|
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user