v3_alt.c 17.3 KB
Newer Older
1
/*
H
HJ 已提交
2
 * Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
3
 *
R
Rich Salz 已提交
4 5 6 7
 * Licensed under the OpenSSL license (the "License").  You may not use
 * this file except in compliance with the License.  You can obtain a copy
 * in the file LICENSE in the source distribution or at
 * https://www.openssl.org/source/license.html
8 9 10
 */

#include <stdio.h>
11
#include "internal/cryptlib.h"
12
#include "crypto/x509.h"
13 14
#include <openssl/conf.h>
#include <openssl/x509v3.h>
15
#include "ext_dat.h"
16

17 18 19 20 21 22
static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
                                      X509V3_CTX *ctx,
                                      STACK_OF(CONF_VALUE) *nval);
static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method,
                                     X509V3_CTX *ctx,
                                     STACK_OF(CONF_VALUE) *nval);
23
static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p);
D
 
Dr. Stephen Henson 已提交
24
static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens);
25 26
static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx);
static int do_dirname(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx);
D
 
Dr. Stephen Henson 已提交
27

K
Kurt Roeckx 已提交
28
const X509V3_EXT_METHOD v3_alt[3] = {
29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
    {NID_subject_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
     0, 0, 0, 0,
     0, 0,
     (X509V3_EXT_I2V) i2v_GENERAL_NAMES,
     (X509V3_EXT_V2I)v2i_subject_alt,
     NULL, NULL, NULL},

    {NID_issuer_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
     0, 0, 0, 0,
     0, 0,
     (X509V3_EXT_I2V) i2v_GENERAL_NAMES,
     (X509V3_EXT_V2I)v2i_issuer_alt,
     NULL, NULL, NULL},

    {NID_certificate_issuer, 0, ASN1_ITEM_ref(GENERAL_NAMES),
     0, 0, 0, 0,
     0, 0,
     (X509V3_EXT_I2V) i2v_GENERAL_NAMES,
     NULL, NULL, NULL, NULL},
48 49
};

50
STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method,
51 52
                                        GENERAL_NAMES *gens,
                                        STACK_OF(CONF_VALUE) *ret)
53
{
54 55
    int i;
    GENERAL_NAME *gen;
56 57
    STACK_OF(CONF_VALUE) *tmpret = NULL, *origret = ret;

58 59
    for (i = 0; i < sk_GENERAL_NAME_num(gens); i++) {
        gen = sk_GENERAL_NAME_value(gens, i);
60 61 62 63 64 65 66 67 68 69 70 71
        /*
         * i2v_GENERAL_NAME allocates ret if it is NULL. If something goes
         * wrong we need to free the stack - but only if it was empty when we
         * originally entered this function.
         */
        tmpret = i2v_GENERAL_NAME(method, gen, ret);
        if (tmpret == NULL) {
            if (origret == NULL)
                sk_CONF_VALUE_pop_free(ret, X509V3_conf_free);
            return NULL;
        }
        ret = tmpret;
72
    }
73
    if (ret == NULL)
74 75
        return sk_CONF_VALUE_new_null();
    return ret;
76 77
}

78
STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
79 80
                                       GENERAL_NAME *gen,
                                       STACK_OF(CONF_VALUE) *ret)
