v3_alt.c 17.1 KB
Newer Older
1
/*
M
Matt Caswell 已提交
2
 * Copyright 1999-2019 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 13
#include <openssl/conf.h>
#include <openssl/x509v3.h>
14
#include "ext_dat.h"
15

16 17 18 19 20 21
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);
22
static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p);
D
 
Dr. Stephen Henson 已提交
23
static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens);
24 25
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 已提交
26

K
Kurt Roeckx 已提交
27
const X509V3_EXT_METHOD v3_alt[3] = {
28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
    {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},
47 48
};

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

57 58
    for (i = 0; i < sk_GENERAL_NAME_num(gens); i++) {
        gen = sk_GENERAL_NAME_value(gens, i);
59 60 61 62 63 64 65 66 67 68 69 70
        /*
         * 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;
71
    }
72
    if (ret == NULL)
73 74
        return sk_CONF_VALUE_new_null();
    return ret;
75 76
}

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

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

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

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

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

    case GEN_DNS:
107 108
        if (!X509V3_add_value_uchar("DNS", gen->d.ia5->data, &ret))
            return NULL;
109 110 111
        break;

    case GEN_URI:
112 113
        if (!X509V3_add_value_uchar("URI", gen->d.ia5->data, &ret))
            return NULL;
114 115 116
        break;

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

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

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

int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen)
{
156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172
    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:
173 174
        BIO_printf(out, "email:");
        ASN1_STRING_print(out, gen->d.ia5);
175 176 177
        break;

    case GEN_DNS:
178 179
        BIO_printf(out, "DNS:");
        ASN1_STRING_print(out, gen->d.ia5);
180 181 182
        break;

    case GEN_URI:
183 184
        BIO_printf(out, "URI:");
        ASN1_STRING_print(out, gen->d.ia5);
185 186 187
        break;

    case GEN_DIRNAME:
188
        BIO_printf(out, "DirName:");
189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209
        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:
210
        BIO_printf(out, "Registered ID:");
211 212 213 214
        i2a_ASN1_OBJECT(out, gen->d.rid);
        break;
    }
    return 1;
215 216
}

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

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

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

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

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

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

260 261 262 263 264 265 266 267 268
    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;
269 270
    if ((ext = X509_get_ext(ctx->issuer_cert, i)) == NULL
        || (ialt = X509V3_EXT_d2i(ext)) == NULL) {
271 272 273 274
        X509V3err(X509V3_F_COPY_ISSUER, X509V3_R_ISSUER_DECODE_ERROR);
        goto err;
    }

F
FdaSilvaYY 已提交
275 276 277 278 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);
        goto err;
    }

    for (i = 0; i < num; i++) {
282
        gen = sk_GENERAL_NAME_value(ialt, i);
F
FdaSilvaYY 已提交
283
        sk_GENERAL_NAME_push(gens, gen);     /* no failure as it was reserved */
284 285 286 287 288 289 290 291
    }
    sk_GENERAL_NAME_free(ialt);

    return 1;

 err:
    return 0;

292 293
}

D
 
Dr. Stephen Henson 已提交
294
static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
295 296
                                      X509V3_CTX *ctx,
                                      STACK_OF(CONF_VALUE) *nval)
