obj_dat.c 15.1 KB
Newer Older
1
/* crypto/objects/obj_dat.c */
2
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
 * All rights reserved.
 *
 * 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:
 * 1. Redistributions of source code must retain the copyright
 *    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 the
 *    documentation and/or other materials provided with the distribution.
 * 3. All advertising materials mentioning features or use of this software
 *    must display the following acknowledgement:
 *    "This product includes cryptographic software written by
 *     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 
 *    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
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 * 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
 * [including the GNU Public Licence.]
 */

#include <stdio.h>
60
#include <ctype.h>
61
#include "cryptlib.h"
62 63 64
#include <openssl/lhash.h>
#include <openssl/asn1.h>
#include <openssl/objects.h>
65 66

/* obj_dat.h is generated from objects.h by obj_dat.pl */
67
#ifndef NO_OBJECT
68
#include "obj_dat.h"
69 70 71 72 73 74 75 76 77 78 79 80
#else
/* You will have to load all the objects needed manually in the application */
#define NUM_NID 0
#define NUM_SN 0
#define NUM_LN 0
#define NUM_OBJ 0
static unsigned char lvalues[1];
static ASN1_OBJECT nid_objs[1];
static ASN1_OBJECT *sn_objs[1];
static ASN1_OBJECT *ln_objs[1];
static ASN1_OBJECT *obj_objs[1];
#endif
81

D
 
Dr. Stephen Henson 已提交
82 83 84
static int sn_cmp(const void *a, const void *b);
static int ln_cmp(const void *a, const void *b);
static int obj_cmp(const void *a, const void *b);
85 86 87 88 89 90 91 92 93 94 95 96 97 98
#define ADDED_DATA	0
#define ADDED_SNAME	1
#define ADDED_LNAME	2
#define ADDED_NID	3

typedef struct added_obj_st
	{
	int type;
	ASN1_OBJECT *obj;
	} ADDED_OBJ;

static int new_nid=NUM_NID;
static LHASH *added=NULL;

D
 
Dr. Stephen Henson 已提交
99 100 101 102 103
static int sn_cmp(const void *a, const void *b)
	{
	const ASN1_OBJECT * const *ap = a, * const *bp = b;
	return(strcmp((*ap)->sn,(*bp)->sn));
	}
104

D
 
Dr. Stephen Henson 已提交
105 106 107 108 109
static int ln_cmp(const void *a, const void *b)
	{ 
	const ASN1_OBJECT * const *ap = a, * const *bp = b;
	return(strcmp((*ap)->ln,(*bp)->ln));
	}
110

111
/* static unsigned long add_hash(ADDED_OBJ *ca) */
112
static unsigned long add_hash(const void *ca_void)
113
	{
114
	const ASN1_OBJECT *a;
115 116 117
	int i;
	unsigned long ret=0;
	unsigned char *p;
118
	ADDED_OBJ *ca = (ADDED_OBJ *)ca_void;
119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138

	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);
		break;
	case ADDED_SNAME:
		ret=lh_strhash(a->sn);
		break;
	case ADDED_LNAME:
		ret=lh_strhash(a->ln);
		break;
	case ADDED_NID:
		ret=a->nid;
		break;
	default:
139 140
		/* abort(); */
		return 0;
141
		}
142
	ret&=0x3fffffffL;
143 144 145 146
	ret|=ca->type<<30L;
	return(ret);
	}

147
/* static int add_cmp(ADDED_OBJ *ca, ADDED_OBJ *cb) */
148
static int add_cmp(const void *ca_void, const void *cb_void)
149 150 151
	{
	ASN1_OBJECT *a,*b;
	int i;
152 153
	ADDED_OBJ *ca = (ADDED_OBJ *)ca_void;
	ADDED_OBJ *cb = (ADDED_OBJ *)cb_void;
154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175

	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,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));
	case ADDED_LNAME:
		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);
	default:
176 177
		/* abort(); */
		return 0;
178
		}
179
	return(1); /* should not get here */
180 181
	}

U
Ulf Möller 已提交
182
static int init_added(void)
183 184
	{
	if (added != NULL) return(1);
185
	added=lh_new(add_hash,add_cmp);
186 187 188
	return(added != NULL);
	}

U
Ulf Möller 已提交
189
static void cleanup1(ADDED_OBJ *a)
190 191 192
	{
	a->obj->nid=0;
	a->obj->flags|=ASN1_OBJECT_FLAG_DYNAMIC|
193 194
	                ASN1_OBJECT_FLAG_DYNAMIC_STRINGS|
			ASN1_OBJECT_FLAG_DYNAMIC_DATA;
195 196
	}

U
Ulf Möller 已提交
197
static void cleanup2(ADDED_OBJ *a)
198 199
	{ a->obj->nid++; }