81
{
82 83 84
    unsigned char *p;
    char oline[256], htmp[5];
    int i;
F
FdaSilvaYY 已提交
85

86 87
    switch (gen->type) {
    case GEN_OTHERNAME:
88 89
        if (!X509V3_add_value("othername", "<unsupported>", &ret))
            return NULL;
90 91 92
        break;

    case GEN_X400:
93 94
        if (!X509V3_add_value("X400Name", "<unsupported>", &ret))
            return NULL;
95 96 97
        break;

    case GEN_EDIPARTY:
98 99
        if (!X509V3_add_value("EdiPartyName", "<unsupported>", &ret))
            return NULL;
100 101 102
        break;

    case GEN_EMAIL:
103 104
        if (!x509v3_add_len_value_uchar("email", gen->d.ia5->data,
                                        gen->d.ia5->length, &ret))
105
            return NULL;
106 107 108
        break;

    case GEN_DNS:
109 110
        if (!x509v3_add_len_value_uchar("DNS", gen->d.ia5->data,
                                        gen->d.ia5->length, &ret))
111
            return NULL;
112 113 114
        break;

    case GEN_URI:
115 116
        if (!x509v3_add_len_value_uchar("URI", gen->d.ia5->data,
                                        gen->d.ia5->length, &ret))
117
            return NULL;
118 119 120
        break;

    case GEN_DIRNAME:
F
FdaSilvaYY 已提交
121
        if (X509_NAME_oneline(gen->d.dirn, oline, sizeof(oline)) == NULL
122 123
                || !X509V3_add_value("DirName", oline, &ret))
            return NULL;
124 125 126 127 128
        break;

    case GEN_IPADD:
        p = gen->d.ip->data;
        if (gen->d.ip->length == 4)
P
Pauli 已提交
129 130
            BIO_snprintf(oline, sizeof(oline), "%d.%d.%d.%d",
                         p[0], p[1], p[2], p[3]);
131 132 133
        else if (gen->d.ip->length == 16) {
            oline[0] = 0;
            for (i = 0; i < 8; i++) {
P
Pauli 已提交
134
                BIO_snprintf(htmp, sizeof(htmp), "%X", p[0] << 8 | p[1]);
135 136 137 138 139 140
                p += 2;
                strcat(oline, htmp);
                if (i != 7)
                    strcat(oline, ":");
            }
        } else {
141 142
            if (!X509V3_add_value("IP Address", "<invalid>", &ret))
                return NULL;
143 144
            break;
        }
145 146
        if (!X509V3_add_value("IP Address", oline, &ret))
            return NULL;
147 148 149 150
        break;

    case GEN_RID:
        i2t_ASN1_OBJECT(oline, 256, gen->d.rid);
151 152
        if (!X509V3_add_value("Registered ID", oline, &ret))
            return NULL;
153 154 155
        break;
    }
    return ret;
156 157 158 159
}

int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen)
{
160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176
    unsigned char *p;
    int i;
    switch (gen->type) {
    case GEN_OTHERNAME:
        BIO_printf(out, "othername:<unsupported>");
        break;

    case GEN_X400:
        BIO_printf(out, "X400Name:<unsupported>");
        break;

    case GEN_EDIPARTY:
        /* Maybe fix this: it is supported now */
        BIO_printf(out, "EdiPartyName:<unsupported>");
        break;

    case GEN_EMAIL:
177 178
        BIO_printf(out, "email:");
        ASN1_STRING_print(out, gen->d.ia5);
179 180 181
        break;

    case GEN_DNS:
182 183
        BIO_printf(out, "DNS:");
        ASN1_STRING_print(out, gen->d.ia5);
184 185 186
        break;

    case GEN_URI:
187 188
        BIO_printf(out, "URI:");
        ASN1_STRING_print(out, gen->d.ia5);
189 190 191
        break;

    case GEN_DIRNAME:
192
        BIO_printf(out, "DirName:");
193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213
        X509_NAME_print_ex(out, gen->d.dirn, 0, XN_FLAG_ONELINE);
        break;

    case GEN_IPADD:
        p = gen->d.ip->data;
        if (gen->d.ip->length == 4)
            BIO_printf(out, "IP Address:%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
        else if (gen->d.ip->length == 16) {
            BIO_printf(out, "IP Address");
            for (i = 0; i < 8; i++) {
                BIO_printf(out, ":%X", p[0] << 8 | p[1]);
                p += 2;
            }
            BIO_puts(out, "\n");
        } else {
            BIO_printf(out, "IP Address:<invalid>");
            break;
        }
        break;

    case GEN_RID:
214
        BIO_printf(out, "Registered ID:");
215 216 217 218
        i2a_ASN1_OBJECT(out, gen->d.rid);
        break;
    }
    return 1;
219 220
}

D
 
Dr. Stephen Henson 已提交
221
static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method,
222 223
                                     X509V3_CTX *ctx,
                                     STACK_OF(CONF_VALUE) *nval)
