]>
Commit | Line | Data |
---|---|---|
d02b48c6 | 1 | /* crypto/objects/obj_dat.c */ |
58964a49 | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
d02b48c6 RE |
3 | * All rights reserved. |
4 | * | |
5 | * This package is an SSL implementation written | |
6 | * by Eric Young (eay@cryptsoft.com). | |
7 | * The implementation was written so as to conform with Netscapes SSL. | |
8 | * | |
9 | * This library is free for commercial and non-commercial use as long as | |
10 | * the following conditions are aheared to. The following conditions | |
11 | * apply to all code found in this distribution, be it the RC4, RSA, | |
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | |
13 | * included with this distribution is covered by the same copyright terms | |
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | |
15 | * | |
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | |
17 | * the code are not to be removed. | |
18 | * If this package is used in a product, Eric Young should be given attribution | |
19 | * as the author of the parts of the library used. | |
20 | * This can be in the form of a textual message at program startup or | |
21 | * in documentation (online or textual) provided with the package. | |
22 | * | |
23 | * Redistribution and use in source and binary forms, with or without | |
24 | * modification, are permitted provided that the following conditions | |
25 | * are met: | |
26 | * 1. Redistributions of source code must retain the copyright | |
27 | * notice, this list of conditions and the following disclaimer. | |
28 | * 2. Redistributions in binary form must reproduce the above copyright | |
29 | * notice, this list of conditions and the following disclaimer in the | |
30 | * documentation and/or other materials provided with the distribution. | |
31 | * 3. All advertising materials mentioning features or use of this software | |
32 | * must display the following acknowledgement: | |
33 | * "This product includes cryptographic software written by | |
34 | * Eric Young (eay@cryptsoft.com)" | |
35 | * The word 'cryptographic' can be left out if the rouines from the library | |
36 | * being used are not cryptographic related :-). | |
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | |
38 | * the apps directory (application code) you must include an acknowledgement: | |
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | |
40 | * | |
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | |
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | |
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | |
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | |
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | |
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | |
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | |
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |
51 | * SUCH DAMAGE. | |
52 | * | |
53 | * The licence and distribution terms for any publically available version or | |
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | |
55 | * copied and put under another distribution licence | |
56 | * [including the GNU Public Licence.] | |
57 | */ | |
58 | ||
59 | #include <stdio.h> | |
58964a49 | 60 | #include <ctype.h> |
d02b48c6 | 61 | #include "cryptlib.h" |
ec577822 BM |
62 | #include <openssl/lhash.h> |
63 | #include <openssl/asn1.h> | |
64 | #include <openssl/objects.h> | |
d02b48c6 RE |
65 | |
66 | /* obj_dat.h is generated from objects.h by obj_dat.pl */ | |
dfeab068 | 67 | #ifndef NO_OBJECT |
d02b48c6 | 68 | #include "obj_dat.h" |
dfeab068 RE |
69 | #else |
70 | /* You will have to load all the objects needed manually in the application */ | |
71 | #define NUM_NID 0 | |
72 | #define NUM_SN 0 | |
73 | #define NUM_LN 0 | |
74 | #define NUM_OBJ 0 | |
75 | static unsigned char lvalues[1]; | |
76 | static ASN1_OBJECT nid_objs[1]; | |
77 | static ASN1_OBJECT *sn_objs[1]; | |
78 | static ASN1_OBJECT *ln_objs[1]; | |
79 | static ASN1_OBJECT *obj_objs[1]; | |
80 | #endif | |
d02b48c6 RE |
81 | |
82 | #ifndef NOPROTO | |
83 | static int sn_cmp(ASN1_OBJECT **a, ASN1_OBJECT **b); | |
84 | static int ln_cmp(ASN1_OBJECT **a, ASN1_OBJECT **b); | |
85 | static int obj_cmp(ASN1_OBJECT **a, ASN1_OBJECT **b); | |
86 | #else | |
87 | static int sn_cmp(); | |
88 | static int ln_cmp(); | |
89 | static int obj_cmp(); | |
90 | #endif | |
91 | ||
92 | #define ADDED_DATA 0 | |
93 | #define ADDED_SNAME 1 | |
94 | #define ADDED_LNAME 2 | |
95 | #define ADDED_NID 3 | |
96 | ||
97 | typedef struct added_obj_st | |
98 | { | |
99 | int type; | |
100 | ASN1_OBJECT *obj; | |
101 | } ADDED_OBJ; | |
102 | ||
103 | static int new_nid=NUM_NID; | |
104 | static LHASH *added=NULL; | |
105 | ||
6b691a5c | 106 | static int sn_cmp(ASN1_OBJECT **ap, ASN1_OBJECT **bp) |
d02b48c6 RE |
107 | { return(strcmp((*ap)->sn,(*bp)->sn)); } |
108 | ||
6b691a5c | 109 | static int ln_cmp(ASN1_OBJECT **ap, ASN1_OBJECT **bp) |
d02b48c6 RE |
110 | { return(strcmp((*ap)->ln,(*bp)->ln)); } |
111 | ||
6b691a5c | 112 | static unsigned long add_hash(ADDED_OBJ *ca) |
d02b48c6 RE |
113 | { |
114 | ASN1_OBJECT *a; | |
115 | int i; | |
116 | unsigned long ret=0; | |
117 | unsigned char *p; | |
118 | ||
119 | a=ca->obj; | |
120 | switch (ca->type) | |
121 | { | |
122 | case ADDED_DATA: | |
123 | ret=a->length<<20L; | |
124 | p=(unsigned char *)a->data; | |
125 | for (i=0; i<a->length; i++) | |
126 | ret^=p[i]<<((i*3)%24); | |
127 | break; | |
128 | case ADDED_SNAME: | |
129 | ret=lh_strhash(a->sn); | |
130 | break; | |
131 | case ADDED_LNAME: | |
132 | ret=lh_strhash(a->ln); | |
133 | break; | |
134 | case ADDED_NID: | |
135 | ret=a->nid; | |
136 | break; | |
137 | default: | |
138 | abort(); | |
139 | } | |
58964a49 | 140 | ret&=0x3fffffffL; |
d02b48c6 RE |
141 | ret|=ca->type<<30L; |
142 | return(ret); | |
143 | } | |
144 | ||
6b691a5c | 145 | static int add_cmp(ADDED_OBJ *ca, ADDED_OBJ *cb) |
d02b48c6 RE |
146 | { |
147 | ASN1_OBJECT *a,*b; | |
148 | int i; | |
149 | ||
150 | i=ca->type-cb->type; | |
151 | if (i) return(i); | |
152 | a=ca->obj; | |
153 | b=cb->obj; | |
154 | switch (ca->type) | |
155 | { | |
156 | case ADDED_DATA: | |
157 | i=(a->length - b->length); | |
158 | if (i) return(i); | |
159 | return(memcmp(a->data,b->data,a->length)); | |
160 | case ADDED_SNAME: | |
161 | if (a->sn == NULL) return(-1); | |
162 | else if (b->sn == NULL) return(1); | |
163 | else return(strcmp(a->sn,b->sn)); | |
164 | case ADDED_LNAME: | |
165 | if (a->ln == NULL) return(-1); | |
166 | else if (b->ln == NULL) return(1); | |
167 | else return(strcmp(a->ln,b->ln)); | |
168 | case ADDED_NID: | |
169 | return(a->nid-b->nid); | |
170 | default: | |
171 | abort(); | |
172 | } | |
dfeab068 | 173 | return(1); /* should not get here */ |
d02b48c6 RE |
174 | } |
175 | ||
6b691a5c | 176 | static int init_added(void) |
d02b48c6 RE |
177 | { |
178 | if (added != NULL) return(1); | |
179 | added=lh_new(add_hash,add_cmp); | |
180 | return(added != NULL); | |
181 | } | |
182 | ||
6b691a5c | 183 | static void cleanup1(ADDED_OBJ *a) |
d02b48c6 RE |
184 | { |
185 | a->obj->nid=0; | |
186 | a->obj->flags|=ASN1_OBJECT_FLAG_DYNAMIC| | |
dfeab068 RE |
187 | ASN1_OBJECT_FLAG_DYNAMIC_STRINGS| |
188 | ASN1_OBJECT_FLAG_DYNAMIC_DATA; | |
d02b48c6 RE |
189 | } |
190 | ||
6b691a5c | 191 | static void cleanup2(ADDED_OBJ *a) |
d02b48c6 RE |
192 | { a->obj->nid++; } |
193 | ||
6b691a5c | 194 | static void cleanup3(ADDED_OBJ *a) |
d02b48c6 RE |
195 | { |
196 | if (--a->obj->nid == 0) | |
197 | ASN1_OBJECT_free(a->obj); | |
198 | Free(a); | |
199 | } | |
200 | ||
6b691a5c | 201 | void OBJ_cleanup(void) |
d02b48c6 RE |
202 | { |
203 | if (added == NULL) return; | |
204 | added->down_load=0; | |
205 | lh_doall(added,cleanup1); /* zero counters */ | |
206 | lh_doall(added,cleanup2); /* set counters */ | |
207 | lh_doall(added,cleanup3); /* free objects */ | |
208 | lh_free(added); | |
58964a49 | 209 | added=NULL; |
d02b48c6 RE |
210 | } |
211 | ||
6b691a5c | 212 | int OBJ_new_nid(int num) |
d02b48c6 RE |
213 | { |
214 | int i; | |
215 | ||
216 | i=new_nid; | |
217 | new_nid+=num; | |
218 | return(i); | |
219 | } | |
220 | ||
6b691a5c | 221 | int OBJ_add_object(ASN1_OBJECT *obj) |
d02b48c6 RE |
222 | { |
223 | ASN1_OBJECT *o; | |
224 | ADDED_OBJ *ao[4],*aop; | |
225 | int i; | |
226 | ||
227 | if (added == NULL) | |
228 | if (!init_added()) return(0); | |
229 | if ((o=OBJ_dup(obj)) == NULL) goto err; | |
230 | ao[ADDED_DATA]=NULL; | |
231 | ao[ADDED_SNAME]=NULL; | |
232 | ao[ADDED_LNAME]=NULL; | |
233 | ao[ADDED_NID]=NULL; | |
234 | ao[ADDED_NID]=(ADDED_OBJ *)Malloc(sizeof(ADDED_OBJ)); | |
235 | if ((o->length != 0) && (obj->data != NULL)) | |
236 | ao[ADDED_DATA]=(ADDED_OBJ *)Malloc(sizeof(ADDED_OBJ)); | |
237 | if (o->sn != NULL) | |
238 | ao[ADDED_SNAME]=(ADDED_OBJ *)Malloc(sizeof(ADDED_OBJ)); | |
239 | if (o->ln != NULL) | |
240 | ao[ADDED_LNAME]=(ADDED_OBJ *)Malloc(sizeof(ADDED_OBJ)); | |
241 | ||
242 | for (i=ADDED_DATA; i<=ADDED_NID; i++) | |
243 | { | |
244 | if (ao[i] != NULL) | |
245 | { | |
246 | ao[i]->type=i; | |
247 | ao[i]->obj=o; | |
248 | aop=(ADDED_OBJ *)lh_insert(added,(char *)ao[i]); | |
249 | /* memory leak, buit should not normally matter */ | |
250 | if (aop != NULL) | |
251 | Free(aop); | |
252 | } | |
253 | } | |
dfeab068 RE |
254 | o->flags&= ~(ASN1_OBJECT_FLAG_DYNAMIC|ASN1_OBJECT_FLAG_DYNAMIC_STRINGS| |
255 | ASN1_OBJECT_FLAG_DYNAMIC_DATA); | |
256 | ||
d02b48c6 RE |
257 | return(o->nid); |
258 | err: | |
259 | for (i=ADDED_DATA; i<=ADDED_NID; i++) | |
260 | if (ao[i] != NULL) Free(ao[i]); | |
261 | if (o != NULL) Free(o); | |
58964a49 | 262 | return(NID_undef); |
d02b48c6 RE |
263 | } |
264 | ||
6b691a5c | 265 | ASN1_OBJECT *OBJ_nid2obj(int n) |
d02b48c6 RE |
266 | { |
267 | ADDED_OBJ ad,*adp; | |
268 | ASN1_OBJECT ob; | |
269 | ||
270 | if ((n >= 0) && (n < NUM_NID)) | |
271 | { | |
272 | if ((n != NID_undef) && (nid_objs[n].nid == NID_undef)) | |
273 | { | |
274 | OBJerr(OBJ_F_OBJ_NID2OBJ,OBJ_R_UNKNOWN_NID); | |
275 | return(NULL); | |
276 | } | |
277 | return((ASN1_OBJECT *)&(nid_objs[n])); | |
278 | } | |
279 | else if (added == NULL) | |
280 | return(NULL); | |
281 | else | |
282 | { | |
283 | ad.type=ADDED_NID; | |
284 | ad.obj= &ob; | |
285 | ob.nid=n; | |
286 | adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad); | |
287 | if (adp != NULL) | |
288 | return(adp->obj); | |
289 | else | |
290 | { | |
291 | OBJerr(OBJ_F_OBJ_NID2OBJ,OBJ_R_UNKNOWN_NID); | |
292 | return(NULL); | |
293 | } | |
294 | } | |
295 | } | |
296 | ||
6b691a5c | 297 | const char *OBJ_nid2sn(int n) |
d02b48c6 RE |
298 | { |
299 | ADDED_OBJ ad,*adp; | |
300 | ASN1_OBJECT ob; | |
301 | ||
302 | if ((n >= 0) && (n < NUM_NID)) | |
303 | { | |
304 | if ((n != NID_undef) && (nid_objs[n].nid == NID_undef)) | |
305 | { | |
306 | OBJerr(OBJ_F_OBJ_NID2SN,OBJ_R_UNKNOWN_NID); | |
307 | return(NULL); | |
308 | } | |
309 | return(nid_objs[n].sn); | |
310 | } | |
311 | else if (added == NULL) | |
312 | return(NULL); | |
313 | else | |
314 | { | |
315 | ad.type=ADDED_NID; | |
316 | ad.obj= &ob; | |
317 | ob.nid=n; | |
318 | adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad); | |
319 | if (adp != NULL) | |
320 | return(adp->obj->sn); | |
321 | else | |
322 | { | |
323 | OBJerr(OBJ_F_OBJ_NID2SN,OBJ_R_UNKNOWN_NID); | |
324 | return(NULL); | |
325 | } | |
326 | } | |
327 | } | |
328 | ||
6b691a5c | 329 | const char *OBJ_nid2ln(int n) |
d02b48c6 RE |
330 | { |
331 | ADDED_OBJ ad,*adp; | |
332 | ASN1_OBJECT ob; | |
333 | ||
334 | if ((n >= 0) && (n < NUM_NID)) | |
335 | { | |
336 | if ((n != NID_undef) && (nid_objs[n].nid == NID_undef)) | |
337 | { | |
338 | OBJerr(OBJ_F_OBJ_NID2LN,OBJ_R_UNKNOWN_NID); | |
339 | return(NULL); | |
340 | } | |
341 | return(nid_objs[n].ln); | |
342 | } | |
343 | else if (added == NULL) | |
344 | return(NULL); | |
345 | else | |
346 | { | |
347 | ad.type=ADDED_NID; | |
348 | ad.obj= &ob; | |
349 | ob.nid=n; | |
350 | adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad); | |
351 | if (adp != NULL) | |
352 | return(adp->obj->ln); | |
353 | else | |
354 | { | |
355 | OBJerr(OBJ_F_OBJ_NID2LN,OBJ_R_UNKNOWN_NID); | |
356 | return(NULL); | |
357 | } | |
358 | } | |
359 | } | |
360 | ||
6b691a5c | 361 | int OBJ_obj2nid(ASN1_OBJECT *a) |
d02b48c6 RE |
362 | { |
363 | ASN1_OBJECT **op; | |
364 | ADDED_OBJ ad,*adp; | |
365 | ||
366 | if (a == NULL) | |
367 | return(NID_undef); | |
368 | if (a->nid != 0) | |
369 | return(a->nid); | |
370 | ||
371 | if (added != NULL) | |
372 | { | |
373 | ad.type=ADDED_DATA; | |
374 | ad.obj=a; | |
375 | adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad); | |
376 | if (adp != NULL) return (adp->obj->nid); | |
377 | } | |
378 | op=(ASN1_OBJECT **)OBJ_bsearch((char *)&a,(char *)obj_objs,NUM_OBJ, | |
379 | sizeof(ASN1_OBJECT *),(int (*)())obj_cmp); | |
380 | if (op == NULL) | |
381 | return(NID_undef); | |
382 | return((*op)->nid); | |
383 | } | |
384 | ||
2d723902 DSH |
385 | /* Convert an object name into an ASN1_OBJECT |
386 | * if "noname" is not set then search for short and long names first. | |
387 | * This will convert the "dotted" form into an object: unlike OBJ_txt2nid | |
388 | * it can be used with any objects, not just registered ones. | |
389 | */ | |
390 | ||
6b691a5c | 391 | ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name) |
d02b48c6 | 392 | { |
2d723902 DSH |
393 | int nid = NID_undef; |
394 | ASN1_OBJECT *op=NULL; | |
395 | unsigned char *buf,*p; | |
396 | int i, j; | |
397 | ||
398 | if(!no_name) { | |
399 | if( ((nid = OBJ_sn2nid(s)) != NID_undef) || | |
400 | ((nid = OBJ_ln2nid(s)) != NID_undef) ) | |
401 | return OBJ_nid2obj(nid); | |
402 | } | |
d02b48c6 | 403 | |
2d723902 DSH |
404 | /* Work out size of content octets */ |
405 | i=a2d_ASN1_OBJECT(NULL,0,s,-1); | |
388ff0b0 DSH |
406 | if (i <= 0) { |
407 | /* Clear the error */ | |
408 | ERR_get_error(); | |
409 | return NULL; | |
410 | } | |
2d723902 DSH |
411 | /* Work out total size */ |
412 | j = ASN1_object_size(0,i,V_ASN1_OBJECT); | |
413 | ||
414 | if((buf=(unsigned char *)Malloc(j)) == NULL) return NULL; | |
415 | ||
416 | p = buf; | |
417 | /* Write out tag+length */ | |
418 | ASN1_put_object(&p,0,i,V_ASN1_OBJECT,V_ASN1_UNIVERSAL); | |
419 | /* Write out contents */ | |
420 | a2d_ASN1_OBJECT(p,i,s,-1); | |
421 | ||
422 | p=buf; | |
423 | op=d2i_ASN1_OBJECT(NULL,&p,i); | |
424 | Free(buf); | |
425 | return op; | |
d02b48c6 RE |
426 | } |
427 | ||
6b691a5c | 428 | int OBJ_txt2nid(char *s) |
2d723902 DSH |
429 | { |
430 | ASN1_OBJECT *obj; | |
431 | int nid; | |
432 | obj = OBJ_txt2obj(s, 0); | |
433 | nid = OBJ_obj2nid(obj); | |
434 | ASN1_OBJECT_free(obj); | |
435 | return nid; | |
436 | } | |
437 | ||
6b691a5c | 438 | int OBJ_ln2nid(const char *s) |
d02b48c6 RE |
439 | { |
440 | ASN1_OBJECT o,*oo= &o,**op; | |
441 | ADDED_OBJ ad,*adp; | |
442 | ||
443 | o.ln=s; | |
444 | if (added != NULL) | |
445 | { | |
446 | ad.type=ADDED_LNAME; | |
447 | ad.obj= &o; | |
448 | adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad); | |
449 | if (adp != NULL) return (adp->obj->nid); | |
450 | } | |
451 | op=(ASN1_OBJECT **)OBJ_bsearch((char *)&oo,(char *)ln_objs,NUM_LN, | |
452 | sizeof(ASN1_OBJECT *),(int (*)())ln_cmp); | |
453 | if (op == NULL) return(NID_undef); | |
454 | return((*op)->nid); | |
455 | } | |
456 | ||
6b691a5c | 457 | int OBJ_sn2nid(const char *s) |
d02b48c6 RE |
458 | { |
459 | ASN1_OBJECT o,*oo= &o,**op; | |
460 | ADDED_OBJ ad,*adp; | |
461 | ||
462 | o.sn=s; | |
463 | if (added != NULL) | |
464 | { | |
465 | ad.type=ADDED_SNAME; | |
466 | ad.obj= &o; | |
467 | adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad); | |
468 | if (adp != NULL) return (adp->obj->nid); | |
469 | } | |
470 | op=(ASN1_OBJECT **)OBJ_bsearch((char *)&oo,(char *)sn_objs,NUM_SN, | |
471 | sizeof(ASN1_OBJECT *),(int (*)())sn_cmp); | |
472 | if (op == NULL) return(NID_undef); | |
473 | return((*op)->nid); | |
474 | } | |
475 | ||
6b691a5c | 476 | static int obj_cmp(ASN1_OBJECT **ap, ASN1_OBJECT **bp) |
d02b48c6 RE |
477 | { |
478 | int j; | |
479 | ASN1_OBJECT *a= *ap; | |
480 | ASN1_OBJECT *b= *bp; | |
481 | ||
482 | j=(a->length - b->length); | |
483 | if (j) return(j); | |
484 | return(memcmp(a->data,b->data,a->length)); | |
485 | } | |
486 | ||
6b691a5c | 487 | char *OBJ_bsearch(char *key, char *base, int num, int size, int (*cmp)()) |
d02b48c6 RE |
488 | { |
489 | int l,h,i,c; | |
490 | char *p; | |
491 | ||
492 | if (num == 0) return(NULL); | |
493 | l=0; | |
494 | h=num; | |
495 | while (l < h) | |
496 | { | |
497 | i=(l+h)/2; | |
498 | p= &(base[i*size]); | |
499 | c=(*cmp)(key,p); | |
500 | if (c < 0) | |
501 | h=i; | |
502 | else if (c > 0) | |
503 | l=i+1; | |
504 | else | |
505 | return(p); | |
506 | } | |
507 | return(NULL); | |
508 | } | |
509 | ||
6b691a5c | 510 | int OBJ_create_objects(BIO *in) |
58964a49 RE |
511 | { |
512 | MS_STATIC char buf[512]; | |
dfeab068 | 513 | int i,num=0; |
58964a49 RE |
514 | char *o,*s,*l=NULL; |
515 | ||
516 | for (;;) | |
517 | { | |
518 | s=o=NULL; | |
519 | i=BIO_gets(in,buf,512); | |
520 | if (i <= 0) return(num); | |
521 | buf[i-1]='\0'; | |
522 | if (!isalnum(buf[0])) return(num); | |
523 | o=s=buf; | |
524 | while (isdigit(*s) || (*s == '.')) | |
525 | s++; | |
526 | if (*s != '\0') | |
527 | { | |
528 | *(s++)='\0'; | |
529 | while (isspace(*s)) | |
530 | s++; | |
531 | if (*s == '\0') | |
532 | s=NULL; | |
533 | else | |
534 | { | |
535 | l=s; | |
536 | while ((*l != '\0') && !isspace(*l)) | |
537 | l++; | |
538 | if (*l != '\0') | |
539 | { | |
540 | *(l++)='\0'; | |
541 | while (isspace(*l)) | |
542 | l++; | |
543 | if (*l == '\0') l=NULL; | |
544 | } | |
545 | else | |
546 | l=NULL; | |
547 | } | |
548 | } | |
549 | else | |
550 | s=NULL; | |
551 | if ((o == NULL) || (*o == '\0')) return(num); | |
552 | if (!OBJ_create(o,s,l)) return(num); | |
553 | num++; | |
554 | } | |
dfeab068 | 555 | /* return(num); */ |
58964a49 RE |
556 | } |
557 | ||
6b691a5c | 558 | int OBJ_create(char *oid, char *sn, char *ln) |
d02b48c6 RE |
559 | { |
560 | int ok=0; | |
561 | ASN1_OBJECT *op=NULL; | |
562 | unsigned char *buf; | |
563 | int i; | |
564 | ||
565 | i=a2d_ASN1_OBJECT(NULL,0,oid,-1); | |
566 | if (i <= 0) return(0); | |
567 | ||
568 | if ((buf=(unsigned char *)Malloc(i)) == NULL) | |
569 | { | |
58964a49 | 570 | OBJerr(OBJ_F_OBJ_CREATE,OBJ_R_MALLOC_FAILURE); |
d02b48c6 RE |
571 | return(0); |
572 | } | |
573 | i=a2d_ASN1_OBJECT(buf,i,oid,-1); | |
574 | op=(ASN1_OBJECT *)ASN1_OBJECT_create(OBJ_new_nid(1),buf,i,sn,ln); | |
575 | if (op == NULL) | |
576 | goto err; | |
577 | ok=OBJ_add_object(op); | |
578 | err: | |
579 | ASN1_OBJECT_free(op); | |
580 | Free((char *)buf); | |
581 | return(ok); | |
582 | } | |
58964a49 | 583 |