obj_dat.c 15.6 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 OPENSSL_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 180
		}
	}

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

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

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

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

206 207 208 209
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 已提交
210
void OBJ_cleanup(void)
211 212 213
	{
	if (added == NULL) return;
	added->down_load=0;
214 215 216
	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 */
217
	lh_free(added);
218
	added=NULL;
219 220
	}

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

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

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

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

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

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

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

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

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

366
int OBJ_obj2nid(const ASN1_OBJECT *a)
367 368 369 370 371 372 373 374 375 376 377 378
	{
	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;
379
		ad.obj=(ASN1_OBJECT *)a; /* XXX: ugly but harmless */
380
		adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
381 382 383
		if (adp != NULL) return (adp->obj->nid);
		}
	op=(ASN1_OBJECT **)OBJ_bsearch((char *)&a,(char *)obj_objs,NUM_OBJ,
D
 
Dr. Stephen Henson 已提交
384
		sizeof(ASN1_OBJECT *),obj_cmp);
385 386 387 388 389
	if (op == NULL)
		return(NID_undef);
	return((*op)->nid);
	}

390 391 392 393 394 395
/* 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 已提交
396
ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name)
397
	{
398 399 400 401 402 403 404 405 406 407
	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);
	}
408

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

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

	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;
D
 
Dr. Stephen Henson 已提交
428
	op=d2i_ASN1_OBJECT(NULL,&p,j);
429
	OPENSSL_free(buf);
430
	return op;
431 432
	}

433
int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
D
Dr. Stephen Henson 已提交
434 435 436 437 438
{
	int i,idx=0,n=0,len,nid;
	unsigned long l;
	unsigned char *p;
	const char *s;
439
	char tbuf[DECIMAL_SIZE(i)+DECIMAL_SIZE(l)+2];
D
Dr. Stephen Henson 已提交
440 441 442 443 444 445 446 447

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

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

448
	if (no_name || (nid=OBJ_obj2nid(a)) == NID_undef) {
D
Dr. Stephen Henson 已提交
449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466
		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);
467
		BUF_strlcpy(buf,tbuf,buf_len);
D
Dr. Stephen Henson 已提交
468 469 470 471 472 473 474 475 476 477 478
		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)
479
					BUF_strlcpy(buf,tbuf,buf_len);
D
Dr. Stephen Henson 已提交
480 481 482 483 484 485 486 487 488 489 490
				buf_len-=i;
				buf+=i;
				n+=i;
				l=0;
			}
			l<<=7L;
		}
	} else {
		s=OBJ_nid2ln(nid);
		if (s == NULL)
			s=OBJ_nid2sn(nid);
491
		BUF_strlcpy(buf,s,buf_len);
D
Dr. Stephen Henson 已提交
492 493 494 495 496
		n=strlen(s);
	}
	return(n);
}

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

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

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

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

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

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

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

556 557
const char *OBJ_bsearch(const char *key, const char *base, int num, int size,
	int (*cmp)(const void *, const void *))
558
	{
559 560 561 562 563 564
	return OBJ_bsearch_ex(key, base, num, size, cmp, 0);
	}

const char *OBJ_bsearch_ex(const char *key, const char *base, int num,
	int size, int (*cmp)(const void *, const void *), int flags)
	{
565
	int l,h,i,c;
566
	const char *p = NULL;
567 568 569 570 571 572 573 574 575 576 577 578 579 580

	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
581
			break;
582
		}
583 584 585 586 587
#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.
 */
588 589 590 591 592 593 594 595 596 597
	if (c != 0)
		{
		for (i=0; i<num; ++i)
			{
			p= &(base[i*size]);
			c = (*cmp)(key,p);
			if (c == 0 || (c < 0 && (flags & OBJ_BSEARCH_VALUE_ON_NOMATCH)))
				return p;
			}
		}
598
#endif
599 600 601 602 603 604 605 606 607
	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)
			i--;
		p = &(base[i*size]);
		}
	return(p);
608 609
	}

U
Ulf Möller 已提交
610
int OBJ_create_objects(BIO *in)
611 612
	{
	MS_STATIC char buf[512];
613
	int i,num=0;
614 615 616 617 618 619 620 621
	char *o,*s,*l=NULL;

	for (;;)
		{
		s=o=NULL;
		i=BIO_gets(in,buf,512);
		if (i <= 0) return(num);
		buf[i-1]='\0';
622
		if (!isalnum((unsigned char)buf[0])) return(num);
623
		o=s=buf;
624
		while (isdigit((unsigned char)*s) || (*s == '.'))
625 626 627 628
			s++;
		if (*s != '\0')
			{
			*(s++)='\0';
629
			while (isspace((unsigned char)*s))
630 631 632 633 634 635
				s++;
			if (*s == '\0')
				s=NULL;
			else
				{
				l=s;
636
				while ((*l != '\0') && !isspace((unsigned char)*l))
637 638 639 640
					l++;
				if (*l != '\0')
					{
					*(l++)='\0';
641
					while (isspace((unsigned char)*l))
642 643 644 645 646 647 648 649 650 651 652 653 654
						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++;
		}
655
	/* return(num); */
656 657
	}

658
int OBJ_create(const char *oid, const char *sn, const char *ln)
659 660 661 662 663 664 665 666 667
	{
	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);

668
	if ((buf=(unsigned char *)OPENSSL_malloc(i)) == NULL)
669
		{
670
		OBJerr(OBJ_F_OBJ_CREATE,OBJ_R_MALLOC_FAILURE);
671 672 673
		return(0);
		}
	i=a2d_ASN1_OBJECT(buf,i,oid,-1);
674 675
	if (i == 0)
		goto err;
676 677 678 679 680 681
	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);
682
	OPENSSL_free(buf);
683 684
	return(ok);
	}
685