224
{
F
FdaSilvaYY 已提交
225
    const int num = sk_CONF_VALUE_num(nval);
P
Paul Yang 已提交
226
    GENERAL_NAMES *gens = sk_GENERAL_NAME_new_reserve(NULL, num);
227
    int i;
228

P
Paul Yang 已提交
229
    if (gens == NULL) {
230
        X509V3err(X509V3_F_V2I_ISSUER_ALT, ERR_R_MALLOC_FAILURE);
F
FdaSilvaYY 已提交
231
        sk_GENERAL_NAME_free(gens);
232 233
        return NULL;
    }
F
FdaSilvaYY 已提交
234 235 236
    for (i = 0; i < num; i++) {
        CONF_VALUE *cnf = sk_CONF_VALUE_value(nval, i);

R
Rich Salz 已提交
237 238
        if (!name_cmp(cnf->name, "issuer")
            && cnf->value && strcmp(cnf->value, "copy") == 0) {
239 240 241
            if (!copy_issuer(ctx, gens))
                goto err;
        } else {
F
FdaSilvaYY 已提交
242 243 244
            GENERAL_NAME *gen = v2i_GENERAL_NAME(method, ctx, cnf);

            if (gen == NULL)
245
                goto err;
F
FdaSilvaYY 已提交
246
            sk_GENERAL_NAME_push(gens, gen); /* no failure as it was reserved */
247 248 249 250 251 252
        }
    }
    return gens;
 err:
    sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
    return NULL;
253 254 255 256
}

/* Append subject altname of issuer to issuer alt name of subject */

D
 
Dr. Stephen Henson 已提交
257
static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens)
258
{
259 260 261
    GENERAL_NAMES *ialt;
    GENERAL_NAME *gen;
    X509_EXTENSION *ext;
F
FdaSilvaYY 已提交
262
    int i, num;
263

264 265 266 267 268 269 270 271 272
    if (ctx && (ctx->flags == CTX_TEST))
        return 1;
    if (!ctx || !ctx->issuer_cert) {
        X509V3err(X509V3_F_COPY_ISSUER, X509V3_R_NO_ISSUER_DETAILS);
        goto err;
    }
    i = X509_get_ext_by_NID(ctx->issuer_cert, NID_subject_alt_name, -1);
    if (i < 0)
        return 1;
273 274
    if ((ext = X509_get_ext(ctx->issuer_cert, i)) == NULL
        || (ialt = X509V3_EXT_d2i(ext)) == NULL) {
275 276 277 278
        X509V3err(X509V3_F_COPY_ISSUER, X509V3_R_ISSUER_DECODE_ERROR);
        goto err;
    }

F
FdaSilvaYY 已提交
279 280 281
    num = sk_GENERAL_NAME_num(ialt);
    if (!sk_GENERAL_NAME_reserve(gens, num)) {
        X509V3err(X509V3_F_COPY_ISSUER, ERR_R_MALLOC_FAILURE);
H
HJ 已提交
282
        sk_GENERAL_NAME_free(ialt);
F
FdaSilvaYY 已提交
283 284 285 286
        goto err;
    }

    for (i = 0; i < num; i++) {
287
        gen = sk_GENERAL_NAME_value(ialt, i);
F
FdaSilvaYY 已提交
288
        sk_GENERAL_NAME_push(gens, gen);     /* no failure as it was reserved */
289 290 291 292 293 294 295 296
    }
    sk_GENERAL_NAME_free(ialt);

    return 1;

 err:
    return 0;

297 298
}

D
 
Dr. Stephen Henson 已提交
299
static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
300 301
                                      X509V3_CTX *ctx,
                                      STACK_OF(CONF_VALUE) *nval)