U
Ulf Möller 已提交
200
static void cleanup3(ADDED_OBJ *a)
201 202 203
	{
	if (--a->obj->nid == 0)
		ASN1_OBJECT_free(a->obj);
204
	OPENSSL_free(a);
205 206
	}

207 208 209 210
static IMPLEMENT_LHASH_DOALL_FN(cleanup1, ADDED_OBJ *)
static IMPLEMENT_LHASH_DOALL_FN(cleanup2, ADDED_OBJ *)
static IMPLEMENT_LHASH_DOALL_FN(cleanup3, ADDED_OBJ *)

U
Ulf Möller 已提交
211
void OBJ_cleanup(void)
212 213 214
	{
	if (added == NULL) return;
	added->down_load=0;
215 216 217
	lh_doall(added,LHASH_DOALL_FN(cleanup1)); /* zero counters */
	lh_doall(added,LHASH_DOALL_FN(cleanup2)); /* set counters */
	lh_doall(added,LHASH_DOALL_FN(cleanup3)); /* free objects */
218
	lh_free(added);
219
	added=NULL;
220 221
	}

U
Ulf Möller 已提交
222
int OBJ_new_nid(int num)
223 224 225 226 227 228 229 230
	{
	int i;

	i=new_nid;
	new_nid+=num;
	return(i);
	}

231
int OBJ_add_object(const ASN1_OBJECT *obj)
232 233
	{
	ASN1_OBJECT *o;
A
Andy Polyakov 已提交
234
	ADDED_OBJ *ao[4]={NULL,NULL,NULL,NULL},*aop;
235 236 237 238 239
	int i;

	if (added == NULL)
		if (!init_added()) return(0);
	if ((o=OBJ_dup(obj)) == NULL) goto err;
240
	ao[ADDED_NID]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ));
241
	if ((o->length != 0) && (obj->data != NULL))
242
		ao[ADDED_DATA]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ));
243
	if (o->sn != NULL)
244
		ao[ADDED_SNAME]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ));
245
	if (o->ln != NULL)
246
		ao[ADDED_LNAME]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ));
247 248 249 250 251 252 253

	for (i=ADDED_DATA; i<=ADDED_NID; i++)
		{
		if (ao[i] != NULL)
			{
			ao[i]->type=i;
			ao[i]->obj=o;
254
			aop=(ADDED_OBJ *)lh_insert(added,ao[i]);
255 256
			/* memory leak, buit should not normally matter */
			if (aop != NULL)
257
				OPENSSL_free(aop);
258 259
			}
		}
260 261 262
	o->flags&= ~(ASN1_OBJECT_FLAG_DYNAMIC|ASN1_OBJECT_FLAG_DYNAMIC_STRINGS|
			ASN1_OBJECT_FLAG_DYNAMIC_DATA);

263 264 265
	return(o->nid);
err:
	for (i=ADDED_DATA; i<=ADDED_NID; i++)
266 267
		if (ao[i] != NULL) OPENSSL_free(ao[i]);
	if (o != NULL) OPENSSL_free(o);
268
	return(NID_undef);
269 270
	}

U
Ulf Möller 已提交
271
ASN1_OBJECT *OBJ_nid2obj(int n)
272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291
	{
	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]));
		}
	else if (added == NULL)
		return(NULL);
	else
		{
		ad.type=ADDED_NID;
		ad.obj= &ob;
		ob.nid=n;
292
		adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
293 294 295 296 297 298 299 300 301 302
		if (adp != NULL)
			return(adp->obj);
		else
			{
			OBJerr(OBJ_F_OBJ_NID2OBJ,OBJ_R_UNKNOWN_NID);
			return(NULL);
			}
		}
	}

U
Ulf Möller 已提交
303
const char *OBJ_nid2sn(int n)
304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323
	{
	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);
		}
	else if (added == NULL)
		return(NULL);
	else
		{
		ad.type=ADDED_NID;
		ad.obj= &ob;
		ob.nid=n;
324
		adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
325 326 327 328 329 330 331 332 333 334
		if (adp != NULL)
			return(adp->obj->sn);
		else
			{
			OBJerr(OBJ_F_OBJ_NID2SN,OBJ_R_UNKNOWN_NID);
			return(NULL);
			}
		}
	}

U
Ulf Möller 已提交
335
const char *OBJ_nid2ln(int n)
336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355
	{
	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);
		}
	else if (added == NULL)
		return(NULL);
	else
		{
		ad.type=ADDED_NID;
		ad.obj= &ob;
		ob.nid=n;
356
		adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
357 358 359 360 361 362 363 364 365 366
		if (adp != NULL)
			return(adp->obj->ln);
		else
			{
			OBJerr(OBJ_F_OBJ_NID2LN,OBJ_R_UNKNOWN_NID);
			return(NULL);
			}
		}
	}