297
{
F
FdaSilvaYY 已提交
298
    GENERAL_NAMES *gens;
299
    CONF_VALUE *cnf;
F
FdaSilvaYY 已提交
300
    const int num = sk_CONF_VALUE_num(nval);
301
    int i;
302

P
Paul Yang 已提交
303 304
    gens = sk_GENERAL_NAME_new_reserve(NULL, num);
    if (gens == NULL) {
305
        X509V3err(X509V3_F_V2I_SUBJECT_ALT, ERR_R_MALLOC_FAILURE);
F
FdaSilvaYY 已提交
306
        sk_GENERAL_NAME_free(gens);
307 308
        return NULL;
    }
F
FdaSilvaYY 已提交
309 310

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

333 334
/*
 * Copy any email addresses in a certificate or request to GENERAL_NAMES
335 336
 */

337
static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
338
{
339 340 341 342
    X509_NAME *nm;
    ASN1_IA5STRING *email = NULL;
    X509_NAME_ENTRY *ne;
    GENERAL_NAME *gen = NULL;
F
FdaSilvaYY 已提交
343 344
    int i = -1;

345 346
    if (ctx != NULL && ctx->flags == CTX_TEST)
        return 1;
347
    if (ctx == NULL
F
FdaSilvaYY 已提交
348
        || (ctx->subject_cert == NULL && ctx->subject_req == NULL)) {
349 350 351 352 353 354 355 356 357 358 359 360 361
        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 已提交
362
        email = ASN1_STRING_dup(X509_NAME_ENTRY_get_data(ne));
363 364 365 366 367
        if (move_p) {
            X509_NAME_delete_entry(nm, i);
            X509_NAME_ENTRY_free(ne);
            i--;
        }
368
        if (email == NULL || (gen = GENERAL_NAME_new()) == NULL) {
369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385
            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 已提交
386
    ASN1_IA5STRING_free(email);
387 388
    return 0;

389 390
}

391
GENERAL_NAMES *v2i_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
392
                                 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
393
{
394
    GENERAL_NAME *gen;
F
FdaSilvaYY 已提交
395
    GENERAL_NAMES *gens;
396
    CONF_VALUE *cnf;
F
FdaSilvaYY 已提交
397
    const int num = sk_CONF_VALUE_num(nval);
398
    int i;
399

P
Paul Yang 已提交
400 401
    gens = sk_GENERAL_NAME_new_reserve(NULL, num);
    if (gens == NULL) {
402
        X509V3err(X509V3_F_V2I_GENERAL_NAMES, ERR_R_MALLOC_FAILURE);
F
FdaSilvaYY 已提交
403
        sk_GENERAL_NAME_free(gens);
404 405
        return NULL;
    }
F
FdaSilvaYY 已提交
406 407

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

419 420 421 422 423
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);
}
424

425
GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
426
                               const X509V3_EXT_METHOD *method,
427
                               X509V3_CTX *ctx, int gen_type, const char *value,
428 429 430 431 432 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
                               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;
458
            if ((obj = OBJ_txt2obj(value, 0)) == NULL) {
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
                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) {
498
        if ((gen->d.ia5 = ASN1_IA5STRING_new()) == NULL ||
499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514
            !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 已提交
515

516
GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
517 518 519 520 521 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
                                  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);

}
555

556
static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx)
557 558 559
{
    char *objtmp = NULL, *p;
    int objlen;
560 561

    if ((p = strchr(value, ';')) == NULL)
562
        return 0;
563
    if ((gen->d.otherName = OTHERNAME_new()) == NULL)
564 565 566 567 568 569
        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);
570
    if ((gen->d.otherName->value = ASN1_generate_v3(p + 1, ctx)) == NULL)
571 572
        return 0;
    objlen = p - value;
D
Dmitry-Me 已提交
573
    objtmp = OPENSSL_strndup(value, objlen);
574 575 576 577 578 579 580 581
    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;
}
582

583
static int do_dirname(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx)
584
{
585 586
    int ret = 0;
    STACK_OF(CONF_VALUE) *sk = NULL;
587 588 589
    X509_NAME *nm;

    if ((nm = X509_NAME_new()) == NULL)
590
        goto err;
591 592 593 594
    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);
595
        goto err;
596 597 598 599
    }
    /* FIXME: should allow other character types... */
    ret = X509V3_NAME_from_section(nm, sk, MBSTRING_ASC);
    if (!ret)
600
        goto err;
601 602
    gen->d.dirn = nm;

603 604 605 606
err:
    if (ret == 0)
        X509_NAME_free(nm);
    X509V3_section_free(ctx, sk);
607 608
    return ret;
}