302
{
F
FdaSilvaYY 已提交
303
    GENERAL_NAMES *gens;
304
    CONF_VALUE *cnf;
F
FdaSilvaYY 已提交
305
    const int num = sk_CONF_VALUE_num(nval);
306
    int i;
307

P
Paul Yang 已提交
308 309
    gens = sk_GENERAL_NAME_new_reserve(NULL, num);
    if (gens == NULL) {
310
        X509V3err(X509V3_F_V2I_SUBJECT_ALT, ERR_R_MALLOC_FAILURE);
F
FdaSilvaYY 已提交
311
        sk_GENERAL_NAME_free(gens);
312 313
        return NULL;
    }
F
FdaSilvaYY 已提交
314 315

    for (i = 0; i < num; i++) {
316
        cnf = sk_CONF_VALUE_value(nval, i);
R
Rich Salz 已提交
317 318
        if (!name_cmp(cnf->name, "email")
            && cnf->value && strcmp(cnf->value, "copy") == 0) {
319 320
            if (!copy_email(ctx, gens, 0))
                goto err;
R
Rich Salz 已提交
321 322
        } else if (!name_cmp(cnf->name, "email")
                   && cnf->value && strcmp(cnf->value, "move") == 0) {
323 324 325 326
            if (!copy_email(ctx, gens, 1))
                goto err;
        } else {
            GENERAL_NAME *gen;
327
            if ((gen = v2i_GENERAL_NAME(method, ctx, cnf)) == NULL)
328
                goto err;
F
FdaSilvaYY 已提交
329
            sk_GENERAL_NAME_push(gens, gen); /* no failure as it was reserved */
330 331 332 333 334 335
        }
    }
    return gens;
 err:
    sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
    return NULL;
336 337
}

338 339
/*
 * Copy any email addresses in a certificate or request to GENERAL_NAMES
340 341
 */

342
static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
343
{
344 345 346 347
    X509_NAME *nm;
    ASN1_IA5STRING *email = NULL;
    X509_NAME_ENTRY *ne;
    GENERAL_NAME *gen = NULL;
F
FdaSilvaYY 已提交
348 349
    int i = -1;

350 351
    if (ctx != NULL && ctx->flags == CTX_TEST)
        return 1;
352
    if (ctx == NULL
F
FdaSilvaYY 已提交
353
        || (ctx->subject_cert == NULL && ctx->subject_req == NULL)) {
354 355 356 357 358 359 360 361 362 363 364 365 366
        X509V3err(X509V3_F_COPY_EMAIL, X509V3_R_NO_SUBJECT_DETAILS);
        goto err;
    }
    /* Find the subject name */
    if (ctx->subject_cert)
        nm = X509_get_subject_name(ctx->subject_cert);
    else
        nm = X509_REQ_get_subject_name(ctx->subject_req);

    /* Now add any email address(es) to STACK */
    while ((i = X509_NAME_get_index_by_NID(nm,
                                           NID_pkcs9_emailAddress, i)) >= 0) {
        ne = X509_NAME_get_entry(nm, i);
D
Dr. Stephen Henson 已提交
367
        email = ASN1_STRING_dup(X509_NAME_ENTRY_get_data(ne));
368 369 370 371 372
        if (move_p) {
            X509_NAME_delete_entry(nm, i);
            X509_NAME_ENTRY_free(ne);
            i--;
        }
373
        if (email == NULL || (gen = GENERAL_NAME_new()) == NULL) {
374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390
            X509V3err(X509V3_F_COPY_EMAIL, ERR_R_MALLOC_FAILURE);
            goto err;
        }
        gen->d.ia5 = email;
        email = NULL;
        gen->type = GEN_EMAIL;
        if (!sk_GENERAL_NAME_push(gens, gen)) {
            X509V3err(X509V3_F_COPY_EMAIL, ERR_R_MALLOC_FAILURE);
            goto err;
        }
        gen = NULL;
    }

    return 1;

 err:
    GENERAL_NAME_free(gen);
D
Dr. Stephen Henson 已提交
391
    ASN1_IA5STRING_free(email);
392 393
    return 0;

394 395
}