367
int OBJ_obj2nid(const ASN1_OBJECT *a)
368 369 370 371 372 373 374 375 376 377 378 379
	{
	ASN1_OBJECT **op;
	ADDED_OBJ ad,*adp;

	if (a == NULL)
		return(NID_undef);
	if (a->nid != 0)
		return(a->nid);

	if (added != NULL)
		{
		ad.type=ADDED_DATA;
380
		ad.obj=(ASN1_OBJECT *)a; /* XXX: ugly but harmless */
381
		adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
382 383 384
		if (adp != NULL) return (adp->obj->nid);
		}
	op=(ASN1_OBJECT **)OBJ_bsearch((char *)&a,(char *)obj_objs,NUM_OBJ,
D
 
Dr. Stephen Henson 已提交
385
		sizeof(ASN1_OBJECT *),obj_cmp);
386 387 388 389 390
	if (op == NULL)
		return(NID_undef);
	return((*op)->nid);
	}

391 392 393 394 395 396
/* Convert an object name into an ASN1_OBJECT
 * if "noname" is not set then search for short and long names first.
 * This will convert the "dotted" form into an object: unlike OBJ_txt2nid
 * it can be used with any objects, not just registered ones.
 */

U
Ulf Möller 已提交
397
ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name)
398
	{
399 400 401 402 403 404 405 406 407 408
	int nid = NID_undef;
	ASN1_OBJECT *op=NULL;
	unsigned char *buf,*p;
	int i, j;

	if(!no_name) {
		if( ((nid = OBJ_sn2nid(s)) != NID_undef) ||
			((nid = OBJ_ln2nid(s)) != NID_undef) ) 
					return OBJ_nid2obj(nid);
	}
409

410 411
	/* Work out size of content octets */
	i=a2d_ASN1_OBJECT(NULL,0,s,-1);
412 413 414 415 416
	if (i <= 0) {
		/* Clear the error */
		ERR_get_error();
		return NULL;
	}
417 418 419
	/* Work out total size */
	j = ASN1_object_size(0,i,V_ASN1_OBJECT);

420
	if((buf=(unsigned char *)OPENSSL_malloc(j)) == NULL) return NULL;
421 422 423 424 425 426 427 428 429

	p = buf;
	/* Write out tag+length */
	ASN1_put_object(&p,0,i,V_ASN1_OBJECT,V_ASN1_UNIVERSAL);
	/* Write out contents */
	a2d_ASN1_OBJECT(p,i,s,-1);
	
	p=buf;
	op=d2i_ASN1_OBJECT(NULL,&p,i);
430
	OPENSSL_free(buf);
431
	return op;
432 433
	}

434
int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
D
Dr. Stephen Henson 已提交
435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499
{
	int i,idx=0,n=0,len,nid;
	unsigned long l;
	unsigned char *p;
	const char *s;
	char tbuf[32];

	if (buf_len <= 0) return(0);

	if ((a == NULL) || (a->data == NULL)) {
		buf[0]='\0';
		return(0);
	}

	nid=OBJ_obj2nid(a);
	if ((nid == NID_undef) || no_name) {
		len=a->length;
		p=a->data;

		idx=0;
		l=0;
		while (idx < a->length) {
			l|=(p[idx]&0x7f);
			if (!(p[idx] & 0x80)) break;
			l<<=7L;
			idx++;
		}
		idx++;
		i=(int)(l/40);
		if (i > 2) i=2;
		l-=(long)(i*40);

		sprintf(tbuf,"%d.%lu",i,l);
		i=strlen(tbuf);
		strncpy(buf,tbuf,buf_len);
		buf_len-=i;
		buf+=i;
		n+=i;

		l=0;
		for (; idx<len; idx++) {
			l|=p[idx]&0x7f;
			if (!(p[idx] & 0x80)) {
				sprintf(tbuf,".%lu",l);
				i=strlen(tbuf);
				if (buf_len > 0)
					strncpy(buf,tbuf,buf_len);
				buf_len-=i;
				buf+=i;
				n+=i;
				l=0;
			}
			l<<=7L;
		}
	} else {
		s=OBJ_nid2ln(nid);
		if (s == NULL)
			s=OBJ_nid2sn(nid);
		strncpy(buf,s,buf_len);
		n=strlen(s);
	}
	buf[buf_len-1]='\0';
	return(n);
}

500
int OBJ_txt2nid(const char *s)
501 502 503 504 505 506 507 508 509
{
	ASN1_OBJECT *obj;
	int nid;
	obj = OBJ_txt2obj(s, 0);
	nid = OBJ_obj2nid(obj);
	ASN1_OBJECT_free(obj);
	return nid;
}

