* 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
- {
+typedef struct name_funcs_st {
unsigned long (*hash_func)(const char *name);
- int (*cmp_func)(const char *a,const char *b);
+ int (*cmp_func)(const char *a, const char *b);
void (*free_func)(const char *, int, const char *);
- } NAME_FUNCS;
+} NAME_FUNCS;
DECLARE_STACK_OF(NAME_FUNCS)
IMPLEMENT_STACK_OF(NAME_FUNCS)
/* 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);
+int
+OBJ_NAME_init(void)
+{
+ if (names_lh != NULL)
+ return (1);
MemCheck_off();
- names_lh=lh_OBJ_NAME_new();
+ 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 *))
- {
+ 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;
- if (name_funcs_stack == NULL)
- {
+ if (name_funcs_stack == NULL) {
MemCheck_off();
- name_funcs_stack=sk_NAME_FUNCS_new_null();
+ name_funcs_stack = sk_NAME_FUNCS_new_null();
MemCheck_on();
- }
- if (name_funcs_stack == NULL)
- {
+ }
+ if (name_funcs_stack == NULL) {
/* ERROR */
- return(0);
- }
- ret=names_type_num;
+ return (0);
+ }
+ ret = names_type_num;
names_type_num++;
- for (i=sk_NAME_FUNCS_num(name_funcs_stack); i<names_type_num; i++)
- {
+ for (i = sk_NAME_FUNCS_num(name_funcs_stack); i < names_type_num; i++) {
MemCheck_off();
name_funcs = malloc(sizeof(NAME_FUNCS));
MemCheck_on();
- if (!name_funcs)
- {
- OBJerr(OBJ_F_OBJ_NAME_NEW_INDEX,ERR_R_MALLOC_FAILURE);
- return(0);
- }
+ 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 = strcmp;
name_funcs->free_func = NULL;
MemCheck_off();
- sk_NAME_FUNCS_push(name_funcs_stack,name_funcs);
+ 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;
name_funcs->cmp_func = cmp_func;
if (free_func != NULL)
name_funcs->free_func = free_func;
- return(ret);
- }
+ 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)
- {
+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;
- 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)
- {
+static unsigned long
+obj_name_hash(const void *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);
}
-
-const char *OBJ_NAME_get(const char *name, int type)
- {
- OBJ_NAME on,*ret;
- int num=0,alias;
-
- if (name == NULL) return(NULL);
- if ((names_lh == NULL) && !OBJ_NAME_init()) return(NULL);
-
- alias=type&OBJ_NAME_ALIAS;
+ ret ^= a->type;
+ return (ret);
+}
+
+const char *
+OBJ_NAME_get(const char *name, int type)
+{
+ OBJ_NAME on, *ret;
+ int num = 0, alias;
+
+ if (name == NULL)
+ return (NULL);
+ if ((names_lh == NULL) && !OBJ_NAME_init())
+ return (NULL);
+
+ alias = type&OBJ_NAME_ALIAS;
type&= ~OBJ_NAME_ALIAS;
- 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);
- }
+ 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);
}
}
+}
-int OBJ_NAME_add(const char *name, int type, const char *data)
- {
- OBJ_NAME *onp,*ret;
+int
+OBJ_NAME_add(const char *name, int type, const char *data)
+{
+ 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 *)malloc(sizeof(OBJ_NAME));
- if (onp == NULL)
- {
+ onp = (OBJ_NAME *)malloc(sizeof(OBJ_NAME));
+ if (onp == NULL) {
/* ERROR */
- return(0);
- }
+ 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)
- {
+ 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))
- {
+ 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);
- }
- free(ret);
+ sk_NAME_FUNCS_value(
+ name_funcs_stack, ret->type)->free_func(
+ ret->name, ret->type, ret->data);
}
- else
- {
- if (lh_OBJ_NAME_error(names_lh))
- {
+ free(ret);
+ } else {
+ if (lh_OBJ_NAME_error(names_lh)) {
/* ERROR */
- return(0);
- }
+ return (0);
}
- return(1);
}
-
-int OBJ_NAME_remove(const char *name, int type)
- {
- OBJ_NAME on,*ret;
-
- 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)
- {
+ return (1);
+}
+
+int
+OBJ_NAME_remove(const char *name, int type)
+{
+ OBJ_NAME on, *ret;
+
+ 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))
- {
+ 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);
- }
- free(ret);
- return(1);
+ sk_NAME_FUNCS_value(
+ name_funcs_stack, ret->type)->free_func(
+ ret->name, ret->type, ret->data);
}
- else
- return(0);
- }
+ free(ret);
+ return (1);
+ } else
+ return (0);
+}
-struct doall
- {
+struct doall {
int type;
- void (*fn)(const OBJ_NAME *,void *arg);
+ 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)
- {
+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);
- }
+ struct doall, &d);
+}
-struct doall_sorted
- {
+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)
+ 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)
- {
+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=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 = 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);
free((void *)d.names);
- }
+}
static int free_type;
-static void names_lh_free_doall(OBJ_NAME *onp)
- {
+static void
+names_lh_free_doall(OBJ_NAME *onp)
+{
if (onp == NULL)
return;
if (free_type < 0 || free_type == onp->type)
- OBJ_NAME_remove(onp->name,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)
- {
+static void
+name_funcs_free(NAME_FUNCS *ptr)
+{
free(ptr);
- }
+}
-void OBJ_NAME_cleanup(int type)
- {
+void
+OBJ_NAME_cleanup(int type)
+{
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;
+ 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_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;
+ 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;
- }
-
+ } else
+ lh_OBJ_NAME_down_load(names_lh) = down_load;
+}
* 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:
* 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
* 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
#define ADDED_LNAME 2
#define ADDED_NID 3
-typedef struct added_obj_st
- {
+typedef struct added_obj_st {
int type;
ASN1_OBJECT *obj;
- } ADDED_OBJ;
+} ADDED_OBJ;
DECLARE_LHASH_OF(ADDED_OBJ);
-static int new_nid=NUM_NID;
-static LHASH_OF(ADDED_OBJ) *added=NULL;
+static int new_nid = NUM_NID;
+static LHASH_OF(ADDED_OBJ) *added = NULL;
static int sn_cmp(const ASN1_OBJECT * const *a, const unsigned int *b)
- { return(strcmp((*a)->sn,nid_objs[*b].sn)); }
+{
+ return (strcmp((*a)->sn, nid_objs[*b].sn));
+}
IMPLEMENT_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, sn);
static int ln_cmp(const ASN1_OBJECT * const *a, const unsigned int *b)
- { return(strcmp((*a)->ln,nid_objs[*b].ln)); }
+{
+ return (strcmp((*a)->ln, nid_objs[*b].ln));
+}
IMPLEMENT_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, ln);
-static unsigned long added_obj_hash(const ADDED_OBJ *ca)
- {
+static unsigned long
+added_obj_hash(const ADDED_OBJ *ca)
+{
const ASN1_OBJECT *a;
int i;
- unsigned long ret=0;
+ unsigned long ret = 0;
unsigned char *p;
- a=ca->obj;
- switch (ca->type)
- {
+ a = ca->obj;
+ switch (ca->type) {
case ADDED_DATA:
- ret=a->length<<20L;
- p=(unsigned char *)a->data;
- for (i=0; i<a->length; i++)
- ret^=p[i]<<((i*3)%24);
+ ret = a->length << 20L;
+ p = (unsigned char *)a->data;
+ for (i = 0; i < a->length; i++)
+ ret ^= p[i] << ((i * 3) % 24);
break;
case ADDED_SNAME:
- ret=lh_strhash(a->sn);
+ ret = lh_strhash(a->sn);
break;
case ADDED_LNAME:
- ret=lh_strhash(a->ln);
+ ret = lh_strhash(a->ln);
break;
case ADDED_NID:
- ret=a->nid;
+ ret = a->nid;
break;
default:
/* abort(); */
return 0;
- }
- ret&=0x3fffffffL;
- ret|=ca->type<<30L;
- return(ret);
}
+ ret &= 0x3fffffffL;
+ ret |= ca->type << 30L;
+ return (ret);
+}
static IMPLEMENT_LHASH_HASH_FN(added_obj, ADDED_OBJ)
-static int added_obj_cmp(const ADDED_OBJ *ca, const ADDED_OBJ *cb)
- {
- ASN1_OBJECT *a,*b;
+static int
+added_obj_cmp(const ADDED_OBJ *ca, const ADDED_OBJ *cb)
+{
+ ASN1_OBJECT *a, *b;
int i;
- i=ca->type-cb->type;
- if (i) return(i);
- a=ca->obj;
- b=cb->obj;
- switch (ca->type)
- {
+ i = ca->type - cb->type;
+ if (i)
+ return (i);
+ a = ca->obj;
+ b = cb->obj;
+ switch (ca->type) {
case ADDED_DATA:
- i=(a->length - b->length);
- if (i) return(i);
- return(memcmp(a->data,b->data,(size_t)a->length));
+ i = (a->length - b->length);
+ if (i)
+ return (i);
+ return (memcmp(a->data, b->data, (size_t)a->length));
case ADDED_SNAME:
- if (a->sn == NULL) return(-1);
- else if (b->sn == NULL) return(1);
- else return(strcmp(a->sn,b->sn));
+ if (a->sn == NULL)
+ return (-1);
+ else if (b->sn == NULL)
+ return (1);
+ else
+ return (strcmp(a->sn, b->sn));
case ADDED_LNAME:
- if (a->ln == NULL) return(-1);
- else if (b->ln == NULL) return(1);
- else return(strcmp(a->ln,b->ln));
+ if (a->ln == NULL)
+ return (-1);
+ else if (b->ln == NULL)
+ return (1);
+ else
+ return (strcmp(a->ln, b->ln));
case ADDED_NID:
- return(a->nid-b->nid);
+ return (a->nid - b->nid);
default:
/* abort(); */
return 0;
- }
}
+}
static IMPLEMENT_LHASH_COMP_FN(added_obj, ADDED_OBJ)
-static int init_added(void)
- {
- if (added != NULL) return(1);
- added=lh_ADDED_OBJ_new();
- return(added != NULL);
- }
+static int
+init_added(void)
+{
+ if (added != NULL)
+ return (1);
+ added = lh_ADDED_OBJ_new();
+ return (added != NULL);
+}
-static void cleanup1_doall(ADDED_OBJ *a)
- {
- a->obj->nid=0;
- a->obj->flags|=ASN1_OBJECT_FLAG_DYNAMIC|
- ASN1_OBJECT_FLAG_DYNAMIC_STRINGS|
- ASN1_OBJECT_FLAG_DYNAMIC_DATA;
- }
+static void
+cleanup1_doall(ADDED_OBJ *a)
+{
+ a->obj->nid = 0;
+ a->obj->flags |= ASN1_OBJECT_FLAG_DYNAMIC |
+ ASN1_OBJECT_FLAG_DYNAMIC_STRINGS |
+ ASN1_OBJECT_FLAG_DYNAMIC_DATA;
+}
static void cleanup2_doall(ADDED_OBJ *a)
- { a->obj->nid++; }
+{
+ a->obj->nid++;
+}
-static void cleanup3_doall(ADDED_OBJ *a)
- {
+static void
+cleanup3_doall(ADDED_OBJ *a)
+{
if (--a->obj->nid == 0)
ASN1_OBJECT_free(a->obj);
free(a);
- }
+}
static IMPLEMENT_LHASH_DOALL_FN(cleanup1, ADDED_OBJ)
static IMPLEMENT_LHASH_DOALL_FN(cleanup2, ADDED_OBJ)
int obj_cleanup_defer = 0;
-void check_defer(int nid)
- {
+void
+check_defer(int nid)
+{
if (!obj_cleanup_defer && nid >= NUM_NID)
- obj_cleanup_defer = 1;
- }
+ obj_cleanup_defer = 1;
+}
-void OBJ_cleanup(void)
- {
- if (obj_cleanup_defer)
- {
+void
+OBJ_cleanup(void)
+{
+ if (obj_cleanup_defer) {
obj_cleanup_defer = 2;
- return ;
- }
- if (added == NULL) return;
+ return;
+ }
+ if (added == NULL)
+ return;
lh_ADDED_OBJ_down_load(added) = 0;
- lh_ADDED_OBJ_doall(added,LHASH_DOALL_FN(cleanup1)); /* zero counters */
- lh_ADDED_OBJ_doall(added,LHASH_DOALL_FN(cleanup2)); /* set counters */
- lh_ADDED_OBJ_doall(added,LHASH_DOALL_FN(cleanup3)); /* free objects */
+ lh_ADDED_OBJ_doall(added, LHASH_DOALL_FN(cleanup1)); /* zero counters */
+ lh_ADDED_OBJ_doall(added, LHASH_DOALL_FN(cleanup2)); /* set counters */
+ lh_ADDED_OBJ_doall(added, LHASH_DOALL_FN(cleanup3)); /* free objects */
lh_ADDED_OBJ_free(added);
- added=NULL;
- }
+ added = NULL;
+}
-int OBJ_new_nid(int num)
- {
+int
+OBJ_new_nid(int num)
+{
int i;
- i=new_nid;
- new_nid+=num;
- return(i);
- }
+ i = new_nid;
+ new_nid += num;
+ return (i);
+}
-int OBJ_add_object(const ASN1_OBJECT *obj)
- {
+int
+OBJ_add_object(const ASN1_OBJECT *obj)
+{
ASN1_OBJECT *o;
- ADDED_OBJ *ao[4]={NULL,NULL,NULL,NULL},*aop;
+ ADDED_OBJ *ao[4] = {NULL, NULL, NULL, NULL}, *aop;
int i;
if (added == NULL)
- if (!init_added()) return(0);
- if ((o=OBJ_dup(obj)) == NULL) goto err;
- if (!(ao[ADDED_NID]=(ADDED_OBJ *)malloc(sizeof(ADDED_OBJ)))) goto err2;
+ if (!init_added())
+ return (0);
+ if ((o = OBJ_dup(obj)) == NULL)
+ goto err;
+ if (!(ao[ADDED_NID] = (ADDED_OBJ *)malloc(sizeof(ADDED_OBJ))))
+ goto err2;
if ((o->length != 0) && (obj->data != NULL))
- if (!(ao[ADDED_DATA]=(ADDED_OBJ *)malloc(sizeof(ADDED_OBJ)))) goto err2;
+ if (!(ao[ADDED_DATA] = (ADDED_OBJ *)malloc(sizeof(ADDED_OBJ))))
+ goto err2;
if (o->sn != NULL)
- if (!(ao[ADDED_SNAME]=(ADDED_OBJ *)malloc(sizeof(ADDED_OBJ)))) goto err2;
+ if (!(ao[ADDED_SNAME] = (ADDED_OBJ *)malloc(sizeof(ADDED_OBJ))))
+ goto err2;
if (o->ln != NULL)
- if (!(ao[ADDED_LNAME]=(ADDED_OBJ *)malloc(sizeof(ADDED_OBJ)))) goto err2;
-
- for (i=ADDED_DATA; i<=ADDED_NID; i++)
- {
- if (ao[i] != NULL)
- {
- ao[i]->type=i;
- ao[i]->obj=o;
- aop=lh_ADDED_OBJ_insert(added,ao[i]);
+ if (!(ao[ADDED_LNAME] = (ADDED_OBJ *)malloc(sizeof(ADDED_OBJ))))
+ goto err2;
+
+ for (i = ADDED_DATA; i <= ADDED_NID; i++) {
+ if (ao[i] != NULL) {
+ ao[i]->type = i;
+ ao[i]->obj = o;
+ aop = lh_ADDED_OBJ_insert(added, ao[i]);
/* memory leak, buit should not normally matter */
if (aop != NULL)
free(aop);
- }
}
- o->flags&= ~(ASN1_OBJECT_FLAG_DYNAMIC|ASN1_OBJECT_FLAG_DYNAMIC_STRINGS|
- ASN1_OBJECT_FLAG_DYNAMIC_DATA);
+ }
+ o->flags &= ~(ASN1_OBJECT_FLAG_DYNAMIC |
+ ASN1_OBJECT_FLAG_DYNAMIC_STRINGS |
+ ASN1_OBJECT_FLAG_DYNAMIC_DATA);
+
+ return (o->nid);
- return(o->nid);
err2:
- OBJerr(OBJ_F_OBJ_ADD_OBJECT,ERR_R_MALLOC_FAILURE);
+ OBJerr(OBJ_F_OBJ_ADD_OBJECT, ERR_R_MALLOC_FAILURE);
err:
- for (i=ADDED_DATA; i<=ADDED_NID; i++)
- if (ao[i] != NULL) free(ao[i]);
- if (o != NULL) free(o);
- return(NID_undef);
- }
+ for (i = ADDED_DATA; i <= ADDED_NID; i++)
+ if (ao[i] != NULL)
+ free(ao[i]);
+ if (o != NULL)
+ free(o);
+ return (NID_undef);
+}
-ASN1_OBJECT *OBJ_nid2obj(int n)
- {
- ADDED_OBJ ad,*adp;
+ASN1_OBJECT *
+OBJ_nid2obj(int n)
+{
+ ADDED_OBJ ad, *adp;
ASN1_OBJECT ob;
- if ((n >= 0) && (n < NUM_NID))
- {
- if ((n != NID_undef) && (nid_objs[n].nid == NID_undef))
- {
- OBJerr(OBJ_F_OBJ_NID2OBJ,OBJ_R_UNKNOWN_NID);
- return(NULL);
- }
- return((ASN1_OBJECT *)&(nid_objs[n]));
+ if ((n >= 0) && (n < NUM_NID)) {
+ if ((n != NID_undef) && (nid_objs[n].nid == NID_undef)) {
+ OBJerr(OBJ_F_OBJ_NID2OBJ, OBJ_R_UNKNOWN_NID);
+ return (NULL);
}
- else if (added == NULL)
- return(NULL);
- else
- {
- ad.type=ADDED_NID;
- ad.obj= &ob;
- ob.nid=n;
- adp=lh_ADDED_OBJ_retrieve(added,&ad);
+ return ((ASN1_OBJECT *)&(nid_objs[n]));
+ } else if (added == NULL)
+ return (NULL);
+ else {
+ ad.type = ADDED_NID;
+ ad.obj = &ob;
+ ob.nid = n;
+ adp = lh_ADDED_OBJ_retrieve(added, &ad);
if (adp != NULL)
- return(adp->obj);
- else
- {
- OBJerr(OBJ_F_OBJ_NID2OBJ,OBJ_R_UNKNOWN_NID);
- return(NULL);
- }
+ return (adp->obj);
+ else {
+ OBJerr(OBJ_F_OBJ_NID2OBJ, OBJ_R_UNKNOWN_NID);
+ return (NULL);
}
}
+}
-const char *OBJ_nid2sn(int n)
- {
- ADDED_OBJ ad,*adp;
+const char *
+OBJ_nid2sn(int n)
+{
+ ADDED_OBJ ad, *adp;
ASN1_OBJECT ob;
- if ((n >= 0) && (n < NUM_NID))
- {
- if ((n != NID_undef) && (nid_objs[n].nid == NID_undef))
- {
- OBJerr(OBJ_F_OBJ_NID2SN,OBJ_R_UNKNOWN_NID);
- return(NULL);
- }
- return(nid_objs[n].sn);
+ if ((n >= 0) && (n < NUM_NID)) {
+ if ((n != NID_undef) && (nid_objs[n].nid == NID_undef)) {
+ OBJerr(OBJ_F_OBJ_NID2SN, OBJ_R_UNKNOWN_NID);
+ return (NULL);
}
- else if (added == NULL)
- return(NULL);
- else
- {
- ad.type=ADDED_NID;
- ad.obj= &ob;
- ob.nid=n;
- adp=lh_ADDED_OBJ_retrieve(added,&ad);
+ return (nid_objs[n].sn);
+ } else if (added == NULL)
+ return (NULL);
+ else {
+ ad.type = ADDED_NID;
+ ad.obj = &ob;
+ ob.nid = n;
+ adp = lh_ADDED_OBJ_retrieve(added, &ad);
if (adp != NULL)
- return(adp->obj->sn);
- else
- {
- OBJerr(OBJ_F_OBJ_NID2SN,OBJ_R_UNKNOWN_NID);
- return(NULL);
- }
+ return (adp->obj->sn);
+ else {
+ OBJerr(OBJ_F_OBJ_NID2SN, OBJ_R_UNKNOWN_NID);
+ return (NULL);
}
}
+}
-const char *OBJ_nid2ln(int n)
- {
- ADDED_OBJ ad,*adp;
+const char *
+OBJ_nid2ln(int n)
+{
+ ADDED_OBJ ad, *adp;
ASN1_OBJECT ob;
- if ((n >= 0) && (n < NUM_NID))
- {
- if ((n != NID_undef) && (nid_objs[n].nid == NID_undef))
- {
- OBJerr(OBJ_F_OBJ_NID2LN,OBJ_R_UNKNOWN_NID);
- return(NULL);
- }
- return(nid_objs[n].ln);
+ if ((n >= 0) && (n < NUM_NID)) {
+ if ((n != NID_undef) && (nid_objs[n].nid == NID_undef)) {
+ OBJerr(OBJ_F_OBJ_NID2LN, OBJ_R_UNKNOWN_NID);
+ return (NULL);
}
- else if (added == NULL)
- return(NULL);
- else
- {
- ad.type=ADDED_NID;
- ad.obj= &ob;
- ob.nid=n;
- adp=lh_ADDED_OBJ_retrieve(added,&ad);
+ return (nid_objs[n].ln);
+ } else if (added == NULL)
+ return (NULL);
+ else {
+ ad.type = ADDED_NID;
+ ad.obj = &ob;
+ ob.nid = n;
+ adp = lh_ADDED_OBJ_retrieve(added, &ad);
if (adp != NULL)
- return(adp->obj->ln);
- else
- {
- OBJerr(OBJ_F_OBJ_NID2LN,OBJ_R_UNKNOWN_NID);
- return(NULL);
- }
+ return (adp->obj->ln);
+ else {
+ OBJerr(OBJ_F_OBJ_NID2LN, OBJ_R_UNKNOWN_NID);
+ return (NULL);
}
}
+}
-static int obj_cmp(const ASN1_OBJECT * const *ap, const unsigned int *bp)
- {
+static int
+obj_cmp(const ASN1_OBJECT * const *ap, const unsigned int *bp)
+{
int j;
const ASN1_OBJECT *a= *ap;
- const ASN1_OBJECT *b= &nid_objs[*bp];
+ const ASN1_OBJECT *b = &nid_objs[*bp];
- j=(a->length - b->length);
- if (j) return(j);
- return(memcmp(a->data,b->data,a->length));
- }
+ j = (a->length - b->length);
+ if (j)
+ return (j);
+ return (memcmp(a->data, b->data, a->length));
+}
IMPLEMENT_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, obj);
-int OBJ_obj2nid(const ASN1_OBJECT *a)
- {
+int
+OBJ_obj2nid(const ASN1_OBJECT *a)
+{
const unsigned int *op;
- ADDED_OBJ ad,*adp;
+ ADDED_OBJ ad, *adp;
if (a == NULL)
- return(NID_undef);
+ return (NID_undef);
if (a->nid != 0)
- return(a->nid);
+ return (a->nid);
- if (added != NULL)
- {
- ad.type=ADDED_DATA;
+ if (added != NULL) {
+ ad.type = ADDED_DATA;
ad.obj=(ASN1_OBJECT *)a; /* XXX: ugly but harmless */
- adp=lh_ADDED_OBJ_retrieve(added,&ad);
- if (adp != NULL) return (adp->obj->nid);
- }
- op=OBJ_bsearch_obj(&a, obj_objs, NUM_OBJ);
- if (op == NULL)
- return(NID_undef);
- return(nid_objs[*op].nid);
+ adp = lh_ADDED_OBJ_retrieve(added, &ad);
+ if (adp != NULL)
+ return (adp->obj->nid);
}
+ op = OBJ_bsearch_obj(&a, obj_objs, NUM_OBJ);
+ if (op == NULL)
+ return (NID_undef);
+ return (nid_objs[*op].nid);
+}
/* Convert an object name into an ASN1_OBJECT
* if "noname" is not set then search for short and long names first.
* it can be used with any objects, not just registered ones.
*/
-ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name)
- {
+ASN1_OBJECT *
+OBJ_txt2obj(const char *s, int no_name)
+{
int nid = NID_undef;
- ASN1_OBJECT *op=NULL;
+ ASN1_OBJECT *op = NULL;
unsigned char *buf;
unsigned char *p;
const unsigned char *cp;
int i, j;
- if(!no_name) {
- if( ((nid = OBJ_sn2nid(s)) != NID_undef) ||
- ((nid = OBJ_ln2nid(s)) != NID_undef) )
- return OBJ_nid2obj(nid);
+ if (!no_name) {
+ if (((nid = OBJ_sn2nid(s)) != NID_undef) ||
+ ((nid = OBJ_ln2nid(s)) != NID_undef) )
+ return OBJ_nid2obj(nid);
}
/* Work out size of content octets */
- i=a2d_ASN1_OBJECT(NULL,0,s,-1);
+ i = a2d_ASN1_OBJECT(NULL, 0, s, -1);
if (i <= 0) {
/* Don't clear the error */
/*ERR_clear_error();*/
return NULL;
}
/* Work out total size */
- j = ASN1_object_size(0,i,V_ASN1_OBJECT);
+ j = ASN1_object_size(0, i, V_ASN1_OBJECT);
- if((buf=(unsigned char *)malloc(j)) == NULL) return NULL;
+ if ((buf = (unsigned char *)malloc(j)) == NULL)
+ return NULL;
p = buf;
/* Write out tag+length */
- ASN1_put_object(&p,0,i,V_ASN1_OBJECT,V_ASN1_UNIVERSAL);
+ ASN1_put_object(&p, 0, i, V_ASN1_OBJECT, V_ASN1_UNIVERSAL);
/* Write out contents */
- a2d_ASN1_OBJECT(p,i,s,-1);
+ a2d_ASN1_OBJECT(p, i, s, -1);
- cp=buf;
- op=d2i_ASN1_OBJECT(NULL,&cp,j);
+ cp = buf;
+ op = d2i_ASN1_OBJECT(NULL, &cp, j);
free(buf);
return op;
- }
+}
-int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
+int
+OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
{
- int i,n=0,len,nid, first, use_bn;
+ int i, n = 0, len, nid, first, use_bn;
BIGNUM *bl;
unsigned long l;
const unsigned char *p;
char tbuf[DECIMAL_SIZE(l) + 1];
if ((a == NULL) || (a->data == NULL)) {
- buf[0]='\0';
- return(0);
+ buf[0] = '\0';
+ return (0);
}
-
- if (!no_name && (nid=OBJ_obj2nid(a)) != NID_undef)
- {
+ if (!no_name && (nid = OBJ_obj2nid(a)) != NID_undef) {
const char *s;
- s=OBJ_nid2ln(nid);
+ s = OBJ_nid2ln(nid);
if (s == NULL)
- s=OBJ_nid2sn(nid);
- if (s)
- {
+ s = OBJ_nid2sn(nid);
+ if (s) {
if (buf)
- strlcpy(buf,s,buf_len);
- n=strlen(s);
+ strlcpy(buf, s, buf_len);
+ n = strlen(s);
return n;
- }
}
+ }
-
- len=a->length;
- p=a->data;
+ len = a->length;
+ p = a->data;
first = 1;
bl = NULL;
- while (len > 0)
- {
- l=0;
+ while (len > 0) {
+ l = 0;
use_bn = 0;
- for (;;)
- {
+ for (;;) {
unsigned char c = *p++;
len--;
if ((len == 0) && (c & 0x80))
goto err;
- if (use_bn)
- {
+ if (use_bn) {
if (!BN_add_word(bl, c & 0x7f))
goto err;
- }
- else
- l |= c & 0x7f;
+ } else
+ l |= c & 0x7f;
if (!(c & 0x80))
break;
- if (!use_bn && (l > (ULONG_MAX >> 7L)))
- {
+ if (!use_bn && (l > (ULONG_MAX >> 7L))) {
if (!bl && !(bl = BN_new()))
goto err;
if (!BN_set_word(bl, l))
goto err;
use_bn = 1;
- }
- if (use_bn)
- {
+ }
+ if (use_bn) {
if (!BN_lshift(bl, bl, 7))
goto err;
- }
- else
- l<<=7L;
- }
+ } else
+ l <<= 7L;
+ }
- if (first)
- {
+ if (first) {
first = 0;
- if (l >= 80)
- {
+ if (l >= 80) {
i = 2;
- if (use_bn)
- {
+ if (use_bn) {
if (!BN_sub_word(bl, 80))
goto err;
- }
- else
+ } else
l -= 80;
- }
- else
- {
- i=(int)(l/40);
- l-=(long)(i*40);
- }
- if (buf && (buf_len > 0))
- {
+ } else {
+ i = (int)(l / 40);
+ l -= (long)(i * 40);
+ }
+ if (buf && (buf_len > 0)) {
*buf++ = i + '0';
buf_len--;
- }
- n++;
}
+ n++;
+ }
- if (use_bn)
- {
+ if (use_bn) {
char *bndec;
bndec = BN_bn2dec(bl);
if (!bndec)
goto err;
i = strlen(bndec);
- if (buf)
- {
- if (buf_len > 0)
- {
+ if (buf) {
+ if (buf_len > 0) {
*buf++ = '.';
buf_len--;
- }
- strlcpy(buf,bndec,buf_len);
- if (i > buf_len)
- {
+ }
+ strlcpy(buf, bndec, buf_len);
+ if (i > buf_len) {
buf += buf_len;
buf_len = 0;
- }
- else
- {
- buf+=i;
- buf_len-=i;
- }
+ } else {
+ buf += i;
+ buf_len -= i;
}
+ }
n++;
n += i;
free(bndec);
- }
- else
- {
- snprintf(tbuf,sizeof tbuf,".%lu",l);
- i=strlen(tbuf);
- if (buf && (buf_len > 0))
- {
- strlcpy(buf,tbuf,buf_len);
- if (i > buf_len)
- {
+ } else {
+ snprintf(tbuf, sizeof tbuf, ".%lu", l);
+ i = strlen(tbuf);
+ if (buf && (buf_len > 0)) {
+ strlcpy(buf, tbuf, buf_len);
+ if (i > buf_len) {
buf += buf_len;
buf_len = 0;
- }
- else
- {
- buf+=i;
- buf_len-=i;
- }
+ } else {
+ buf += i;
+ buf_len -= i;
}
- n+=i;
- l=0;
}
+ n += i;
+ l = 0;
}
+ }
if (bl)
BN_free(bl);
return n;
- err:
+err:
if (bl)
BN_free(bl);
return -1;
}
-int OBJ_txt2nid(const char *s)
+int
+OBJ_txt2nid(const char *s)
{
ASN1_OBJECT *obj;
int nid;
+
obj = OBJ_txt2obj(s, 0);
nid = OBJ_obj2nid(obj);
ASN1_OBJECT_free(obj);
return nid;
}
-int OBJ_ln2nid(const char *s)
- {
+int
+OBJ_ln2nid(const char *s)
+{
ASN1_OBJECT o;
- const ASN1_OBJECT *oo= &o;
- ADDED_OBJ ad,*adp;
+ const ASN1_OBJECT *oo = &o;
+ ADDED_OBJ ad, *adp;
const unsigned int *op;
- o.ln=s;
- if (added != NULL)
- {
- ad.type=ADDED_LNAME;
- ad.obj= &o;
- adp=lh_ADDED_OBJ_retrieve(added,&ad);
- if (adp != NULL) return (adp->obj->nid);
- }
- op=OBJ_bsearch_ln(&oo, ln_objs, NUM_LN);
- if (op == NULL) return(NID_undef);
- return(nid_objs[*op].nid);
+ o.ln = s;
+ if (added != NULL) {
+ ad.type = ADDED_LNAME;
+ ad.obj = &o;
+ adp = lh_ADDED_OBJ_retrieve(added, &ad);
+ if (adp != NULL)
+ return (adp->obj->nid);
}
+ op = OBJ_bsearch_ln(&oo, ln_objs, NUM_LN);
+ if (op == NULL)
+ return (NID_undef);
+ return (nid_objs[*op].nid);
+}
-int OBJ_sn2nid(const char *s)
- {
+int
+OBJ_sn2nid(const char *s)
+{
ASN1_OBJECT o;
- const ASN1_OBJECT *oo= &o;
- ADDED_OBJ ad,*adp;
+ const ASN1_OBJECT *oo = &o;
+ ADDED_OBJ ad, *adp;
const unsigned int *op;
- o.sn=s;
- if (added != NULL)
- {
- ad.type=ADDED_SNAME;
- ad.obj= &o;
- adp=lh_ADDED_OBJ_retrieve(added,&ad);
- if (adp != NULL) return (adp->obj->nid);
- }
- op=OBJ_bsearch_sn(&oo, sn_objs, NUM_SN);
- if (op == NULL) return(NID_undef);
- return(nid_objs[*op].nid);
+ o.sn = s;
+ if (added != NULL) {
+ ad.type = ADDED_SNAME;
+ ad.obj = &o;
+ adp = lh_ADDED_OBJ_retrieve(added, &ad);
+ if (adp != NULL)
+ return (adp->obj->nid);
}
+ op = OBJ_bsearch_sn(&oo, sn_objs, NUM_SN);
+ if (op == NULL)
+ return (NID_undef);
+ return (nid_objs[*op].nid);
+}
-const void *OBJ_bsearch_(const void *key, const void *base, int num, int size,
- int (*cmp)(const void *, const void *))
- {
+const void *
+OBJ_bsearch_(const void *key, const void *base, int num, int size,
+ int (*cmp)(const void *, const void *))
+{
return OBJ_bsearch_ex_(key, base, num, size, cmp, 0);
- }
+}
-const void *OBJ_bsearch_ex_(const void *key, const void *base_, int num,
- int size,
- int (*cmp)(const void *, const void *),
- int flags)
- {
- const char *base=base_;
- int l,h,i=0,c=0;
+const void *
+OBJ_bsearch_ex_(const void *key, const void *base_, int num, int size,
+ int (*cmp)(const void *, const void *), int flags)
+{
+ const char *base = base_;
+ int l, h, i = 0, c = 0;
const char *p = NULL;
- if (num == 0) return(NULL);
- l=0;
- h=num;
- while (l < h)
- {
- i=(l+h)/2;
- p= &(base[i*size]);
- c=(*cmp)(key,p);
+ if (num == 0)
+ return (NULL);
+ l = 0;
+ h = num;
+ while (l < h) {
+ i = (l + h) / 2;
+ p = &(base[i * size]);
+ c = (*cmp)(key, p);
if (c < 0)
- h=i;
+ h = i;
else if (c > 0)
- l=i+1;
+ l = i + 1;
else
break;
- }
+ }
if (c != 0 && !(flags & OBJ_BSEARCH_VALUE_ON_NOMATCH))
p = NULL;
- else if (c == 0 && (flags & OBJ_BSEARCH_FIRST_VALUE_ON_MATCH))
- {
- while(i > 0 && (*cmp)(key,&(base[(i-1)*size])) == 0)
+ else if (c == 0 && (flags & OBJ_BSEARCH_FIRST_VALUE_ON_MATCH)) {
+ while (i > 0 && (*cmp)(key, &(base[(i - 1) * size])) == 0)
i--;
- p = &(base[i*size]);
- }
- return(p);
+ p = &(base[i * size]);
}
+ return (p);
+}
-int OBJ_create_objects(BIO *in)
- {
+int
+OBJ_create_objects(BIO *in)
+{
char buf[512];
- int i,num=0;
- char *o,*s,*l=NULL;
-
- for (;;)
- {
- s=o=NULL;
- i=BIO_gets(in,buf,512);
- if (i <= 0) return(num);
- buf[i-1]='\0';
- if (!isalnum((unsigned char)buf[0])) return(num);
- o=s=buf;
+ int i, num = 0;
+ char *o, *s, *l = NULL;
+
+ for (;;) {
+ s = o = NULL;
+ i = BIO_gets(in, buf, 512);
+ if (i <= 0)
+ return (num);
+ buf[i - 1] = '\0';
+ if (!isalnum((unsigned char)buf[0]))
+ return (num);
+ o = s=buf;
while (isdigit((unsigned char)*s) || (*s == '.'))
s++;
- if (*s != '\0')
- {
- *(s++)='\0';
+ if (*s != '\0') {
+ *(s++) = '\0';
while (isspace((unsigned char)*s))
s++;
if (*s == '\0')
- s=NULL;
- else
- {
- l=s;
- while ((*l != '\0') && !isspace((unsigned char)*l))
+ s = NULL;
+ else {
+ l = s;
+ while ((*l != '\0') &&
+ !isspace((unsigned char)*l))
l++;
- if (*l != '\0')
- {
- *(l++)='\0';
+ if (*l != '\0') {
+ *(l++) = '\0';
while (isspace((unsigned char)*l))
l++;
- if (*l == '\0') l=NULL;
- }
- else
- l=NULL;
- }
+ if (*l == '\0')
+ l = NULL;
+ } else
+ l = NULL;
}
- else
- s=NULL;
- if ((o == NULL) || (*o == '\0')) return(num);
- if (!OBJ_create(o,s,l)) return(num);
+ } else
+ s = NULL;
+ if ((o == NULL) || (*o == '\0'))
+ return (num);
+ if (!OBJ_create(o, s, l))
+ return (num);
num++;
- }
- /* return(num); */
}
+ /* return(num); */
+}
-int OBJ_create(const char *oid, const char *sn, const char *ln)
- {
- int ok=0;
- ASN1_OBJECT *op=NULL;
+int
+OBJ_create(const char *oid, const char *sn, const char *ln)
+{
+ int ok = 0;
+ ASN1_OBJECT *op = NULL;
unsigned char *buf;
int i;
- i=a2d_ASN1_OBJECT(NULL,0,oid,-1);
- if (i <= 0) return(0);
+ i = a2d_ASN1_OBJECT(NULL, 0, oid, -1);
+ if (i <= 0)
+ return (0);
- if ((buf=(unsigned char *)malloc(i)) == NULL)
- {
- OBJerr(OBJ_F_OBJ_CREATE,ERR_R_MALLOC_FAILURE);
- return(0);
- }
- i=a2d_ASN1_OBJECT(buf,i,oid,-1);
+ if ((buf = (unsigned char *)malloc(i)) == NULL) {
+ OBJerr(OBJ_F_OBJ_CREATE, ERR_R_MALLOC_FAILURE);
+ return (0);
+ }
+ i = a2d_ASN1_OBJECT(buf, i, oid, -1);
if (i == 0)
goto err;
- op=(ASN1_OBJECT *)ASN1_OBJECT_create(OBJ_new_nid(1),buf,i,sn,ln);
- if (op == NULL)
+ op = (ASN1_OBJECT *)ASN1_OBJECT_create(OBJ_new_nid(1), buf, i, sn, ln);
+ if (op == NULL)
goto err;
- ok=OBJ_add_object(op);
+ ok = OBJ_add_object(op);
+
err:
ASN1_OBJECT_free(op);
free(buf);
- return(ok);
- }
-
+ return (ok);
+}
* 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
#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)
- {
+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);
- }
-#endif
+ 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
+}
* 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:
* 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
* 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
#include <openssl/objects.h>
#include <openssl/buffer.h>
-ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o)
- {
+ASN1_OBJECT *
+OBJ_dup(const ASN1_OBJECT *o)
+{
ASN1_OBJECT *r;
int i;
- char *ln=NULL,*sn=NULL;
- unsigned char *data=NULL;
+ char *ln = NULL, *sn = NULL;
+ unsigned char *data = NULL;
- if (o == NULL) return(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??? */
- r=ASN1_OBJECT_new();
- if (r == NULL)
- {
- OBJerr(OBJ_F_OBJ_DUP,ERR_R_ASN1_LIB);
- return(NULL);
- }
- data=malloc(o->length);
+ r = ASN1_OBJECT_new();
+ if (r == NULL) {
+ OBJerr(OBJ_F_OBJ_DUP, ERR_R_ASN1_LIB);
+ return (NULL);
+ }
+ data = malloc(o->length);
if (data == NULL)
goto err;
if (o->data != NULL)
- memcpy(data,o->data,o->length);
+ 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=malloc(i);
- if (ln == NULL) goto err;
- memcpy(ln,o->ln,i);
- r->ln=ln;
- }
+ r->length = o->length;
+ r->nid = o->nid;
+ r->ln = r->sn = NULL;
+ if (o->ln != NULL) {
+ i = strlen(o->ln) + 1;
+ ln = 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=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) free(ln);
- if (sn != NULL) free(sn);
- if (data != NULL) free(data);
- if (r != NULL) free(r);
- return(NULL);
+ if (o->sn != NULL) {
+ i = strlen(o->sn) + 1;
+ sn = 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);
-int OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b)
- {
+err:
+ OBJerr(OBJ_F_OBJ_DUP, ERR_R_MALLOC_FAILURE);
+ if (ln != NULL)
+ free(ln);
+ if (sn != NULL)
+ free(sn);
+ if (data != NULL)
+ free(data);
+ if (r != NULL)
+ free(r);
+ return (NULL);
+}
+
+int
+OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b)
+{
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));
+}
* 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
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)
- {
+static int
+sig_cmp(const nid_triple *a, const nid_triple *b)
+{
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)
- {
+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)
- {
+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)
- {
+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)
- {
+ 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)
- {
+ if (rv == NULL) {
rv = OBJ_bsearch_sig(&tmp, sigoid_srt,
- sizeof(sigoid_srt) / sizeof(nid_triple));
- }
+ sizeof(sigoid_srt) / sizeof(nid_triple));
+ }
#endif
if (rv == NULL)
return 0;
if (ppkey_nid)
*ppkey_nid = rv->pkey_id;
return 1;
- }
+}
-int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid)
- {
+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 *t = &tmp;
const nid_triple **rv = NULL;
tmp.hash_id = dig_nid;
tmp.pkey_id = pkey_nid;
- if (sigx_app)
- {
+ if (sigx_app) {
int idx = sk_nid_triple_find(sigx_app, &tmp);
- if (idx >= 0)
- {
+ if (idx >= 0) {
t = sk_nid_triple_value(sigx_app, idx);
rv = &t;
- }
}
+ }
#ifndef OBJ_XREF_TEST2
- if (rv == NULL)
- {
+ if (rv == NULL) {
rv = OBJ_bsearch_sigx(&t, sigoid_srt_xref,
- sizeof(sigoid_srt_xref) / sizeof(nid_triple *)
- );
- }
+ sizeof(sigoid_srt_xref) / sizeof(nid_triple *));
+ }
#endif
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)
- {
+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)
ntr->hash_id = dig_id;
ntr->pkey_id = pkey_id;
- if (!sk_nid_triple_push(sig_app, ntr))
- {
+ if (!sk_nid_triple_push(sig_app, ntr)) {
free(ntr);
return 0;
- }
+ }
if (!sk_nid_triple_push(sigx_app, ntr))
return 0;
sk_nid_triple_sort(sigx_app);
return 1;
- }
+}
-static void sid_free(nid_triple *tt)
- {
+static void
+sid_free(nid_triple *tt)
+{
free(tt);
- }
+}
-void OBJ_sigid_free(void)
- {
- if (sig_app)
- {
+void
+OBJ_sigid_free(void)
+{
+ if (sig_app) {
sk_nid_triple_pop_free(sig_app, sid_free);
sig_app = NULL;
- }
- if (sigx_app)
- {
+ }
+ if (sigx_app) {
sk_nid_triple_free(sigx_app);
sigx_app = NULL;
- }
}
-
+}
+
#ifdef OBJ_XREF_TEST
main()
- {
+{
int n1, n2, n3;
int i, rv;
#ifdef OBJ_XREF_TEST2
- for (i = 0; i < sizeof(sigoid_srt) / sizeof(nid_triple); i++)
- {
+ 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]);
- }
+ sigoid_srt[i][2]);
+ }
#endif
- for (i = 0; i < sizeof(sigoid_srt) / sizeof(nid_triple); i++)
- {
+ 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;
+ 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));
- }
+ OBJ_nid2ln(n1), OBJ_nid2ln(n2), OBJ_nid2ln(n3));
}
-
+}
+
#endif
* 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:
* 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
* 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
#define SN_pbeWithSHA1AndRC2_CBC "PBE-SHA1-RC2-64"
#define LN_pbeWithSHA1AndRC2_CBC "pbeWithSHA1AndRC2-CBC"
#define NID_pbeWithSHA1AndRC2_CBC 68
-#define OBJ_pbeWithSHA1AndRC2_CBC OBJ_pkcs,5L,11L
+#define OBJ_pbeWithSHA1AndRC2_CBC OBJ_pkcs,5L,11L
/* proposed by microsoft to RSA as pbeWithSHA1AndRC4: it is now
* defined explicitly in PKCS#5 v2.0 as id-PBKDF2 which is something
*/
#define LN_id_pbkdf2 "PBKDF2"
#define NID_id_pbkdf2 69
-#define OBJ_id_pbkdf2 OBJ_pkcs,5L,12L
+#define OBJ_id_pbkdf2 OBJ_pkcs,5L,12L
#define SN_dsaWithSHA1_2 "DSA-SHA1-old"
#define LN_dsaWithSHA1_2 "dsaWithSHA1-old"
extern "C" {
#endif
-typedef struct obj_name_st
- {
+typedef struct obj_name_st {
int type;
int alias;
const char *name;
const char *data;
- } OBJ_NAME;
+} OBJ_NAME;
#define OBJ_create_and_add_object(a,b,c) OBJ_create(a,b,c)
int OBJ_NAME_init(void);
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 *));
-const char *OBJ_NAME_get(const char *name,int type);
-int OBJ_NAME_add(const char *name,int type,const char *data);
-int OBJ_NAME_remove(const char *name,int type);
+ int (*cmp_func)(const char *, const char *),
+ void (*free_func)(const char *, int, const char *));
+const char *OBJ_NAME_get(const char *name, int type);
+int OBJ_NAME_add(const char *name, int type, const char *data);
+int OBJ_NAME_remove(const char *name, int type);
void OBJ_NAME_cleanup(int type); /* -1 for everything */
-void OBJ_NAME_do_all(int type,void (*fn)(const OBJ_NAME *,void *arg),
- void *arg);
-void OBJ_NAME_do_all_sorted(int type,void (*fn)(const OBJ_NAME *,void *arg),
- void *arg);
+void OBJ_NAME_do_all(int type, void (*fn)(const OBJ_NAME *, void *arg),
+ void *arg);
+void OBJ_NAME_do_all_sorted(int type, void (*fn)(const OBJ_NAME *, void *arg),
+ void *arg);
ASN1_OBJECT * OBJ_dup(const ASN1_OBJECT *o);
ASN1_OBJECT * OBJ_nid2obj(int n);
int OBJ_txt2nid(const char *s);
int OBJ_ln2nid(const char *s);
int OBJ_sn2nid(const char *s);
-int OBJ_cmp(const ASN1_OBJECT *a,const ASN1_OBJECT *b);
-const void * OBJ_bsearch_(const void *key,const void *base,int num,int size,
- int (*cmp)(const void *, const void *));
-const void * OBJ_bsearch_ex_(const void *key,const void *base,int num,
- int size,
- int (*cmp)(const void *, const void *),
- int flags);
+int OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b);
+const void * OBJ_bsearch_(const void *key, const void *base, int num,
+ int size, int (*cmp)(const void *, const void *));
+const void * OBJ_bsearch_ex_(const void *key, const void *base, int num,
+ int size, int (*cmp)(const void *, const void *),
+ int flags);
#define _DECLARE_OBJ_BSEARCH_CMP_FN(scope, type1, type2, nm) \
static int nm##_cmp_BSEARCH_CMP_FN(const void *, const void *); \
int OBJ_new_nid(int num);
int OBJ_add_object(const ASN1_OBJECT *obj);
-int OBJ_create(const char *oid,const char *sn,const char *ln);
+int OBJ_create(const char *oid, const char *sn, const char *ln);
void OBJ_cleanup(void );
int OBJ_create_objects(BIO *in);
* 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
- {
+typedef struct name_funcs_st {
unsigned long (*hash_func)(const char *name);
- int (*cmp_func)(const char *a,const char *b);
+ int (*cmp_func)(const char *a, const char *b);
void (*free_func)(const char *, int, const char *);
- } NAME_FUNCS;
+} NAME_FUNCS;
DECLARE_STACK_OF(NAME_FUNCS)
IMPLEMENT_STACK_OF(NAME_FUNCS)
/* 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);
+int
+OBJ_NAME_init(void)
+{
+ if (names_lh != NULL)
+ return (1);
MemCheck_off();
- names_lh=lh_OBJ_NAME_new();
+ 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 *))
- {
+ 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;
- if (name_funcs_stack == NULL)
- {
+ if (name_funcs_stack == NULL) {
MemCheck_off();
- name_funcs_stack=sk_NAME_FUNCS_new_null();
+ name_funcs_stack = sk_NAME_FUNCS_new_null();
MemCheck_on();
- }
- if (name_funcs_stack == NULL)
- {
+ }
+ if (name_funcs_stack == NULL) {
/* ERROR */
- return(0);
- }
- ret=names_type_num;
+ return (0);
+ }
+ ret = names_type_num;
names_type_num++;
- for (i=sk_NAME_FUNCS_num(name_funcs_stack); i<names_type_num; i++)
- {
+ for (i = sk_NAME_FUNCS_num(name_funcs_stack); i < names_type_num; i++) {
MemCheck_off();
name_funcs = malloc(sizeof(NAME_FUNCS));
MemCheck_on();
- if (!name_funcs)
- {
- OBJerr(OBJ_F_OBJ_NAME_NEW_INDEX,ERR_R_MALLOC_FAILURE);
- return(0);
- }
+ 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 = strcmp;
name_funcs->free_func = NULL;
MemCheck_off();
- sk_NAME_FUNCS_push(name_funcs_stack,name_funcs);
+ 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;
name_funcs->cmp_func = cmp_func;
if (free_func != NULL)
name_funcs->free_func = free_func;
- return(ret);
- }
+ 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)
- {
+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;
- 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)
- {
+static unsigned long
+obj_name_hash(const void *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);
}
-
-const char *OBJ_NAME_get(const char *name, int type)
- {
- OBJ_NAME on,*ret;
- int num=0,alias;
-
- if (name == NULL) return(NULL);
- if ((names_lh == NULL) && !OBJ_NAME_init()) return(NULL);
-
- alias=type&OBJ_NAME_ALIAS;
+ ret ^= a->type;
+ return (ret);
+}
+
+const char *
+OBJ_NAME_get(const char *name, int type)
+{
+ OBJ_NAME on, *ret;
+ int num = 0, alias;
+
+ if (name == NULL)
+ return (NULL);
+ if ((names_lh == NULL) && !OBJ_NAME_init())
+ return (NULL);
+
+ alias = type&OBJ_NAME_ALIAS;
type&= ~OBJ_NAME_ALIAS;
- 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);
- }
+ 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);
}
}
+}
-int OBJ_NAME_add(const char *name, int type, const char *data)
- {
- OBJ_NAME *onp,*ret;
+int
+OBJ_NAME_add(const char *name, int type, const char *data)
+{
+ 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 *)malloc(sizeof(OBJ_NAME));
- if (onp == NULL)
- {
+ onp = (OBJ_NAME *)malloc(sizeof(OBJ_NAME));
+ if (onp == NULL) {
/* ERROR */
- return(0);
- }
+ 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)
- {
+ 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))
- {
+ 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);
- }
- free(ret);
+ sk_NAME_FUNCS_value(
+ name_funcs_stack, ret->type)->free_func(
+ ret->name, ret->type, ret->data);
}
- else
- {
- if (lh_OBJ_NAME_error(names_lh))
- {
+ free(ret);
+ } else {
+ if (lh_OBJ_NAME_error(names_lh)) {
/* ERROR */
- return(0);
- }
+ return (0);
}
- return(1);
}
-
-int OBJ_NAME_remove(const char *name, int type)
- {
- OBJ_NAME on,*ret;
-
- 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)
- {
+ return (1);
+}
+
+int
+OBJ_NAME_remove(const char *name, int type)
+{
+ OBJ_NAME on, *ret;
+
+ 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))
- {
+ 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);
- }
- free(ret);
- return(1);
+ sk_NAME_FUNCS_value(
+ name_funcs_stack, ret->type)->free_func(
+ ret->name, ret->type, ret->data);
}
- else
- return(0);
- }
+ free(ret);
+ return (1);
+ } else
+ return (0);
+}
-struct doall
- {
+struct doall {
int type;
- void (*fn)(const OBJ_NAME *,void *arg);
+ 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)
- {
+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);
- }
+ struct doall, &d);
+}
-struct doall_sorted
- {
+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)
+ 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)
- {
+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=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 = 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);
free((void *)d.names);
- }
+}
static int free_type;
-static void names_lh_free_doall(OBJ_NAME *onp)
- {
+static void
+names_lh_free_doall(OBJ_NAME *onp)
+{
if (onp == NULL)
return;
if (free_type < 0 || free_type == onp->type)
- OBJ_NAME_remove(onp->name,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)
- {
+static void
+name_funcs_free(NAME_FUNCS *ptr)
+{
free(ptr);
- }
+}
-void OBJ_NAME_cleanup(int type)
- {
+void
+OBJ_NAME_cleanup(int type)
+{
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;
+ 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_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;
+ 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;
- }
-
+ } else
+ lh_OBJ_NAME_down_load(names_lh) = down_load;
+}
* 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:
* 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
* 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
#define ADDED_LNAME 2
#define ADDED_NID 3
-typedef struct added_obj_st
- {
+typedef struct added_obj_st {
int type;
ASN1_OBJECT *obj;
- } ADDED_OBJ;
+} ADDED_OBJ;
DECLARE_LHASH_OF(ADDED_OBJ);
-static int new_nid=NUM_NID;
-static LHASH_OF(ADDED_OBJ) *added=NULL;
+static int new_nid = NUM_NID;
+static LHASH_OF(ADDED_OBJ) *added = NULL;
static int sn_cmp(const ASN1_OBJECT * const *a, const unsigned int *b)
- { return(strcmp((*a)->sn,nid_objs[*b].sn)); }
+{
+ return (strcmp((*a)->sn, nid_objs[*b].sn));
+}
IMPLEMENT_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, sn);
static int ln_cmp(const ASN1_OBJECT * const *a, const unsigned int *b)
- { return(strcmp((*a)->ln,nid_objs[*b].ln)); }
+{
+ return (strcmp((*a)->ln, nid_objs[*b].ln));
+}
IMPLEMENT_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, ln);
-static unsigned long added_obj_hash(const ADDED_OBJ *ca)
- {
+static unsigned long
+added_obj_hash(const ADDED_OBJ *ca)
+{
const ASN1_OBJECT *a;
int i;
- unsigned long ret=0;
+ unsigned long ret = 0;
unsigned char *p;
- a=ca->obj;
- switch (ca->type)
- {
+ a = ca->obj;
+ switch (ca->type) {
case ADDED_DATA:
- ret=a->length<<20L;
- p=(unsigned char *)a->data;
- for (i=0; i<a->length; i++)
- ret^=p[i]<<((i*3)%24);
+ ret = a->length << 20L;
+ p = (unsigned char *)a->data;
+ for (i = 0; i < a->length; i++)
+ ret ^= p[i] << ((i * 3) % 24);
break;
case ADDED_SNAME:
- ret=lh_strhash(a->sn);
+ ret = lh_strhash(a->sn);
break;
case ADDED_LNAME:
- ret=lh_strhash(a->ln);
+ ret = lh_strhash(a->ln);
break;
case ADDED_NID:
- ret=a->nid;
+ ret = a->nid;
break;
default:
/* abort(); */
return 0;
- }
- ret&=0x3fffffffL;
- ret|=ca->type<<30L;
- return(ret);
}
+ ret &= 0x3fffffffL;
+ ret |= ca->type << 30L;
+ return (ret);
+}
static IMPLEMENT_LHASH_HASH_FN(added_obj, ADDED_OBJ)
-static int added_obj_cmp(const ADDED_OBJ *ca, const ADDED_OBJ *cb)
- {
- ASN1_OBJECT *a,*b;
+static int
+added_obj_cmp(const ADDED_OBJ *ca, const ADDED_OBJ *cb)
+{
+ ASN1_OBJECT *a, *b;
int i;
- i=ca->type-cb->type;
- if (i) return(i);
- a=ca->obj;
- b=cb->obj;
- switch (ca->type)
- {
+ i = ca->type - cb->type;
+ if (i)
+ return (i);
+ a = ca->obj;
+ b = cb->obj;
+ switch (ca->type) {
case ADDED_DATA:
- i=(a->length - b->length);
- if (i) return(i);
- return(memcmp(a->data,b->data,(size_t)a->length));
+ i = (a->length - b->length);
+ if (i)
+ return (i);
+ return (memcmp(a->data, b->data, (size_t)a->length));
case ADDED_SNAME:
- if (a->sn == NULL) return(-1);
- else if (b->sn == NULL) return(1);
- else return(strcmp(a->sn,b->sn));
+ if (a->sn == NULL)
+ return (-1);
+ else if (b->sn == NULL)
+ return (1);
+ else
+ return (strcmp(a->sn, b->sn));
case ADDED_LNAME:
- if (a->ln == NULL) return(-1);
- else if (b->ln == NULL) return(1);
- else return(strcmp(a->ln,b->ln));
+ if (a->ln == NULL)
+ return (-1);
+ else if (b->ln == NULL)
+ return (1);
+ else
+ return (strcmp(a->ln, b->ln));
case ADDED_NID:
- return(a->nid-b->nid);
+ return (a->nid - b->nid);
default:
/* abort(); */
return 0;
- }
}
+}
static IMPLEMENT_LHASH_COMP_FN(added_obj, ADDED_OBJ)
-static int init_added(void)
- {
- if (added != NULL) return(1);
- added=lh_ADDED_OBJ_new();
- return(added != NULL);
- }
+static int
+init_added(void)
+{
+ if (added != NULL)
+ return (1);
+ added = lh_ADDED_OBJ_new();
+ return (added != NULL);
+}
-static void cleanup1_doall(ADDED_OBJ *a)
- {
- a->obj->nid=0;
- a->obj->flags|=ASN1_OBJECT_FLAG_DYNAMIC|
- ASN1_OBJECT_FLAG_DYNAMIC_STRINGS|
- ASN1_OBJECT_FLAG_DYNAMIC_DATA;
- }
+static void
+cleanup1_doall(ADDED_OBJ *a)
+{
+ a->obj->nid = 0;
+ a->obj->flags |= ASN1_OBJECT_FLAG_DYNAMIC |
+ ASN1_OBJECT_FLAG_DYNAMIC_STRINGS |
+ ASN1_OBJECT_FLAG_DYNAMIC_DATA;
+}
static void cleanup2_doall(ADDED_OBJ *a)
- { a->obj->nid++; }
+{
+ a->obj->nid++;
+}
-static void cleanup3_doall(ADDED_OBJ *a)
- {
+static void
+cleanup3_doall(ADDED_OBJ *a)
+{
if (--a->obj->nid == 0)
ASN1_OBJECT_free(a->obj);
free(a);
- }
+}
static IMPLEMENT_LHASH_DOALL_FN(cleanup1, ADDED_OBJ)
static IMPLEMENT_LHASH_DOALL_FN(cleanup2, ADDED_OBJ)
int obj_cleanup_defer = 0;
-void check_defer(int nid)
- {
+void
+check_defer(int nid)
+{
if (!obj_cleanup_defer && nid >= NUM_NID)
- obj_cleanup_defer = 1;
- }
+ obj_cleanup_defer = 1;
+}
-void OBJ_cleanup(void)
- {
- if (obj_cleanup_defer)
- {
+void
+OBJ_cleanup(void)
+{
+ if (obj_cleanup_defer) {
obj_cleanup_defer = 2;
- return ;
- }
- if (added == NULL) return;
+ return;
+ }
+ if (added == NULL)
+ return;
lh_ADDED_OBJ_down_load(added) = 0;
- lh_ADDED_OBJ_doall(added,LHASH_DOALL_FN(cleanup1)); /* zero counters */
- lh_ADDED_OBJ_doall(added,LHASH_DOALL_FN(cleanup2)); /* set counters */
- lh_ADDED_OBJ_doall(added,LHASH_DOALL_FN(cleanup3)); /* free objects */
+ lh_ADDED_OBJ_doall(added, LHASH_DOALL_FN(cleanup1)); /* zero counters */
+ lh_ADDED_OBJ_doall(added, LHASH_DOALL_FN(cleanup2)); /* set counters */
+ lh_ADDED_OBJ_doall(added, LHASH_DOALL_FN(cleanup3)); /* free objects */
lh_ADDED_OBJ_free(added);
- added=NULL;
- }
+ added = NULL;
+}
-int OBJ_new_nid(int num)
- {
+int
+OBJ_new_nid(int num)
+{
int i;
- i=new_nid;
- new_nid+=num;
- return(i);
- }
+ i = new_nid;
+ new_nid += num;
+ return (i);
+}
-int OBJ_add_object(const ASN1_OBJECT *obj)
- {
+int
+OBJ_add_object(const ASN1_OBJECT *obj)
+{
ASN1_OBJECT *o;
- ADDED_OBJ *ao[4]={NULL,NULL,NULL,NULL},*aop;
+ ADDED_OBJ *ao[4] = {NULL, NULL, NULL, NULL}, *aop;
int i;
if (added == NULL)
- if (!init_added()) return(0);
- if ((o=OBJ_dup(obj)) == NULL) goto err;
- if (!(ao[ADDED_NID]=(ADDED_OBJ *)malloc(sizeof(ADDED_OBJ)))) goto err2;
+ if (!init_added())
+ return (0);
+ if ((o = OBJ_dup(obj)) == NULL)
+ goto err;
+ if (!(ao[ADDED_NID] = (ADDED_OBJ *)malloc(sizeof(ADDED_OBJ))))
+ goto err2;
if ((o->length != 0) && (obj->data != NULL))
- if (!(ao[ADDED_DATA]=(ADDED_OBJ *)malloc(sizeof(ADDED_OBJ)))) goto err2;
+ if (!(ao[ADDED_DATA] = (ADDED_OBJ *)malloc(sizeof(ADDED_OBJ))))
+ goto err2;
if (o->sn != NULL)
- if (!(ao[ADDED_SNAME]=(ADDED_OBJ *)malloc(sizeof(ADDED_OBJ)))) goto err2;
+ if (!(ao[ADDED_SNAME] = (ADDED_OBJ *)malloc(sizeof(ADDED_OBJ))))
+ goto err2;
if (o->ln != NULL)
- if (!(ao[ADDED_LNAME]=(ADDED_OBJ *)malloc(sizeof(ADDED_OBJ)))) goto err2;
-
- for (i=ADDED_DATA; i<=ADDED_NID; i++)
- {
- if (ao[i] != NULL)
- {
- ao[i]->type=i;
- ao[i]->obj=o;
- aop=lh_ADDED_OBJ_insert(added,ao[i]);
+ if (!(ao[ADDED_LNAME] = (ADDED_OBJ *)malloc(sizeof(ADDED_OBJ))))
+ goto err2;
+
+ for (i = ADDED_DATA; i <= ADDED_NID; i++) {
+ if (ao[i] != NULL) {
+ ao[i]->type = i;
+ ao[i]->obj = o;
+ aop = lh_ADDED_OBJ_insert(added, ao[i]);
/* memory leak, buit should not normally matter */
if (aop != NULL)
free(aop);
- }
}
- o->flags&= ~(ASN1_OBJECT_FLAG_DYNAMIC|ASN1_OBJECT_FLAG_DYNAMIC_STRINGS|
- ASN1_OBJECT_FLAG_DYNAMIC_DATA);
+ }
+ o->flags &= ~(ASN1_OBJECT_FLAG_DYNAMIC |
+ ASN1_OBJECT_FLAG_DYNAMIC_STRINGS |
+ ASN1_OBJECT_FLAG_DYNAMIC_DATA);
+
+ return (o->nid);
- return(o->nid);
err2:
- OBJerr(OBJ_F_OBJ_ADD_OBJECT,ERR_R_MALLOC_FAILURE);
+ OBJerr(OBJ_F_OBJ_ADD_OBJECT, ERR_R_MALLOC_FAILURE);
err:
- for (i=ADDED_DATA; i<=ADDED_NID; i++)
- if (ao[i] != NULL) free(ao[i]);
- if (o != NULL) free(o);
- return(NID_undef);
- }
+ for (i = ADDED_DATA; i <= ADDED_NID; i++)
+ if (ao[i] != NULL)
+ free(ao[i]);
+ if (o != NULL)
+ free(o);
+ return (NID_undef);
+}
-ASN1_OBJECT *OBJ_nid2obj(int n)
- {
- ADDED_OBJ ad,*adp;
+ASN1_OBJECT *
+OBJ_nid2obj(int n)
+{
+ ADDED_OBJ ad, *adp;
ASN1_OBJECT ob;
- if ((n >= 0) && (n < NUM_NID))
- {
- if ((n != NID_undef) && (nid_objs[n].nid == NID_undef))
- {
- OBJerr(OBJ_F_OBJ_NID2OBJ,OBJ_R_UNKNOWN_NID);
- return(NULL);
- }
- return((ASN1_OBJECT *)&(nid_objs[n]));
+ if ((n >= 0) && (n < NUM_NID)) {
+ if ((n != NID_undef) && (nid_objs[n].nid == NID_undef)) {
+ OBJerr(OBJ_F_OBJ_NID2OBJ, OBJ_R_UNKNOWN_NID);
+ return (NULL);
}
- else if (added == NULL)
- return(NULL);
- else
- {
- ad.type=ADDED_NID;
- ad.obj= &ob;
- ob.nid=n;
- adp=lh_ADDED_OBJ_retrieve(added,&ad);
+ return ((ASN1_OBJECT *)&(nid_objs[n]));
+ } else if (added == NULL)
+ return (NULL);
+ else {
+ ad.type = ADDED_NID;
+ ad.obj = &ob;
+ ob.nid = n;
+ adp = lh_ADDED_OBJ_retrieve(added, &ad);
if (adp != NULL)
- return(adp->obj);
- else
- {
- OBJerr(OBJ_F_OBJ_NID2OBJ,OBJ_R_UNKNOWN_NID);
- return(NULL);
- }
+ return (adp->obj);
+ else {
+ OBJerr(OBJ_F_OBJ_NID2OBJ, OBJ_R_UNKNOWN_NID);
+ return (NULL);
}
}
+}
-const char *OBJ_nid2sn(int n)
- {
- ADDED_OBJ ad,*adp;
+const char *
+OBJ_nid2sn(int n)
+{
+ ADDED_OBJ ad, *adp;
ASN1_OBJECT ob;
- if ((n >= 0) && (n < NUM_NID))
- {
- if ((n != NID_undef) && (nid_objs[n].nid == NID_undef))
- {
- OBJerr(OBJ_F_OBJ_NID2SN,OBJ_R_UNKNOWN_NID);
- return(NULL);
- }
- return(nid_objs[n].sn);
+ if ((n >= 0) && (n < NUM_NID)) {
+ if ((n != NID_undef) && (nid_objs[n].nid == NID_undef)) {
+ OBJerr(OBJ_F_OBJ_NID2SN, OBJ_R_UNKNOWN_NID);
+ return (NULL);
}
- else if (added == NULL)
- return(NULL);
- else
- {
- ad.type=ADDED_NID;
- ad.obj= &ob;
- ob.nid=n;
- adp=lh_ADDED_OBJ_retrieve(added,&ad);
+ return (nid_objs[n].sn);
+ } else if (added == NULL)
+ return (NULL);
+ else {
+ ad.type = ADDED_NID;
+ ad.obj = &ob;
+ ob.nid = n;
+ adp = lh_ADDED_OBJ_retrieve(added, &ad);
if (adp != NULL)
- return(adp->obj->sn);
- else
- {
- OBJerr(OBJ_F_OBJ_NID2SN,OBJ_R_UNKNOWN_NID);
- return(NULL);
- }
+ return (adp->obj->sn);
+ else {
+ OBJerr(OBJ_F_OBJ_NID2SN, OBJ_R_UNKNOWN_NID);
+ return (NULL);
}
}
+}
-const char *OBJ_nid2ln(int n)
- {
- ADDED_OBJ ad,*adp;
+const char *
+OBJ_nid2ln(int n)
+{
+ ADDED_OBJ ad, *adp;
ASN1_OBJECT ob;
- if ((n >= 0) && (n < NUM_NID))
- {
- if ((n != NID_undef) && (nid_objs[n].nid == NID_undef))
- {
- OBJerr(OBJ_F_OBJ_NID2LN,OBJ_R_UNKNOWN_NID);
- return(NULL);
- }
- return(nid_objs[n].ln);
+ if ((n >= 0) && (n < NUM_NID)) {
+ if ((n != NID_undef) && (nid_objs[n].nid == NID_undef)) {
+ OBJerr(OBJ_F_OBJ_NID2LN, OBJ_R_UNKNOWN_NID);
+ return (NULL);
}
- else if (added == NULL)
- return(NULL);
- else
- {
- ad.type=ADDED_NID;
- ad.obj= &ob;
- ob.nid=n;
- adp=lh_ADDED_OBJ_retrieve(added,&ad);
+ return (nid_objs[n].ln);
+ } else if (added == NULL)
+ return (NULL);
+ else {
+ ad.type = ADDED_NID;
+ ad.obj = &ob;
+ ob.nid = n;
+ adp = lh_ADDED_OBJ_retrieve(added, &ad);
if (adp != NULL)
- return(adp->obj->ln);
- else
- {
- OBJerr(OBJ_F_OBJ_NID2LN,OBJ_R_UNKNOWN_NID);
- return(NULL);
- }
+ return (adp->obj->ln);
+ else {
+ OBJerr(OBJ_F_OBJ_NID2LN, OBJ_R_UNKNOWN_NID);
+ return (NULL);
}
}
+}
-static int obj_cmp(const ASN1_OBJECT * const *ap, const unsigned int *bp)
- {
+static int
+obj_cmp(const ASN1_OBJECT * const *ap, const unsigned int *bp)
+{
int j;
const ASN1_OBJECT *a= *ap;
- const ASN1_OBJECT *b= &nid_objs[*bp];
+ const ASN1_OBJECT *b = &nid_objs[*bp];
- j=(a->length - b->length);
- if (j) return(j);
- return(memcmp(a->data,b->data,a->length));
- }
+ j = (a->length - b->length);
+ if (j)
+ return (j);
+ return (memcmp(a->data, b->data, a->length));
+}
IMPLEMENT_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, obj);
-int OBJ_obj2nid(const ASN1_OBJECT *a)
- {
+int
+OBJ_obj2nid(const ASN1_OBJECT *a)
+{
const unsigned int *op;
- ADDED_OBJ ad,*adp;
+ ADDED_OBJ ad, *adp;
if (a == NULL)
- return(NID_undef);
+ return (NID_undef);
if (a->nid != 0)
- return(a->nid);
+ return (a->nid);
- if (added != NULL)
- {
- ad.type=ADDED_DATA;
+ if (added != NULL) {
+ ad.type = ADDED_DATA;
ad.obj=(ASN1_OBJECT *)a; /* XXX: ugly but harmless */
- adp=lh_ADDED_OBJ_retrieve(added,&ad);
- if (adp != NULL) return (adp->obj->nid);
- }
- op=OBJ_bsearch_obj(&a, obj_objs, NUM_OBJ);
- if (op == NULL)
- return(NID_undef);
- return(nid_objs[*op].nid);
+ adp = lh_ADDED_OBJ_retrieve(added, &ad);
+ if (adp != NULL)
+ return (adp->obj->nid);
}
+ op = OBJ_bsearch_obj(&a, obj_objs, NUM_OBJ);
+ if (op == NULL)
+ return (NID_undef);
+ return (nid_objs[*op].nid);
+}
/* Convert an object name into an ASN1_OBJECT
* if "noname" is not set then search for short and long names first.
* it can be used with any objects, not just registered ones.
*/
-ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name)
- {
+ASN1_OBJECT *
+OBJ_txt2obj(const char *s, int no_name)
+{
int nid = NID_undef;
- ASN1_OBJECT *op=NULL;
+ ASN1_OBJECT *op = NULL;
unsigned char *buf;
unsigned char *p;
const unsigned char *cp;
int i, j;
- if(!no_name) {
- if( ((nid = OBJ_sn2nid(s)) != NID_undef) ||
- ((nid = OBJ_ln2nid(s)) != NID_undef) )
- return OBJ_nid2obj(nid);
+ if (!no_name) {
+ if (((nid = OBJ_sn2nid(s)) != NID_undef) ||
+ ((nid = OBJ_ln2nid(s)) != NID_undef) )
+ return OBJ_nid2obj(nid);
}
/* Work out size of content octets */
- i=a2d_ASN1_OBJECT(NULL,0,s,-1);
+ i = a2d_ASN1_OBJECT(NULL, 0, s, -1);
if (i <= 0) {
/* Don't clear the error */
/*ERR_clear_error();*/
return NULL;
}
/* Work out total size */
- j = ASN1_object_size(0,i,V_ASN1_OBJECT);
+ j = ASN1_object_size(0, i, V_ASN1_OBJECT);
- if((buf=(unsigned char *)malloc(j)) == NULL) return NULL;
+ if ((buf = (unsigned char *)malloc(j)) == NULL)
+ return NULL;
p = buf;
/* Write out tag+length */
- ASN1_put_object(&p,0,i,V_ASN1_OBJECT,V_ASN1_UNIVERSAL);
+ ASN1_put_object(&p, 0, i, V_ASN1_OBJECT, V_ASN1_UNIVERSAL);
/* Write out contents */
- a2d_ASN1_OBJECT(p,i,s,-1);
+ a2d_ASN1_OBJECT(p, i, s, -1);
- cp=buf;
- op=d2i_ASN1_OBJECT(NULL,&cp,j);
+ cp = buf;
+ op = d2i_ASN1_OBJECT(NULL, &cp, j);
free(buf);
return op;
- }
+}
-int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
+int
+OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
{
- int i,n=0,len,nid, first, use_bn;
+ int i, n = 0, len, nid, first, use_bn;
BIGNUM *bl;
unsigned long l;
const unsigned char *p;
char tbuf[DECIMAL_SIZE(l) + 1];
if ((a == NULL) || (a->data == NULL)) {
- buf[0]='\0';
- return(0);
+ buf[0] = '\0';
+ return (0);
}
-
- if (!no_name && (nid=OBJ_obj2nid(a)) != NID_undef)
- {
+ if (!no_name && (nid = OBJ_obj2nid(a)) != NID_undef) {
const char *s;
- s=OBJ_nid2ln(nid);
+ s = OBJ_nid2ln(nid);
if (s == NULL)
- s=OBJ_nid2sn(nid);
- if (s)
- {
+ s = OBJ_nid2sn(nid);
+ if (s) {
if (buf)
- strlcpy(buf,s,buf_len);
- n=strlen(s);
+ strlcpy(buf, s, buf_len);
+ n = strlen(s);
return n;
- }
}
+ }
-
- len=a->length;
- p=a->data;
+ len = a->length;
+ p = a->data;
first = 1;
bl = NULL;
- while (len > 0)
- {
- l=0;
+ while (len > 0) {
+ l = 0;
use_bn = 0;
- for (;;)
- {
+ for (;;) {
unsigned char c = *p++;
len--;
if ((len == 0) && (c & 0x80))
goto err;
- if (use_bn)
- {
+ if (use_bn) {
if (!BN_add_word(bl, c & 0x7f))
goto err;
- }
- else
- l |= c & 0x7f;
+ } else
+ l |= c & 0x7f;
if (!(c & 0x80))
break;
- if (!use_bn && (l > (ULONG_MAX >> 7L)))
- {
+ if (!use_bn && (l > (ULONG_MAX >> 7L))) {
if (!bl && !(bl = BN_new()))
goto err;
if (!BN_set_word(bl, l))
goto err;
use_bn = 1;
- }
- if (use_bn)
- {
+ }
+ if (use_bn) {
if (!BN_lshift(bl, bl, 7))
goto err;
- }
- else
- l<<=7L;
- }
+ } else
+ l <<= 7L;
+ }
- if (first)
- {
+ if (first) {
first = 0;
- if (l >= 80)
- {
+ if (l >= 80) {
i = 2;
- if (use_bn)
- {
+ if (use_bn) {
if (!BN_sub_word(bl, 80))
goto err;
- }
- else
+ } else
l -= 80;
- }
- else
- {
- i=(int)(l/40);
- l-=(long)(i*40);
- }
- if (buf && (buf_len > 0))
- {
+ } else {
+ i = (int)(l / 40);
+ l -= (long)(i * 40);
+ }
+ if (buf && (buf_len > 0)) {
*buf++ = i + '0';
buf_len--;
- }
- n++;
}
+ n++;
+ }
- if (use_bn)
- {
+ if (use_bn) {
char *bndec;
bndec = BN_bn2dec(bl);
if (!bndec)
goto err;
i = strlen(bndec);
- if (buf)
- {
- if (buf_len > 0)
- {
+ if (buf) {
+ if (buf_len > 0) {
*buf++ = '.';
buf_len--;
- }
- strlcpy(buf,bndec,buf_len);
- if (i > buf_len)
- {
+ }
+ strlcpy(buf, bndec, buf_len);
+ if (i > buf_len) {
buf += buf_len;
buf_len = 0;
- }
- else
- {
- buf+=i;
- buf_len-=i;
- }
+ } else {
+ buf += i;
+ buf_len -= i;
}
+ }
n++;
n += i;
free(bndec);
- }
- else
- {
- snprintf(tbuf,sizeof tbuf,".%lu",l);
- i=strlen(tbuf);
- if (buf && (buf_len > 0))
- {
- strlcpy(buf,tbuf,buf_len);
- if (i > buf_len)
- {
+ } else {
+ snprintf(tbuf, sizeof tbuf, ".%lu", l);
+ i = strlen(tbuf);
+ if (buf && (buf_len > 0)) {
+ strlcpy(buf, tbuf, buf_len);
+ if (i > buf_len) {
buf += buf_len;
buf_len = 0;
- }
- else
- {
- buf+=i;
- buf_len-=i;
- }
+ } else {
+ buf += i;
+ buf_len -= i;
}
- n+=i;
- l=0;
}
+ n += i;
+ l = 0;
}
+ }
if (bl)
BN_free(bl);
return n;
- err:
+err:
if (bl)
BN_free(bl);
return -1;
}
-int OBJ_txt2nid(const char *s)
+int
+OBJ_txt2nid(const char *s)
{
ASN1_OBJECT *obj;
int nid;
+
obj = OBJ_txt2obj(s, 0);
nid = OBJ_obj2nid(obj);
ASN1_OBJECT_free(obj);
return nid;
}
-int OBJ_ln2nid(const char *s)
- {
+int
+OBJ_ln2nid(const char *s)
+{
ASN1_OBJECT o;
- const ASN1_OBJECT *oo= &o;
- ADDED_OBJ ad,*adp;
+ const ASN1_OBJECT *oo = &o;
+ ADDED_OBJ ad, *adp;
const unsigned int *op;
- o.ln=s;
- if (added != NULL)
- {
- ad.type=ADDED_LNAME;
- ad.obj= &o;
- adp=lh_ADDED_OBJ_retrieve(added,&ad);
- if (adp != NULL) return (adp->obj->nid);
- }
- op=OBJ_bsearch_ln(&oo, ln_objs, NUM_LN);
- if (op == NULL) return(NID_undef);
- return(nid_objs[*op].nid);
+ o.ln = s;
+ if (added != NULL) {
+ ad.type = ADDED_LNAME;
+ ad.obj = &o;
+ adp = lh_ADDED_OBJ_retrieve(added, &ad);
+ if (adp != NULL)
+ return (adp->obj->nid);
}
+ op = OBJ_bsearch_ln(&oo, ln_objs, NUM_LN);
+ if (op == NULL)
+ return (NID_undef);
+ return (nid_objs[*op].nid);
+}
-int OBJ_sn2nid(const char *s)
- {
+int
+OBJ_sn2nid(const char *s)
+{
ASN1_OBJECT o;
- const ASN1_OBJECT *oo= &o;
- ADDED_OBJ ad,*adp;
+ const ASN1_OBJECT *oo = &o;
+ ADDED_OBJ ad, *adp;
const unsigned int *op;
- o.sn=s;
- if (added != NULL)
- {
- ad.type=ADDED_SNAME;
- ad.obj= &o;
- adp=lh_ADDED_OBJ_retrieve(added,&ad);
- if (adp != NULL) return (adp->obj->nid);
- }
- op=OBJ_bsearch_sn(&oo, sn_objs, NUM_SN);
- if (op == NULL) return(NID_undef);
- return(nid_objs[*op].nid);
+ o.sn = s;
+ if (added != NULL) {
+ ad.type = ADDED_SNAME;
+ ad.obj = &o;
+ adp = lh_ADDED_OBJ_retrieve(added, &ad);
+ if (adp != NULL)
+ return (adp->obj->nid);
}
+ op = OBJ_bsearch_sn(&oo, sn_objs, NUM_SN);
+ if (op == NULL)
+ return (NID_undef);
+ return (nid_objs[*op].nid);
+}
-const void *OBJ_bsearch_(const void *key, const void *base, int num, int size,
- int (*cmp)(const void *, const void *))
- {
+const void *
+OBJ_bsearch_(const void *key, const void *base, int num, int size,
+ int (*cmp)(const void *, const void *))
+{
return OBJ_bsearch_ex_(key, base, num, size, cmp, 0);
- }
+}
-const void *OBJ_bsearch_ex_(const void *key, const void *base_, int num,
- int size,
- int (*cmp)(const void *, const void *),
- int flags)
- {
- const char *base=base_;
- int l,h,i=0,c=0;
+const void *
+OBJ_bsearch_ex_(const void *key, const void *base_, int num, int size,
+ int (*cmp)(const void *, const void *), int flags)
+{
+ const char *base = base_;
+ int l, h, i = 0, c = 0;
const char *p = NULL;
- if (num == 0) return(NULL);
- l=0;
- h=num;
- while (l < h)
- {
- i=(l+h)/2;
- p= &(base[i*size]);
- c=(*cmp)(key,p);
+ if (num == 0)
+ return (NULL);
+ l = 0;
+ h = num;
+ while (l < h) {
+ i = (l + h) / 2;
+ p = &(base[i * size]);
+ c = (*cmp)(key, p);
if (c < 0)
- h=i;
+ h = i;
else if (c > 0)
- l=i+1;
+ l = i + 1;
else
break;
- }
+ }
if (c != 0 && !(flags & OBJ_BSEARCH_VALUE_ON_NOMATCH))
p = NULL;
- else if (c == 0 && (flags & OBJ_BSEARCH_FIRST_VALUE_ON_MATCH))
- {
- while(i > 0 && (*cmp)(key,&(base[(i-1)*size])) == 0)
+ else if (c == 0 && (flags & OBJ_BSEARCH_FIRST_VALUE_ON_MATCH)) {
+ while (i > 0 && (*cmp)(key, &(base[(i - 1) * size])) == 0)
i--;
- p = &(base[i*size]);
- }
- return(p);
+ p = &(base[i * size]);
}
+ return (p);
+}
-int OBJ_create_objects(BIO *in)
- {
+int
+OBJ_create_objects(BIO *in)
+{
char buf[512];
- int i,num=0;
- char *o,*s,*l=NULL;
-
- for (;;)
- {
- s=o=NULL;
- i=BIO_gets(in,buf,512);
- if (i <= 0) return(num);
- buf[i-1]='\0';
- if (!isalnum((unsigned char)buf[0])) return(num);
- o=s=buf;
+ int i, num = 0;
+ char *o, *s, *l = NULL;
+
+ for (;;) {
+ s = o = NULL;
+ i = BIO_gets(in, buf, 512);
+ if (i <= 0)
+ return (num);
+ buf[i - 1] = '\0';
+ if (!isalnum((unsigned char)buf[0]))
+ return (num);
+ o = s=buf;
while (isdigit((unsigned char)*s) || (*s == '.'))
s++;
- if (*s != '\0')
- {
- *(s++)='\0';
+ if (*s != '\0') {
+ *(s++) = '\0';
while (isspace((unsigned char)*s))
s++;
if (*s == '\0')
- s=NULL;
- else
- {
- l=s;
- while ((*l != '\0') && !isspace((unsigned char)*l))
+ s = NULL;
+ else {
+ l = s;
+ while ((*l != '\0') &&
+ !isspace((unsigned char)*l))
l++;
- if (*l != '\0')
- {
- *(l++)='\0';
+ if (*l != '\0') {
+ *(l++) = '\0';
while (isspace((unsigned char)*l))
l++;
- if (*l == '\0') l=NULL;
- }
- else
- l=NULL;
- }
+ if (*l == '\0')
+ l = NULL;
+ } else
+ l = NULL;
}
- else
- s=NULL;
- if ((o == NULL) || (*o == '\0')) return(num);
- if (!OBJ_create(o,s,l)) return(num);
+ } else
+ s = NULL;
+ if ((o == NULL) || (*o == '\0'))
+ return (num);
+ if (!OBJ_create(o, s, l))
+ return (num);
num++;
- }
- /* return(num); */
}
+ /* return(num); */
+}
-int OBJ_create(const char *oid, const char *sn, const char *ln)
- {
- int ok=0;
- ASN1_OBJECT *op=NULL;
+int
+OBJ_create(const char *oid, const char *sn, const char *ln)
+{
+ int ok = 0;
+ ASN1_OBJECT *op = NULL;
unsigned char *buf;
int i;
- i=a2d_ASN1_OBJECT(NULL,0,oid,-1);
- if (i <= 0) return(0);
+ i = a2d_ASN1_OBJECT(NULL, 0, oid, -1);
+ if (i <= 0)
+ return (0);
- if ((buf=(unsigned char *)malloc(i)) == NULL)
- {
- OBJerr(OBJ_F_OBJ_CREATE,ERR_R_MALLOC_FAILURE);
- return(0);
- }
- i=a2d_ASN1_OBJECT(buf,i,oid,-1);
+ if ((buf = (unsigned char *)malloc(i)) == NULL) {
+ OBJerr(OBJ_F_OBJ_CREATE, ERR_R_MALLOC_FAILURE);
+ return (0);
+ }
+ i = a2d_ASN1_OBJECT(buf, i, oid, -1);
if (i == 0)
goto err;
- op=(ASN1_OBJECT *)ASN1_OBJECT_create(OBJ_new_nid(1),buf,i,sn,ln);
- if (op == NULL)
+ op = (ASN1_OBJECT *)ASN1_OBJECT_create(OBJ_new_nid(1), buf, i, sn, ln);
+ if (op == NULL)
goto err;
- ok=OBJ_add_object(op);
+ ok = OBJ_add_object(op);
+
err:
ASN1_OBJECT_free(op);
free(buf);
- return(ok);
- }
-
+ return (ok);
+}
* 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
#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)
- {
+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);
- }
-#endif
+ 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
+}
* 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:
* 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
* 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
#include <openssl/objects.h>
#include <openssl/buffer.h>
-ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o)
- {
+ASN1_OBJECT *
+OBJ_dup(const ASN1_OBJECT *o)
+{
ASN1_OBJECT *r;
int i;
- char *ln=NULL,*sn=NULL;
- unsigned char *data=NULL;
+ char *ln = NULL, *sn = NULL;
+ unsigned char *data = NULL;
- if (o == NULL) return(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??? */
- r=ASN1_OBJECT_new();
- if (r == NULL)
- {
- OBJerr(OBJ_F_OBJ_DUP,ERR_R_ASN1_LIB);
- return(NULL);
- }
- data=malloc(o->length);
+ r = ASN1_OBJECT_new();
+ if (r == NULL) {
+ OBJerr(OBJ_F_OBJ_DUP, ERR_R_ASN1_LIB);
+ return (NULL);
+ }
+ data = malloc(o->length);
if (data == NULL)
goto err;
if (o->data != NULL)
- memcpy(data,o->data,o->length);
+ 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=malloc(i);
- if (ln == NULL) goto err;
- memcpy(ln,o->ln,i);
- r->ln=ln;
- }
+ r->length = o->length;
+ r->nid = o->nid;
+ r->ln = r->sn = NULL;
+ if (o->ln != NULL) {
+ i = strlen(o->ln) + 1;
+ ln = 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=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) free(ln);
- if (sn != NULL) free(sn);
- if (data != NULL) free(data);
- if (r != NULL) free(r);
- return(NULL);
+ if (o->sn != NULL) {
+ i = strlen(o->sn) + 1;
+ sn = 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);
-int OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b)
- {
+err:
+ OBJerr(OBJ_F_OBJ_DUP, ERR_R_MALLOC_FAILURE);
+ if (ln != NULL)
+ free(ln);
+ if (sn != NULL)
+ free(sn);
+ if (data != NULL)
+ free(data);
+ if (r != NULL)
+ free(r);
+ return (NULL);
+}
+
+int
+OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b)
+{
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));
+}
* 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
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)
- {
+static int
+sig_cmp(const nid_triple *a, const nid_triple *b)
+{
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)
- {
+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)
- {
+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)
- {
+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)
- {
+ 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)
- {
+ if (rv == NULL) {
rv = OBJ_bsearch_sig(&tmp, sigoid_srt,
- sizeof(sigoid_srt) / sizeof(nid_triple));
- }
+ sizeof(sigoid_srt) / sizeof(nid_triple));
+ }
#endif
if (rv == NULL)
return 0;
if (ppkey_nid)
*ppkey_nid = rv->pkey_id;
return 1;
- }
+}
-int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid)
- {
+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 *t = &tmp;
const nid_triple **rv = NULL;
tmp.hash_id = dig_nid;
tmp.pkey_id = pkey_nid;
- if (sigx_app)
- {
+ if (sigx_app) {
int idx = sk_nid_triple_find(sigx_app, &tmp);
- if (idx >= 0)
- {
+ if (idx >= 0) {
t = sk_nid_triple_value(sigx_app, idx);
rv = &t;
- }
}
+ }
#ifndef OBJ_XREF_TEST2
- if (rv == NULL)
- {
+ if (rv == NULL) {
rv = OBJ_bsearch_sigx(&t, sigoid_srt_xref,
- sizeof(sigoid_srt_xref) / sizeof(nid_triple *)
- );
- }
+ sizeof(sigoid_srt_xref) / sizeof(nid_triple *));
+ }
#endif
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)
- {
+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)
ntr->hash_id = dig_id;
ntr->pkey_id = pkey_id;
- if (!sk_nid_triple_push(sig_app, ntr))
- {
+ if (!sk_nid_triple_push(sig_app, ntr)) {
free(ntr);
return 0;
- }
+ }
if (!sk_nid_triple_push(sigx_app, ntr))
return 0;
sk_nid_triple_sort(sigx_app);
return 1;
- }
+}
-static void sid_free(nid_triple *tt)
- {
+static void
+sid_free(nid_triple *tt)
+{
free(tt);
- }
+}
-void OBJ_sigid_free(void)
- {
- if (sig_app)
- {
+void
+OBJ_sigid_free(void)
+{
+ if (sig_app) {
sk_nid_triple_pop_free(sig_app, sid_free);
sig_app = NULL;
- }
- if (sigx_app)
- {
+ }
+ if (sigx_app) {
sk_nid_triple_free(sigx_app);
sigx_app = NULL;
- }
}
-
+}
+
#ifdef OBJ_XREF_TEST
main()
- {
+{
int n1, n2, n3;
int i, rv;
#ifdef OBJ_XREF_TEST2
- for (i = 0; i < sizeof(sigoid_srt) / sizeof(nid_triple); i++)
- {
+ 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]);
- }
+ sigoid_srt[i][2]);
+ }
#endif
- for (i = 0; i < sizeof(sigoid_srt) / sizeof(nid_triple); i++)
- {
+ 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;
+ 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));
- }
+ OBJ_nid2ln(n1), OBJ_nid2ln(n2), OBJ_nid2ln(n3));
}
-
+}
+
#endif
* 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:
* 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
* 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
#define SN_pbeWithSHA1AndRC2_CBC "PBE-SHA1-RC2-64"
#define LN_pbeWithSHA1AndRC2_CBC "pbeWithSHA1AndRC2-CBC"
#define NID_pbeWithSHA1AndRC2_CBC 68
-#define OBJ_pbeWithSHA1AndRC2_CBC OBJ_pkcs,5L,11L
+#define OBJ_pbeWithSHA1AndRC2_CBC OBJ_pkcs,5L,11L
/* proposed by microsoft to RSA as pbeWithSHA1AndRC4: it is now
* defined explicitly in PKCS#5 v2.0 as id-PBKDF2 which is something
*/
#define LN_id_pbkdf2 "PBKDF2"
#define NID_id_pbkdf2 69
-#define OBJ_id_pbkdf2 OBJ_pkcs,5L,12L
+#define OBJ_id_pbkdf2 OBJ_pkcs,5L,12L
#define SN_dsaWithSHA1_2 "DSA-SHA1-old"
#define LN_dsaWithSHA1_2 "dsaWithSHA1-old"
extern "C" {
#endif
-typedef struct obj_name_st
- {
+typedef struct obj_name_st {
int type;
int alias;
const char *name;
const char *data;
- } OBJ_NAME;
+} OBJ_NAME;
#define OBJ_create_and_add_object(a,b,c) OBJ_create(a,b,c)
int OBJ_NAME_init(void);
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 *));
-const char *OBJ_NAME_get(const char *name,int type);
-int OBJ_NAME_add(const char *name,int type,const char *data);
-int OBJ_NAME_remove(const char *name,int type);
+ int (*cmp_func)(const char *, const char *),
+ void (*free_func)(const char *, int, const char *));
+const char *OBJ_NAME_get(const char *name, int type);
+int OBJ_NAME_add(const char *name, int type, const char *data);
+int OBJ_NAME_remove(const char *name, int type);
void OBJ_NAME_cleanup(int type); /* -1 for everything */
-void OBJ_NAME_do_all(int type,void (*fn)(const OBJ_NAME *,void *arg),
- void *arg);
-void OBJ_NAME_do_all_sorted(int type,void (*fn)(const OBJ_NAME *,void *arg),
- void *arg);
+void OBJ_NAME_do_all(int type, void (*fn)(const OBJ_NAME *, void *arg),
+ void *arg);
+void OBJ_NAME_do_all_sorted(int type, void (*fn)(const OBJ_NAME *, void *arg),
+ void *arg);
ASN1_OBJECT * OBJ_dup(const ASN1_OBJECT *o);
ASN1_OBJECT * OBJ_nid2obj(int n);
int OBJ_txt2nid(const char *s);
int OBJ_ln2nid(const char *s);
int OBJ_sn2nid(const char *s);
-int OBJ_cmp(const ASN1_OBJECT *a,const ASN1_OBJECT *b);
-const void * OBJ_bsearch_(const void *key,const void *base,int num,int size,
- int (*cmp)(const void *, const void *));
-const void * OBJ_bsearch_ex_(const void *key,const void *base,int num,
- int size,
- int (*cmp)(const void *, const void *),
- int flags);
+int OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b);
+const void * OBJ_bsearch_(const void *key, const void *base, int num,
+ int size, int (*cmp)(const void *, const void *));
+const void * OBJ_bsearch_ex_(const void *key, const void *base, int num,
+ int size, int (*cmp)(const void *, const void *),
+ int flags);
#define _DECLARE_OBJ_BSEARCH_CMP_FN(scope, type1, type2, nm) \
static int nm##_cmp_BSEARCH_CMP_FN(const void *, const void *); \
int OBJ_new_nid(int num);
int OBJ_add_object(const ASN1_OBJECT *obj);
-int OBJ_create(const char *oid,const char *sn,const char *ln);
+int OBJ_create(const char *oid, const char *sn, const char *ln);
void OBJ_cleanup(void );
int OBJ_create_objects(BIO *in);
projects / openbsd / commitdiff