396
GENERAL_NAMES *v2i_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
397
                                 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
398
{
399
    GENERAL_NAME *gen;
F
FdaSilvaYY 已提交
400
    GENERAL_NAMES *gens;
401
    CONF_VALUE *cnf;
F
FdaSilvaYY 已提交
402
    const int num = sk_CONF_VALUE_num(nval);
403
    int i;
404

P
Paul Yang 已提交
405 406
    gens = sk_GENERAL_NAME_new_reserve(NULL, num);
    if (gens == NULL) {
407
        X509V3err(X509V3_F_V2I_GENERAL_NAMES, ERR_R_MALLOC_FAILURE);
F
FdaSilvaYY 已提交
408
        sk_GENERAL_NAME_free(gens);
409 410
        return NULL;
    }
F
FdaSilvaYY 已提交
411 412

    for (i = 0; i < num; i++) {
413
        cnf = sk_CONF_VALUE_value(nval, i);
414
        if ((gen = v2i_GENERAL_NAME(method, ctx, cnf)) == NULL)
415
            goto err;
F
FdaSilvaYY 已提交
416
        sk_GENERAL_NAME_push(gens, gen);    /* no failure as it was reserved */
417 418 419 420 421
    }
    return gens;
 err:
    sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
    return NULL;
422 423
}

424 425 426 427 428
GENERAL_NAME *v2i_GENERAL_NAME(const X509V3_EXT_METHOD *method,
                               X509V3_CTX *ctx, CONF_VALUE *cnf)
{
    return v2i_GENERAL_NAME_ex(NULL, method, ctx, cnf, 0);
}
429

430
GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
431
                               const X509V3_EXT_METHOD *method,
432
                               X509V3_CTX *ctx, int gen_type, const char *value,
433 434 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
                               int is_nc)
{
    char is_string = 0;
    GENERAL_NAME *gen = NULL;

    if (!value) {
        X509V3err(X509V3_F_A2I_GENERAL_NAME, X509V3_R_MISSING_VALUE);
        return NULL;
    }

    if (out)
        gen = out;
    else {
        gen = GENERAL_NAME_new();
        if (gen == NULL) {
            X509V3err(X509V3_F_A2I_GENERAL_NAME, ERR_R_MALLOC_FAILURE);
            return NULL;
        }
    }

    switch (gen_type) {
    case GEN_URI:
    case GEN_EMAIL:
    case GEN_DNS:
        is_string = 1;
        break;

    case GEN_RID:
        {
            ASN1_OBJECT *obj;
463
            if ((obj = OBJ_txt2obj(value, 0)) == NULL) {
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 500 501 502
                X509V3err(X509V3_F_A2I_GENERAL_NAME, X509V3_R_BAD_OBJECT);
                ERR_add_error_data(2, "value=", value);
                goto err;
            }
            gen->d.rid = obj;
        }
        break;

    case GEN_IPADD:
        if (is_nc)
            gen->d.ip = a2i_IPADDRESS_NC(value);
        else
            gen->d.ip = a2i_IPADDRESS(value);
        if (gen->d.ip == NULL) {
            X509V3err(X509V3_F_A2I_GENERAL_NAME, X509V3_R_BAD_IP_ADDRESS);
            ERR_add_error_data(2, "value=", value);
            goto err;
        }
        break;

    case GEN_DIRNAME:
        if (!do_dirname(gen, value, ctx)) {
            X509V3err(X509V3_F_A2I_GENERAL_NAME, X509V3_R_DIRNAME_ERROR);
            goto err;
        }
        break;

    case GEN_OTHERNAME:
        if (!do_othername(gen, value, ctx)) {
            X509V3err(X509V3_F_A2I_GENERAL_NAME, X509V3_R_OTHERNAME_ERROR);
            goto err;
        }
        break;
    default:
        X509V3err(X509V3_F_A2I_GENERAL_NAME, X509V3_R_UNSUPPORTED_TYPE);
        goto err;
    }

    if (is_string) {
503
        if ((gen->d.ia5 = ASN1_IA5STRING_new()) == NULL ||
504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519
            !ASN1_STRING_set(gen->d.ia5, (unsigned char *)value,
                             strlen(value))) {
            X509V3err(X509V3_F_A2I_GENERAL_NAME, ERR_R_MALLOC_FAILURE);
            goto err;
        }
    }

    gen->type = gen_type;

    return gen;

 err:
    if (!out)
        GENERAL_NAME_free(gen);
    return NULL;
}
D
 