U
Ulf Möller 已提交
510
int OBJ_ln2nid(const char *s)
511 512 513 514 515 516 517 518 519
	{
	ASN1_OBJECT o,*oo= &o,**op;
	ADDED_OBJ ad,*adp;

	o.ln=s;
	if (added != NULL)
		{
		ad.type=ADDED_LNAME;
		ad.obj= &o;
520
		adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
521 522 523
		if (adp != NULL) return (adp->obj->nid);
		}
	op=(ASN1_OBJECT **)OBJ_bsearch((char *)&oo,(char *)ln_objs,NUM_LN,
D
 
Dr. Stephen Henson 已提交
524
		sizeof(ASN1_OBJECT *),ln_cmp);
525 526 527 528
	if (op == NULL) return(NID_undef);
	return((*op)->nid);
	}

U
Ulf Möller 已提交
529
int OBJ_sn2nid(const char *s)
530 531 532 533 534 535 536 537 538
	{
	ASN1_OBJECT o,*oo= &o,**op;
	ADDED_OBJ ad,*adp;

	o.sn=s;
	if (added != NULL)
		{
		ad.type=ADDED_SNAME;
		ad.obj= &o;
539
		adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
540 541 542
		if (adp != NULL) return (adp->obj->nid);
		}
	op=(ASN1_OBJECT **)OBJ_bsearch((char *)&oo,(char *)sn_objs,NUM_SN,
D
 
Dr. Stephen Henson 已提交
543
		sizeof(ASN1_OBJECT *),sn_cmp);
544 545 546 547
	if (op == NULL) return(NID_undef);
	return((*op)->nid);
	}

D
 
Dr. Stephen Henson 已提交
548
static int obj_cmp(const void *ap, const void *bp)
549 550
	{
	int j;
D
 
Dr. Stephen Henson 已提交
551 552
	ASN1_OBJECT *a= *(ASN1_OBJECT **)ap;
	ASN1_OBJECT *b= *(ASN1_OBJECT **)bp;
553 554 555 556 557 558

	j=(a->length - b->length);
        if (j) return(j);
	return(memcmp(a->data,b->data,a->length));
        }

559 560
const char *OBJ_bsearch(const char *key, const char *base, int num, int size,
	int (*cmp)(const void *, const void *))
561 562
	{
	int l,h,i,c;
563
	const char *p;
564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579

	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;
		else if (c > 0)
			l=i+1;
		else
			return(p);
		}
580 581 582 583 584 585 586 587 588 589 590
#ifdef CHARSET_EBCDIC
/* THIS IS A KLUDGE - Because the *_obj is sorted in ASCII order, and
 * I don't have perl (yet), we revert to a *LINEAR* search
 * when the object wasn't found in the binary search.
 */
	for (i=0; i<num; ++i) {
		p= &(base[i*size]);
		if ((*cmp)(key,p) == 0)
			return p;
	}
#endif
591 592 593
	return(NULL);
	}

U
Ulf Möller 已提交
594
int OBJ_create_objects(BIO *in)
595 596
	{
	MS_STATIC char buf[512];
597
	int i,num=0;
598 599 600 601 602 603 604 605
	char *o,*s,*l=NULL;

	for (;;)
		{
		s=o=NULL;
		i=BIO_gets(in,buf,512);
		if (i <= 0) return(num);
		buf[i-1]='\0';
606
		if (!isalnum((unsigned char)buf[0])) return(num);
607
		o=s=buf;
608
		while (isdigit((unsigned char)*s) || (*s == '.'))
609 610 611 612
			s++;
		if (*s != '\0')
			{
			*(s++)='\0';
613
			while (isspace((unsigned char)*s))
614 615 616 617 618 619
				s++;
			if (*s == '\0')
				s=NULL;
			else
				{
				l=s;
620
				while ((*l != '\0') && !isspace((unsigned char)*l))
621 622 623 624
					l++;
				if (*l != '\0')
					{
					*(l++)='\0';
625
					while (isspace((unsigned char)*l))
626 627 628 629 630 631 632 633 634 635 636 637 638
						l++;
					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);
		num++;
		}
639
	/* return(num); */
640 641
	}

642
int OBJ_create(const char *oid, const char *sn, const char *ln)
643 644 645 646 647 648 649 650 651
	{
	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);

652
	if ((buf=(unsigned char *)OPENSSL_malloc(i)) == NULL)
653
		{
654
		OBJerr(OBJ_F_OBJ_CREATE,OBJ_R_MALLOC_FAILURE);
655 656 657 658 659 660 661 662 663
		return(0);
		}
	i=a2d_ASN1_OBJECT(buf,i,oid,-1);
	op=(ASN1_OBJECT *)ASN1_OBJECT_create(OBJ_new_nid(1),buf,i,sn,ln);
	if (op == NULL) 
		goto err;
	ok=OBJ_add_object(op);
err:
	ASN1_OBJECT_free(op);
664
	OPENSSL_free(buf);
665 666
	return(ok);
	}
667