summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509v3/v3_alt.c
diff options
context:
space:
mode:
authorcvs2svn <admin@example.com>2015-03-08 16:48:49 +0000
committercvs2svn <admin@example.com>2015-03-08 16:48:49 +0000
commitdecf84ba5550c1656a7fdb51b5b81969590c3f03 (patch)
tree44872802e872bdfd60730fa9cf01d9d5751251c1 /src/lib/libcrypto/x509v3/v3_alt.c
parent7a8f138352aa4eb7b65ac4b1a5fe7630fbee1427 (diff)
downloadopenbsd-libressl-v2.1.5.tar.gz
openbsd-libressl-v2.1.5.tar.bz2
openbsd-libressl-v2.1.5.zip
This commit was manufactured by cvs2git to create branch 'OPENBSD_5_7'.libressl-v2.1.5
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_alt.c')
-rw-r--r--src/lib/libcrypto/x509v3/v3_alt.c646
1 files changed, 0 insertions, 646 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_alt.c b/src/lib/libcrypto/x509v3/v3_alt.c
deleted file mode 100644
index 2592288bdb..0000000000
--- a/src/lib/libcrypto/x509v3/v3_alt.c
+++ /dev/null
@@ -1,646 +0,0 @@
1/* $OpenBSD: v3_alt.c,v 1.22 2014/10/28 05:46:56 miod Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project.
4 */
5/* ====================================================================
6 * Copyright (c) 1999-2003 The OpenSSL Project. All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions
10 * are met:
11 *
12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer.
14 *
15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in
17 * the documentation and/or other materials provided with the
18 * distribution.
19 *
20 * 3. All advertising materials mentioning features or use of this
21 * software must display the following acknowledgment:
22 * "This product includes software developed by the OpenSSL Project
23 * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
24 *
25 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
26 * endorse or promote products derived from this software without
27 * prior written permission. For written permission, please contact
28 * licensing@OpenSSL.org.
29 *
30 * 5. Products derived from this software may not be called "OpenSSL"
31 * nor may "OpenSSL" appear in their names without prior written
32 * permission of the OpenSSL Project.
33 *
34 * 6. Redistributions of any form whatsoever must retain the following
35 * acknowledgment:
36 * "This product includes software developed by the OpenSSL Project
37 * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
38 *
39 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
40 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
41 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
42 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
43 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
44 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
45 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
46 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
47 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
48 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
49 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50 * OF THE POSSIBILITY OF SUCH DAMAGE.
51 * ====================================================================
52 *
53 * This product includes cryptographic software written by Eric Young
54 * (eay@cryptsoft.com). This product includes software written by Tim
55 * Hudson (tjh@cryptsoft.com).
56 *
57 */
58
59#include <stdio.h>
60#include <string.h>
61
62#include <openssl/conf.h>
63#include <openssl/err.h>
64#include <openssl/x509v3.h>
65
66static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
67 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
68static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method,
69 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
70static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p);
71static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens);
72static int do_othername(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx);
73static int do_dirname(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx);
74
75const X509V3_EXT_METHOD v3_alt[] = {
76 {
77 NID_subject_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
78 0, 0, 0, 0,
79 0, 0,
80 (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
81 (X509V3_EXT_V2I)v2i_subject_alt,
82 NULL, NULL, NULL
83 },
84 {
85 NID_issuer_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
86 0, 0, 0, 0,
87 0, 0,
88 (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
89 (X509V3_EXT_V2I)v2i_issuer_alt,
90 NULL, NULL, NULL
91 },
92 {
93 NID_certificate_issuer, 0, ASN1_ITEM_ref(GENERAL_NAMES),
94 0, 0, 0, 0,
95 0, 0,
96 (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
97 NULL, NULL, NULL, NULL
98 },
99};
100
101STACK_OF(CONF_VALUE) *
102i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method, GENERAL_NAMES *gens,
103 STACK_OF(CONF_VALUE) *ret)
104{
105 int i;
106 GENERAL_NAME *gen;
107
108 for (i = 0; i < sk_GENERAL_NAME_num(gens); i++) {
109 gen = sk_GENERAL_NAME_value(gens, i);
110 ret = i2v_GENERAL_NAME(method, gen, ret);
111 }
112 if (!ret)
113 return sk_CONF_VALUE_new_null();
114 return ret;
115}
116
117STACK_OF(CONF_VALUE) *
118i2v_GENERAL_NAME(X509V3_EXT_METHOD *method, GENERAL_NAME *gen,
119 STACK_OF(CONF_VALUE) *ret)
120{
121 unsigned char *p;
122 char oline[256], htmp[5];
123 int i;
124
125 switch (gen->type) {
126 case GEN_OTHERNAME:
127 X509V3_add_value("othername", "<unsupported>", &ret);
128 break;
129
130 case GEN_X400:
131 X509V3_add_value("X400Name", "<unsupported>", &ret);
132 break;
133
134 case GEN_EDIPARTY:
135 X509V3_add_value("EdiPartyName", "<unsupported>", &ret);
136 break;
137
138 case GEN_EMAIL:
139 X509V3_add_value_uchar("email", gen->d.ia5->data, &ret);
140 break;
141
142 case GEN_DNS:
143 X509V3_add_value_uchar("DNS", gen->d.ia5->data, &ret);
144 break;
145
146 case GEN_URI:
147 X509V3_add_value_uchar("URI", gen->d.ia5->data, &ret);
148 break;
149
150 case GEN_DIRNAME:
151 X509_NAME_oneline(gen->d.dirn, oline, 256);
152 X509V3_add_value("DirName", oline, &ret);
153 break;
154
155 case GEN_IPADD:
156 p = gen->d.ip->data;
157 if (gen->d.ip->length == 4)
158 (void) snprintf(oline, sizeof oline,
159 "%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
160 else if (gen->d.ip->length == 16) {
161 oline[0] = 0;
162 for (i = 0; i < 8; i++) {
163 (void) snprintf(htmp, sizeof htmp,
164 "%X", p[0] << 8 | p[1]);
165 p += 2;
166 strlcat(oline, htmp, sizeof(oline));
167 if (i != 7)
168 strlcat(oline, ":", sizeof(oline));
169 }
170 } else {
171 X509V3_add_value("IP Address", "<invalid>", &ret);
172 break;
173 }
174 X509V3_add_value("IP Address", oline, &ret);
175 break;
176
177 case GEN_RID:
178 i2t_ASN1_OBJECT(oline, 256, gen->d.rid);
179 X509V3_add_value("Registered ID", oline, &ret);
180 break;
181 }
182 return ret;
183}
184
185int
186GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen)
187{
188 unsigned char *p;
189 int i;
190
191 switch (gen->type) {
192 case GEN_OTHERNAME:
193 BIO_printf(out, "othername:<unsupported>");
194 break;
195
196 case GEN_X400:
197 BIO_printf(out, "X400Name:<unsupported>");
198 break;
199
200 case GEN_EDIPARTY:
201 /* Maybe fix this: it is supported now */
202 BIO_printf(out, "EdiPartyName:<unsupported>");
203 break;
204
205 case GEN_EMAIL:
206 BIO_printf(out, "email:%s", gen->d.ia5->data);
207 break;
208
209 case GEN_DNS:
210 BIO_printf(out, "DNS:%s", gen->d.ia5->data);
211 break;
212
213 case GEN_URI:
214 BIO_printf(out, "URI:%s", gen->d.ia5->data);
215 break;
216
217 case GEN_DIRNAME:
218 BIO_printf(out, "DirName: ");
219 X509_NAME_print_ex(out, gen->d.dirn, 0, XN_FLAG_ONELINE);
220 break;
221
222 case GEN_IPADD:
223 p = gen->d.ip->data;
224 if (gen->d.ip->length == 4)
225 BIO_printf(out, "IP Address:%d.%d.%d.%d",
226 p[0], p[1], p[2], p[3]);
227 else if (gen->d.ip->length == 16) {
228 BIO_printf(out, "IP Address");
229 for (i = 0; i < 8; i++) {
230 BIO_printf(out, ":%X", p[0] << 8 | p[1]);
231 p += 2;
232 }
233 BIO_puts(out, "\n");
234 } else {
235 BIO_printf(out, "IP Address:<invalid>");
236 break;
237 }
238 break;
239
240 case GEN_RID:
241 BIO_printf(out, "Registered ID");
242 i2a_ASN1_OBJECT(out, gen->d.rid);
243 break;
244 }
245 return 1;
246}
247
248static GENERAL_NAMES *
249v2i_issuer_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
250 STACK_OF(CONF_VALUE) *nval)
251{
252 GENERAL_NAMES *gens = NULL;
253 CONF_VALUE *cnf;
254 int i;
255
256 if ((gens = sk_GENERAL_NAME_new_null()) == NULL) {
257 X509V3err(X509V3_F_V2I_ISSUER_ALT, ERR_R_MALLOC_FAILURE);
258 return NULL;
259 }
260 for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
261 cnf = sk_CONF_VALUE_value(nval, i);
262 if (name_cmp(cnf->name, "issuer") == 0 && cnf->value != NULL &&
263 strcmp(cnf->value, "copy") == 0) {
264 if (!copy_issuer(ctx, gens))
265 goto err;
266 } else {
267 GENERAL_NAME *gen;
268 if ((gen = v2i_GENERAL_NAME(method, ctx, cnf)) == NULL)
269 goto err;
270 if (sk_GENERAL_NAME_push(gens, gen) == 0) {
271 GENERAL_NAME_free(gen);
272 goto err;
273 }
274 }
275 }
276 return gens;
277
278err:
279 sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
280 return NULL;
281}
282
283/* Append subject altname of issuer to issuer alt name of subject */
284
285static int
286copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens)
287{
288 GENERAL_NAMES *ialt;
289 GENERAL_NAME *gen;
290 X509_EXTENSION *ext;
291 int i;
292
293 if (ctx && (ctx->flags == CTX_TEST))
294 return 1;
295 if (!ctx || !ctx->issuer_cert) {
296 X509V3err(X509V3_F_COPY_ISSUER, X509V3_R_NO_ISSUER_DETAILS);
297 goto err;
298 }
299 i = X509_get_ext_by_NID(ctx->issuer_cert, NID_subject_alt_name, -1);
300 if (i < 0)
301 return 1;
302 if (!(ext = X509_get_ext(ctx->issuer_cert, i)) ||
303 !(ialt = X509V3_EXT_d2i(ext))) {
304 X509V3err(X509V3_F_COPY_ISSUER, X509V3_R_ISSUER_DECODE_ERROR);
305 goto err;
306 }
307
308 for (i = 0; i < sk_GENERAL_NAME_num(ialt); i++) {
309 gen = sk_GENERAL_NAME_value(ialt, i);
310 if (!sk_GENERAL_NAME_push(gens, gen)) {
311 X509V3err(X509V3_F_COPY_ISSUER, ERR_R_MALLOC_FAILURE);
312 goto err;
313 }
314 }
315 sk_GENERAL_NAME_free(ialt);
316
317 return 1;
318
319err:
320 return 0;
321
322}
323
324static GENERAL_NAMES *
325v2i_subject_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
326 STACK_OF(CONF_VALUE) *nval)
327{
328 GENERAL_NAMES *gens = NULL;
329 CONF_VALUE *cnf;
330 int i;
331
332 if (!(gens = sk_GENERAL_NAME_new_null())) {
333 X509V3err(X509V3_F_V2I_SUBJECT_ALT, ERR_R_MALLOC_FAILURE);
334 return NULL;
335 }
336 for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
337 cnf = sk_CONF_VALUE_value(nval, i);
338 if (!name_cmp(cnf->name, "email") && cnf->value &&
339 !strcmp(cnf->value, "copy")) {
340 if (!copy_email(ctx, gens, 0))
341 goto err;
342 } else if (!name_cmp(cnf->name, "email") && cnf->value &&
343 !strcmp(cnf->value, "move")) {
344 if (!copy_email(ctx, gens, 1))
345 goto err;
346 } else {
347 GENERAL_NAME *gen;
348 if (!(gen = v2i_GENERAL_NAME(method, ctx, cnf)))
349 goto err;
350 if (sk_GENERAL_NAME_push(gens, gen) == 0) {
351 GENERAL_NAME_free(gen);
352 goto err;
353 }
354 }
355 }
356 return gens;
357
358err:
359 sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
360 return NULL;
361}
362
363/* Copy any email addresses in a certificate or request to
364 * GENERAL_NAMES
365 */
366
367static int
368copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
369{
370 X509_NAME *nm;
371 ASN1_IA5STRING *email = NULL;
372 X509_NAME_ENTRY *ne;
373 GENERAL_NAME *gen = NULL;
374 int i;
375
376 if (ctx != NULL && ctx->flags == CTX_TEST)
377 return 1;
378 if (!ctx || (!ctx->subject_cert && !ctx->subject_req)) {
379 X509V3err(X509V3_F_COPY_EMAIL, X509V3_R_NO_SUBJECT_DETAILS);
380 goto err;
381 }
382 /* Find the subject name */
383 if (ctx->subject_cert)
384 nm = X509_get_subject_name(ctx->subject_cert);
385 else
386 nm = X509_REQ_get_subject_name(ctx->subject_req);
387
388 /* Now add any email address(es) to STACK */
389 i = -1;
390 while ((i = X509_NAME_get_index_by_NID(nm,
391 NID_pkcs9_emailAddress, i)) >= 0) {
392 ne = X509_NAME_get_entry(nm, i);
393 email = M_ASN1_IA5STRING_dup(X509_NAME_ENTRY_get_data(ne));
394 if (move_p) {
395 X509_NAME_delete_entry(nm, i);
396 X509_NAME_ENTRY_free(ne);
397 i--;
398 }
399 if (!email || !(gen = GENERAL_NAME_new())) {
400 X509V3err(X509V3_F_COPY_EMAIL, ERR_R_MALLOC_FAILURE);
401 goto err;
402 }
403 gen->d.ia5 = email;
404 email = NULL;
405 gen->type = GEN_EMAIL;
406 if (!sk_GENERAL_NAME_push(gens, gen)) {
407 X509V3err(X509V3_F_COPY_EMAIL, ERR_R_MALLOC_FAILURE);
408 goto err;
409 }
410 gen = NULL;
411 }
412
413 return 1;
414
415err:
416 GENERAL_NAME_free(gen);
417 M_ASN1_IA5STRING_free(email);
418 return 0;
419}
420
421GENERAL_NAMES *
422v2i_GENERAL_NAMES(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
423 STACK_OF(CONF_VALUE) *nval)
424{
425 GENERAL_NAME *gen;
426 GENERAL_NAMES *gens = NULL;
427 CONF_VALUE *cnf;
428 int i;
429
430 if (!(gens = sk_GENERAL_NAME_new_null())) {
431 X509V3err(X509V3_F_V2I_GENERAL_NAMES, ERR_R_MALLOC_FAILURE);
432 return NULL;
433 }
434 for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
435 cnf = sk_CONF_VALUE_value(nval, i);
436 if (!(gen = v2i_GENERAL_NAME(method, ctx, cnf)))
437 goto err;
438 if (sk_GENERAL_NAME_push(gens, gen) == 0) {
439 GENERAL_NAME_free(gen);
440 goto err;
441 }
442 }
443 return gens;
444
445err:
446 sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
447 return NULL;
448}
449
450GENERAL_NAME *
451v2i_GENERAL_NAME(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
452 CONF_VALUE *cnf)
453{
454 return v2i_GENERAL_NAME_ex(NULL, method, ctx, cnf, 0);
455}
456
457GENERAL_NAME *
458a2i_GENERAL_NAME(GENERAL_NAME *out, const X509V3_EXT_METHOD *method,
459 X509V3_CTX *ctx, int gen_type, char *value, int is_nc)
460{
461 char is_string = 0;
462 GENERAL_NAME *gen = NULL;
463
464 if (!value) {
465 X509V3err(X509V3_F_A2I_GENERAL_NAME, X509V3_R_MISSING_VALUE);
466 return NULL;
467 }
468
469 if (out)
470 gen = out;
471 else {
472 gen = GENERAL_NAME_new();
473 if (gen == NULL) {
474 X509V3err(X509V3_F_A2I_GENERAL_NAME,
475 ERR_R_MALLOC_FAILURE);
476 return NULL;
477 }
478 }
479
480 switch (gen_type) {
481 case GEN_URI:
482 case GEN_EMAIL:
483 case GEN_DNS:
484 is_string = 1;
485 break;
486
487 case GEN_RID:
488 {
489 ASN1_OBJECT *obj;
490 if (!(obj = OBJ_txt2obj(value, 0))) {
491 X509V3err(X509V3_F_A2I_GENERAL_NAME,
492 X509V3_R_BAD_OBJECT);
493 ERR_asprintf_error_data("value=%s", value);
494 goto err;
495 }
496 gen->d.rid = obj;
497 }
498 break;
499
500 case GEN_IPADD:
501 if (is_nc)
502 gen->d.ip = a2i_IPADDRESS_NC(value);
503 else
504 gen->d.ip = a2i_IPADDRESS(value);
505 if (gen->d.ip == NULL) {
506 X509V3err(X509V3_F_A2I_GENERAL_NAME,
507 X509V3_R_BAD_IP_ADDRESS);
508 ERR_asprintf_error_data("value=%s", value);
509 goto err;
510 }
511 break;
512
513 case GEN_DIRNAME:
514 if (!do_dirname(gen, value, ctx)) {
515 X509V3err(X509V3_F_A2I_GENERAL_NAME,
516 X509V3_R_DIRNAME_ERROR);
517 goto err;
518 }
519 break;
520
521 case GEN_OTHERNAME:
522 if (!do_othername(gen, value, ctx)) {
523 X509V3err(X509V3_F_A2I_GENERAL_NAME,
524 X509V3_R_OTHERNAME_ERROR);
525 goto err;
526 }
527 break;
528
529 default:
530 X509V3err(X509V3_F_A2I_GENERAL_NAME, X509V3_R_UNSUPPORTED_TYPE);
531 goto err;
532 }
533
534 if (is_string) {
535 if (!(gen->d.ia5 = M_ASN1_IA5STRING_new()) ||
536 !ASN1_STRING_set(gen->d.ia5, (unsigned char*)value,
537 strlen(value))) {
538 X509V3err(X509V3_F_A2I_GENERAL_NAME,
539 ERR_R_MALLOC_FAILURE);
540 goto err;
541 }
542 }
543
544 gen->type = gen_type;
545
546 return gen;
547
548err:
549 if (out == NULL)
550 GENERAL_NAME_free(gen);
551 return NULL;
552}
553
554GENERAL_NAME *
555v2i_GENERAL_NAME_ex(GENERAL_NAME *out, const X509V3_EXT_METHOD *method,
556 X509V3_CTX *ctx, CONF_VALUE *cnf, int is_nc)
557{
558 int type;
559 char *name, *value;
560
561 name = cnf->name;
562 value = cnf->value;
563
564 if (!value) {
565 X509V3err(X509V3_F_V2I_GENERAL_NAME_EX, X509V3_R_MISSING_VALUE);
566 return NULL;
567 }
568
569 if (!name_cmp(name, "email"))
570 type = GEN_EMAIL;
571 else if (!name_cmp(name, "URI"))
572 type = GEN_URI;
573 else if (!name_cmp(name, "DNS"))
574 type = GEN_DNS;
575 else if (!name_cmp(name, "RID"))
576 type = GEN_RID;
577 else if (!name_cmp(name, "IP"))
578 type = GEN_IPADD;
579 else if (!name_cmp(name, "dirName"))
580 type = GEN_DIRNAME;
581 else if (!name_cmp(name, "otherName"))
582 type = GEN_OTHERNAME;
583 else {
584 X509V3err(X509V3_F_V2I_GENERAL_NAME_EX,
585 X509V3_R_UNSUPPORTED_OPTION);
586 ERR_asprintf_error_data("name=%s", name);
587 return NULL;
588 }
589
590 return a2i_GENERAL_NAME(out, method, ctx, type, value, is_nc);
591}
592
593static int
594do_othername(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx)
595{
596 char *objtmp = NULL, *p;
597 int objlen;
598
599 if (!(p = strchr(value, ';')))
600 return 0;
601 if (!(gen->d.otherName = OTHERNAME_new()))
602 return 0;
603 /* Free this up because we will overwrite it.
604 * no need to free type_id because it is static
605 */
606 ASN1_TYPE_free(gen->d.otherName->value);
607 if (!(gen->d.otherName->value = ASN1_generate_v3(p + 1, ctx)))
608 return 0;
609 objlen = p - value;
610 objtmp = malloc(objlen + 1);
611 if (objtmp) {
612 strlcpy(objtmp, value, objlen + 1);
613 gen->d.otherName->type_id = OBJ_txt2obj(objtmp, 0);
614 free(objtmp);
615 } else
616 gen->d.otherName->type_id = NULL;
617 if (!gen->d.otherName->type_id)
618 return 0;
619 return 1;
620}
621
622static int
623do_dirname(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx)
624{
625 int ret;
626 STACK_OF(CONF_VALUE) *sk;
627 X509_NAME *nm;
628
629 if (!(nm = X509_NAME_new()))
630 return 0;
631 sk = X509V3_get_section(ctx, value);
632 if (!sk) {
633 X509V3err(X509V3_F_DO_DIRNAME, X509V3_R_SECTION_NOT_FOUND);
634 ERR_asprintf_error_data("section=%s", value);
635 X509_NAME_free(nm);
636 return 0;
637 }
638 /* FIXME: should allow other character types... */
639 ret = X509V3_NAME_from_section(nm, sk, MBSTRING_ASC);
640 if (!ret)
641 X509_NAME_free(nm);
642 gen->d.dirn = nm;
643 X509V3_section_free(ctx, sk);
644
645 return ret;
646}