Dr. Stephen Henson 已提交
520

521
GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559
                                  const X509V3_EXT_METHOD *method,
                                  X509V3_CTX *ctx, CONF_VALUE *cnf, int is_nc)
{
    int type;

    char *name, *value;

    name = cnf->name;
    value = cnf->value;

    if (!value) {
        X509V3err(X509V3_F_V2I_GENERAL_NAME_EX, X509V3_R_MISSING_VALUE);
        return NULL;
    }

    if (!name_cmp(name, "email"))
        type = GEN_EMAIL;
    else if (!name_cmp(name, "URI"))
        type = GEN_URI;
    else if (!name_cmp(name, "DNS"))
        type = GEN_DNS;
    else if (!name_cmp(name, "RID"))
        type = GEN_RID;
    else if (!name_cmp(name, "IP"))
        type = GEN_IPADD;
    else if (!name_cmp(name, "dirName"))
        type = GEN_DIRNAME;
    else if (!name_cmp(name, "otherName"))
        type = GEN_OTHERNAME;
    else {
        X509V3err(X509V3_F_V2I_GENERAL_NAME_EX, X509V3_R_UNSUPPORTED_OPTION);
        ERR_add_error_data(2, "name=", name);
        return NULL;
    }

    return a2i_GENERAL_NAME(out, method, ctx, type, value, is_nc);

}
560

561
static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx)
562 563 564
{
    char *objtmp = NULL, *p;
    int objlen;
565 566

    if ((p = strchr(value, ';')) == NULL)
567
        return 0;
568
    if ((gen->d.otherName = OTHERNAME_new()) == NULL)
569 570 571 572 573 574
        return 0;
    /*
     * Free this up because we will overwrite it. no need to free type_id
     * because it is static
     */
    ASN1_TYPE_free(gen->d.otherName->value);
575
    if ((gen->d.otherName->value = ASN1_generate_v3(p + 1, ctx)) == NULL)
576 577
        return 0;
    objlen = p - value;
D
Dmitry-Me 已提交
578
    objtmp = OPENSSL_strndup(value, objlen);
579 580 581 582 583 584 585 586
    if (objtmp == NULL)
        return 0;
    gen->d.otherName->type_id = OBJ_txt2obj(objtmp, 0);
    OPENSSL_free(objtmp);
    if (!gen->d.otherName->type_id)
        return 0;
    return 1;
}
587

588
static int do_dirname(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx)
589
{
590 591
    int ret = 0;
    STACK_OF(CONF_VALUE) *sk = NULL;
592 593 594
    X509_NAME *nm;

    if ((nm = X509_NAME_new()) == NULL)
595
        goto err;
596 597 598 599
    sk = X509V3_get_section(ctx, value);
    if (!sk) {
        X509V3err(X509V3_F_DO_DIRNAME, X509V3_R_SECTION_NOT_FOUND);
        ERR_add_error_data(2, "section=", value);
600
        goto err;
601 602 603 604
    }
    /* FIXME: should allow other character types... */
    ret = X509V3_NAME_from_section(nm, sk, MBSTRING_ASC);
    if (!ret)
605
        goto err;
606 607
    gen->d.dirn = nm;

608 609 610 611
err:
    if (ret == 0)
        X509_NAME_free(nm);
    X509V3_section_free(ctx, sk);
612 613
    return ret;
}