ca.c 82.7 KB
Newer Older
R
Rich Salz 已提交
1
/*
2
 * Copyright 1995-2017 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 11 12 13 14
 */

/* The PPKI stuff has been donated by Jeff Barber <jeffb@issl.atl.hp.com> */

#include <stdio.h>
#include <stdlib.h>
#include <string.h>
15
#include <ctype.h>
16
#include <sys/types.h>
17 18 19 20 21 22 23 24 25
#include <openssl/conf.h>
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/bn.h>
#include <openssl/txt_db.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/objects.h>
26
#include <openssl/ocsp.h>
27
#include <openssl/pem.h>
28 29

#ifndef W_OK
30
# ifdef OPENSSL_SYS_VMS
31
#  include <unistd.h>
R
Rich Salz 已提交
32
# elif !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_WINDOWS)
33 34
#  include <sys/file.h>
# endif
U
Ulf Möller 已提交
35 36
#endif

37 38
#include "apps.h"

U
Ulf Möller 已提交
39
#ifndef W_OK
40 41 42 43
# define F_OK 0
# define X_OK 1
# define W_OK 2
# define R_OK 4
44 45
#endif

F
FdaSilvaYY 已提交
46 47 48 49 50 51 52 53
#ifndef PATH_MAX
# define PATH_MAX 4096
#endif
#ifndef NAME_MAX
# define NAME_MAX 255
#endif

#define CERT_MAX (PATH_MAX + NAME_MAX)
54

A
Alessandro Ghedini 已提交
55
#define BASE_SECTION            "ca"
56

57 58
#define ENV_DEFAULT_CA          "default_ca"

A
Alessandro Ghedini 已提交
59
#define STRING_MASK             "string_mask"
60 61 62
#define UTF8_IN                 "utf8"

#define ENV_NEW_CERTS_DIR       "new_certs_dir"
A
Alessandro Ghedini 已提交
63
#define ENV_CERTIFICATE         "certificate"
64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84
#define ENV_SERIAL              "serial"
#define ENV_CRLNUMBER           "crlnumber"
#define ENV_PRIVATE_KEY         "private_key"
#define ENV_DEFAULT_DAYS        "default_days"
#define ENV_DEFAULT_STARTDATE   "default_startdate"
#define ENV_DEFAULT_ENDDATE     "default_enddate"
#define ENV_DEFAULT_CRL_DAYS    "default_crl_days"
#define ENV_DEFAULT_CRL_HOURS   "default_crl_hours"
#define ENV_DEFAULT_MD          "default_md"
#define ENV_DEFAULT_EMAIL_DN    "email_in_dn"
#define ENV_PRESERVE            "preserve"
#define ENV_POLICY              "policy"
#define ENV_EXTENSIONS          "x509_extensions"
#define ENV_CRLEXT              "crl_extensions"
#define ENV_MSIE_HACK           "msie_hack"
#define ENV_NAMEOPT             "name_opt"
#define ENV_CERTOPT             "cert_opt"
#define ENV_EXTCOPY             "copy_extensions"
#define ENV_UNIQUE_SUBJECT      "unique_subject"

#define ENV_DATABASE            "database"
85

86
/* Additional revocation information types */
87 88 89 90 91 92 93 94
typedef enum {
    REV_VALID             = -1, /* Valid (not-revoked) status */
    REV_NONE              = 0, /* No additional information */
    REV_CRL_REASON        = 1, /* Value is CRL reason code */
    REV_HOLD              = 2, /* Value is hold instruction */
    REV_KEY_COMPROMISE    = 3, /* Value is cert key compromise time */
    REV_CA_COMPROMISE     = 4  /* Value is CA key compromise time */
} REVINFO_TYPE;
95

96
static char *lookup_conf(const CONF *conf, const char *group, const char *tag);
97 98

static int certify(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,
99 100
                   const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
                   STACK_OF(CONF_VALUE) *policy, CA_DB *db,
101 102 103 104
                   BIGNUM *serial, const char *subj, unsigned long chtype,
                   int multirdn, int email_dn, const char *startdate,
                   const char *enddate,
                   long days, int batch, const char *ext_sect, CONF *conf,
105 106
                   int verbose, unsigned long certopt, unsigned long nameopt,
                   int default_op, int ext_copy, int selfsign);
107
static int certify_cert(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,
108 109
                        const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
                        STACK_OF(CONF_VALUE) *policy, CA_DB *db,
110 111 112
                        BIGNUM *serial, const char *subj, unsigned long chtype,
                        int multirdn, int email_dn, const char *startdate,
                        const char *enddate, long days, int batch, const char *ext_sect,
113
                        CONF *conf, int verbose, unsigned long certopt,
114
                        unsigned long nameopt, int default_op, int ext_copy);
115
static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,
116 117 118
                         X509 *x509, const EVP_MD *dgst,
                         STACK_OF(OPENSSL_STRING) *sigopts,
                         STACK_OF(CONF_VALUE) *policy, CA_DB *db,
119 120 121
                         BIGNUM *serial, const char *subj, unsigned long chtype,
                         int multirdn, int email_dn, const char *startdate,
                         const char *enddate, long days, const char *ext_sect, CONF *conf,
122 123 124 125 126
                         int verbose, unsigned long certopt,
                         unsigned long nameopt, int default_op, int ext_copy);
static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
                   const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
                   STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial,
127 128 129
                   const char *subj, unsigned long chtype, int multirdn,
                   int email_dn, const char *startdate, const char *enddate, long days,
                   int batch, int verbose, X509_REQ *req, const char *ext_sect,
130 131
                   CONF *conf, unsigned long certopt, unsigned long nameopt,
                   int default_op, int ext_copy, int selfsign);
132 133
static int get_certificate_status(const char *ser_status, CA_DB *db);
static int do_updatedb(CA_DB *db);
D
Dr. Stephen Henson 已提交
134
static int check_time_format(const char *str);
135 136 137 138
static int do_revoke(X509 *x509, CA_DB *db, REVINFO_TYPE rev_type,
                     const char *extval);
static char *make_revocation_str(REVINFO_TYPE rev_type, const char *rev_arg);
static int make_revoked(X509_REVOKED *rev, const char *str);
F
FdaSilvaYY 已提交
139
static int old_entry_print(const ASN1_OBJECT *obj, const ASN1_STRING *str);
140
static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext);
141

142 143 144
static CONF *extconf = NULL;
static int preserve = 0;
static int msie_hack = 0;
145

146 147 148 149 150 151 152 153 154 155
typedef enum OPTION_choice {
    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
    OPT_ENGINE, OPT_VERBOSE, OPT_CONFIG, OPT_NAME, OPT_SUBJ, OPT_UTF8,
    OPT_CREATE_SERIAL, OPT_MULTIVALUE_RDN, OPT_STARTDATE, OPT_ENDDATE,
    OPT_DAYS, OPT_MD, OPT_POLICY, OPT_KEYFILE, OPT_KEYFORM, OPT_PASSIN,
    OPT_KEY, OPT_CERT, OPT_SELFSIGN, OPT_IN, OPT_OUT, OPT_OUTDIR,
    OPT_SIGOPT, OPT_NOTEXT, OPT_BATCH, OPT_PRESERVEDN, OPT_NOEMAILDN,
    OPT_GENCRL, OPT_MSIE_HACK, OPT_CRLDAYS, OPT_CRLHOURS, OPT_CRLSEC,
    OPT_INFILES, OPT_SS_CERT, OPT_SPKAC, OPT_REVOKE, OPT_VALID,
    OPT_EXTENSIONS, OPT_EXTFILE, OPT_STATUS, OPT_UPDATEDB, OPT_CRLEXTS,
R
Rich Salz 已提交
156
    OPT_R_ENUM,
157 158
    /* Do not change the order here; see related case statements below */
    OPT_CRL_REASON, OPT_CRL_HOLD, OPT_CRL_COMPROMISE, OPT_CRL_CA_COMPROMISE
159 160
} OPTION_CHOICE;

F
FdaSilvaYY 已提交
161
const OPTIONS ca_options[] = {
162 163 164 165 166 167
    {"help", OPT_HELP, '-', "Display this summary"},
    {"verbose", OPT_VERBOSE, '-', "Verbose output during processing"},
    {"config", OPT_CONFIG, 's', "A config file"},
    {"name", OPT_NAME, 's', "The particular CA definition to use"},
    {"subj", OPT_SUBJ, 's', "Use arg instead of request's subject"},
    {"utf8", OPT_UTF8, '-', "Input characters are UTF8 (default ASCII)"},
A
A J Mohan Rao 已提交
168
    {"create_serial", OPT_CREATE_SERIAL, '-',
F
FdaSilvaYY 已提交
169
     "If reading serial fails, create a new random serial"},
170 171 172 173 174 175 176 177
    {"multivalue-rdn", OPT_MULTIVALUE_RDN, '-',
     "Enable support for multivalued RDNs"},
    {"startdate", OPT_STARTDATE, 's', "Cert notBefore, YYMMDDHHMMSSZ"},
    {"enddate", OPT_ENDDATE, 's',
     "YYMMDDHHMMSSZ cert notAfter (overrides -days)"},
    {"days", OPT_DAYS, 'p', "Number of days to certify the cert for"},
    {"md", OPT_MD, 's', "md to use; one of md2, md5, sha or sha1"},
    {"policy", OPT_POLICY, 's', "The CA 'policy' to support"},
178
    {"keyfile", OPT_KEYFILE, 's', "Private key"},
179
    {"keyform", OPT_KEYFORM, 'f', "Private key file format (PEM or ENGINE)"},
180
    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
181 182 183 184 185 186 187
    {"key", OPT_KEY, 's', "Key to decode the private key if it is encrypted"},
    {"cert", OPT_CERT, '<', "The CA cert"},
    {"selfsign", OPT_SELFSIGN, '-',
     "Sign a cert with the key associated with it"},
    {"in", OPT_IN, '<', "The input PEM encoded cert request(s)"},
    {"out", OPT_OUT, '>', "Where to put the output file(s)"},
    {"outdir", OPT_OUTDIR, '/', "Where to put output cert"},
188 189
    {"sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form"},
    {"notext", OPT_NOTEXT, '-', "Do not print the generated certificate"},
190 191 192 193 194 195
    {"batch", OPT_BATCH, '-', "Don't ask questions"},
    {"preserveDN", OPT_PRESERVEDN, '-', "Don't re-order the DN"},
    {"noemailDN", OPT_NOEMAILDN, '-', "Don't add the EMAIL field to the DN"},
    {"gencrl", OPT_GENCRL, '-', "Generate a new CRL"},
    {"msie_hack", OPT_MSIE_HACK, '-',
     "msie modifications to handle all those universal strings"},
196 197 198
    {"crldays", OPT_CRLDAYS, 'p', "Days until the next CRL is due"},
    {"crlhours", OPT_CRLHOURS, 'p', "Hours until the next CRL is due"},
    {"crlsec", OPT_CRLSEC, 'p', "Seconds until the next CRL is due"},
199 200 201 202 203
    {"infiles", OPT_INFILES, '-', "The last argument, requests to process"},
    {"ss_cert", OPT_SS_CERT, '<', "File contains a self signed cert to sign"},
    {"spkac", OPT_SPKAC, '<',
     "File contains DN and signed public key and challenge"},
    {"revoke", OPT_REVOKE, '<', "Revoke a cert (given in file)"},
204 205
    {"valid", OPT_VALID, 's',
     "Add a Valid(not-revoked) DB entry about a cert (given in file)"},
206 207 208 209 210 211 212 213
    {"extensions", OPT_EXTENSIONS, 's',
     "Extension section (override value in config file)"},
    {"extfile", OPT_EXTFILE, '<',
     "Configuration file with X509v3 extensions to add"},
    {"status", OPT_STATUS, 's', "Shows cert status given the serial number"},
    {"updatedb", OPT_UPDATEDB, '-', "Updates db for expired cert"},
    {"crlexts", OPT_CRLEXTS, 's',
     "CRL extension section (override value in config file)"},
A
A J Mohan Rao 已提交
214 215 216 217 218 219 220
    {"crl_reason", OPT_CRL_REASON, 's', "revocation reason"},
    {"crl_hold", OPT_CRL_HOLD, 's',
     "the hold instruction, an OID. Sets revocation reason to certificateHold"},
    {"crl_compromise", OPT_CRL_COMPROMISE, 's',
     "sets compromise time to val and the revocation reason to keyCompromise"},
    {"crl_CA_compromise", OPT_CRL_CA_COMPROMISE, 's',
     "sets compromise time to val and the revocation reason to CACompromise"},
R
Rich Salz 已提交
221
    OPT_R_OPTIONS,
222 223 224 225 226
#ifndef OPENSSL_NO_ENGINE
    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
#endif
    {NULL}
};
227

228
int ca_main(int argc, char **argv)
229
{
F
FdaSilvaYY 已提交
230
    CONF *conf = NULL;
231
    ENGINE *e = NULL;
232
    BIGNUM *crlnumber = NULL, *serial = NULL;
233
    EVP_PKEY *pkey = NULL;
234
    BIO *in = NULL, *out = NULL, *Sout = NULL;
235
    ASN1_INTEGER *tmpser;
236 237 238
    ASN1_TIME *tmptm;
    CA_DB *db = NULL;
    DB_ATTR db_attr;
239 240
    STACK_OF(CONF_VALUE) *attribs = NULL;
    STACK_OF(OPENSSL_STRING) *sigopts = NULL;
241 242 243
    STACK_OF(X509) *cert_sk = NULL;
    X509_CRL *crl = NULL;
    const EVP_MD *dgst = NULL;
F
FdaSilvaYY 已提交
244
    char *configfile = default_config_file, *section = NULL;
R
Rich Salz 已提交
245
    char *md = NULL, *policy = NULL, *keyfile = NULL;
246 247 248
    char *certfile = NULL, *crl_ext = NULL, *crlnumberfile = NULL, *key = NULL;
    const char *infile = NULL, *spkac_file = NULL, *ss_cert_file = NULL;
    const char *extensions = NULL, *extfile = NULL, *passinarg = NULL;
249
    char *outdir = NULL, *outfile = NULL, *rev_arg = NULL, *ser_status = NULL;
250 251
    const char *serialfile = NULL, *subj = NULL;
    char *prog, *startdate = NULL, *enddate = NULL;
R
Rich Salz 已提交
252
    char *dbfile = NULL, *f;
F
FdaSilvaYY 已提交
253
    char new_cert[CERT_MAX + 1];
254
    char tmp[10 + 1] = "\0";
R
Rich Salz 已提交
255
    char *const *pp;
256 257 258 259 260
    const char *p;
    int create_ser = 0, free_key = 0, total = 0, total_done = 0;
    int batch = 0, default_op = 1, doupdatedb = 0, ext_copy = EXT_COPY_NONE;
    int keyformat = FORMAT_PEM, multirdn = 0, notext = 0, output_der = 0;
    int ret = 1, email_dn = 1, req = 0, verbose = 0, gencrl = 0, dorevoke = 0;
261
    int i, j, selfsign = 0;
R
Rich Salz 已提交
262
    long crldays = 0, crlhours = 0, crlsec = 0, days = 0;
263
    unsigned long chtype = MBSTRING_ASC, certopt = 0;
264
    X509 *x509 = NULL, *x509p = NULL, *x = NULL;
265
    REVINFO_TYPE rev_type = REV_NONE;
266 267
    X509_REVOKED *r = NULL;
    OPTION_CHOICE o;
268

F
FdaSilvaYY 已提交
269 270
    new_cert[CERT_MAX] = '\0';

271 272 273
    prog = opt_init(argc, argv, ca_options);
    while ((o = opt_next()) != OPT_EOF) {
        switch (o) {
F
FdaSilvaYY 已提交
274 275
        case OPT_EOF:
        case OPT_ERR:
276
opthelp:
F
FdaSilvaYY 已提交
277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305
            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
            goto end;
        case OPT_HELP:
            opt_help(ca_options);
            ret = 0;
            goto end;
        case OPT_IN:
            req = 1;
            infile = opt_arg();
            break;
        case OPT_OUT:
            outfile = opt_arg();
            break;
        case OPT_VERBOSE:
            verbose = 1;
            break;
        case OPT_CONFIG:
            configfile = opt_arg();
            break;
        case OPT_NAME:
            section = opt_arg();
            break;
        case OPT_SUBJ:
            subj = opt_arg();
            /* preserve=1; */
            break;
        case OPT_UTF8:
            chtype = MBSTRING_UTF8;
            break;
306
        case OPT_CREATE_SERIAL:
307
            create_ser = 1;
308 309
            break;
        case OPT_MULTIVALUE_RDN:
310
            multirdn = 1;
311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336
            break;
        case OPT_STARTDATE:
            startdate = opt_arg();
            break;
        case OPT_ENDDATE:
            enddate = opt_arg();
            break;
        case OPT_DAYS:
            days = atoi(opt_arg());
            break;
        case OPT_MD:
            md = opt_arg();
            break;
        case OPT_POLICY:
            policy = opt_arg();
            break;
        case OPT_KEYFILE:
            keyfile = opt_arg();
            break;
        case OPT_KEYFORM:
            if (!opt_format(opt_arg(), OPT_FMT_ANY, &keyformat))
                goto opthelp;
            break;
        case OPT_PASSIN:
            passinarg = opt_arg();
            break;
R
Rich Salz 已提交
337 338 339 340
        case OPT_R_CASES:
            if (!opt_rand(o))
                goto end;
            break;
341 342 343 344 345 346 347
        case OPT_KEY:
            key = opt_arg();
            break;
        case OPT_CERT:
            certfile = opt_arg();
            break;
        case OPT_SELFSIGN:
348
            selfsign = 1;
349 350 351 352 353 354
            break;
        case OPT_OUTDIR:
            outdir = opt_arg();
            break;
        case OPT_SIGOPT:
            if (sigopts == NULL)
355
                sigopts = sk_OPENSSL_STRING_new_null();
356 357 358 359 360
            if (sigopts == NULL
                || !sk_OPENSSL_STRING_push(sigopts, opt_arg()))
                goto end;
            break;
        case OPT_NOTEXT:
361
            notext = 1;
362 363
            break;
        case OPT_BATCH:
364
            batch = 1;
365 366
            break;
        case OPT_PRESERVEDN:
367
            preserve = 1;
368 369
            break;
        case OPT_NOEMAILDN:
370
            email_dn = 0;
371 372
            break;
        case OPT_GENCRL:
373
            gencrl = 1;
374 375
            break;
        case OPT_MSIE_HACK:
376 377
            msie_hack = 1;
            break;
378 379 380 381 382 383 384 385 386 387
        case OPT_CRLDAYS:
            crldays = atol(opt_arg());
            break;
        case OPT_CRLHOURS:
            crlhours = atol(opt_arg());
            break;
        case OPT_CRLSEC:
            crlsec = atol(opt_arg());
            break;
        case OPT_INFILES:
388
            req = 1;
389 390 391
            goto end_of_options;
        case OPT_SS_CERT:
            ss_cert_file = opt_arg();
392
            req = 1;
393 394 395 396 397 398 399
            break;
        case OPT_SPKAC:
            spkac_file = opt_arg();
            req = 1;
            break;
        case OPT_REVOKE:
            infile = opt_arg();
400
            dorevoke = 1;
401 402 403
            break;
        case OPT_VALID:
            infile = opt_arg();
404
            dorevoke = 2;
405 406 407 408 409 410 411 412 413 414 415
            break;
        case OPT_EXTENSIONS:
            extensions = opt_arg();
            break;
        case OPT_EXTFILE:
            extfile = opt_arg();
            break;
        case OPT_STATUS:
            ser_status = opt_arg();
            break;
        case OPT_UPDATEDB:
416
            doupdatedb = 1;
417 418 419 420
            break;
        case OPT_CRLEXTS:
            crl_ext = opt_arg();
            break;
421
        case OPT_CRL_REASON:        /* := REV_CRL_REASON */
422 423 424 425
        case OPT_CRL_HOLD:
        case OPT_CRL_COMPROMISE:
        case OPT_CRL_CA_COMPROMISE:
            rev_arg = opt_arg();
426
            rev_type = (o - OPT_CRL_REASON) + REV_CRL_REASON;
427 428
            break;
        case OPT_ENGINE:
R
Rich Salz 已提交
429
            e = setup_engine(opt_arg(), 0);
430 431 432
            break;
        }
    }
433 434 435
end_of_options:
    argc = opt_num_rest();
    argv = opt_rest();
436 437

    BIO_printf(bio_err, "Using configuration from %s\n", configfile);
438 439 440

    if ((conf = app_load_config(configfile)) == NULL)
        goto end;
441
    if (configfile != default_config_file && !app_load_modules(conf))
442
        goto end;
443

444
    /* Lets get the config section we are using */
445 446 447
    if (section == NULL
        && (section = lookup_conf(conf, BASE_SECTION, ENV_DEFAULT_CA)) == NULL)
        goto end;
448 449 450 451 452 453 454 455 456 457

    if (conf != NULL) {
        p = NCONF_get_string(conf, NULL, "oid_file");
        if (p == NULL)
            ERR_clear_error();
        if (p != NULL) {
            BIO *oid_bio;

            oid_bio = BIO_new_file(p, "r");
            if (oid_bio == NULL) {
458 459 460 461
                /*-
                BIO_printf(bio_err,"problems opening %s for extra oid's\n",p);
                ERR_print_errors(bio_err);
                */
462 463 464 465 466 467
                ERR_clear_error();
            } else {
                OBJ_create_objects(oid_bio);
                BIO_free(oid_bio);
            }
        }
468
        if (!add_oid_section(conf)) {
469
            ERR_print_errors(bio_err);
470
            goto end;
471 472 473
        }
    }

R
Rich Salz 已提交
474
    app_RAND_load_conf(conf, BASE_SECTION);
475 476

    f = NCONF_get_string(conf, section, STRING_MASK);
477
    if (f == NULL)
478 479
        ERR_clear_error();

480
    if (f != NULL && !ASN1_STRING_set_default_mask_asc(f)) {
481
        BIO_printf(bio_err, "Invalid global string mask setting %s\n", f);
482
        goto end;
483 484 485 486
    }

    if (chtype != MBSTRING_UTF8) {
        f = NCONF_get_string(conf, section, UTF8_IN);
487
        if (f == NULL)
488
            ERR_clear_error();
R
Rich Salz 已提交
489
        else if (strcmp(f, "yes") == 0)
490 491 492 493 494
            chtype = MBSTRING_UTF8;
    }

    db_attr.unique_subject = 1;
    p = NCONF_get_string(conf, section, ENV_UNIQUE_SUBJECT);
495
    if (p != NULL)
496
        db_attr.unique_subject = parse_yesno(p, 1);
497
    else
498 499
        ERR_clear_error();

F
FdaSilvaYY 已提交
500
    /*****************************************************************/
501 502
    /* report status of cert with serial number given on command line */
    if (ser_status) {
503
        dbfile = lookup_conf(conf, section, ENV_DATABASE);
F
FdaSilvaYY 已提交
504
        if (dbfile == NULL)
505
            goto end;
506

507 508
        db = load_index(dbfile, &db_attr);
        if (db == NULL)
509
            goto end;
510 511

        if (!index_index(db))
512
            goto end;
513 514 515

        if (get_certificate_status(ser_status, db) != 1)
            BIO_printf(bio_err, "Error verifying serial %s!\n", ser_status);
516
        goto end;
517 518
    }

F
FdaSilvaYY 已提交
519
    /*****************************************************************/
520 521
    /* we definitely need a private key, so let's get it */

522 523
    if (keyfile == NULL
        && (keyfile = lookup_conf(conf, section, ENV_PRIVATE_KEY)) == NULL)
524
        goto end;
525

526
    if (key == NULL) {
527
        free_key = 1;
528
        if (!app_passwd(passinarg, NULL, &key, NULL)) {
529
            BIO_printf(bio_err, "Error getting password\n");
530
            goto end;
531 532
        }
    }
533
    pkey = load_key(keyfile, keyformat, 0, key, e, "CA private key");
534
    if (key != NULL)
535
        OPENSSL_cleanse(key, strlen(key));
536
    if (pkey == NULL)
537
        /* load_key() has already printed an appropriate message */
538
        goto end;
539

F
FdaSilvaYY 已提交
540
    /*****************************************************************/
541 542
    /* we need a certificate */
    if (!selfsign || spkac_file || ss_cert_file || gencrl) {
543 544
        if (certfile == NULL
            && (certfile = lookup_conf(conf, section, ENV_CERTIFICATE)) == NULL)
545
            goto end;
546

547
        x509 = load_cert(certfile, FORMAT_PEM, "CA certificate");
548
        if (x509 == NULL)
549
            goto end;
550 551 552 553

        if (!X509_check_private_key(x509, pkey)) {
            BIO_printf(bio_err,
                       "CA certificate and CA private key do not match\n");
554
            goto end;
555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572
        }
    }
    if (!selfsign)
        x509p = x509;

    f = NCONF_get_string(conf, BASE_SECTION, ENV_PRESERVE);
    if (f == NULL)
        ERR_clear_error();
    if ((f != NULL) && ((*f == 'y') || (*f == 'Y')))
        preserve = 1;
    f = NCONF_get_string(conf, BASE_SECTION, ENV_MSIE_HACK);
    if (f == NULL)
        ERR_clear_error();
    if ((f != NULL) && ((*f == 'y') || (*f == 'Y')))
        msie_hack = 1;

    f = NCONF_get_string(conf, section, ENV_NAMEOPT);

573
    if (f != NULL) {
574
        if (!set_nameopt(f)) {
575
            BIO_printf(bio_err, "Invalid name options: \"%s\"\n", f);
576
            goto end;
577 578
        }
        default_op = 0;
579
    }
580 581 582

    f = NCONF_get_string(conf, section, ENV_CERTOPT);

583
    if (f != NULL) {
584 585
        if (!set_cert_ex(&certopt, f)) {
            BIO_printf(bio_err, "Invalid certificate options: \"%s\"\n", f);
586
            goto end;
587 588
        }
        default_op = 0;
589
    } else {
590
        ERR_clear_error();
591
    }
592 593 594

    f = NCONF_get_string(conf, section, ENV_EXTCOPY);

595
    if (f != NULL) {
596 597
        if (!set_ext_copy(&ext_copy, f)) {
            BIO_printf(bio_err, "Invalid extension copy option: \"%s\"\n", f);
598
            goto end;
599
        }
600
    } else {
601
        ERR_clear_error();
602
    }
603

F
FdaSilvaYY 已提交
604
    /*****************************************************************/
605 606 607
    /* lookup where to write new certificates */
    if ((outdir == NULL) && (req)) {

608 609
        outdir = NCONF_get_string(conf, section, ENV_NEW_CERTS_DIR);
        if (outdir == NULL) {
610 611
            BIO_printf(bio_err,
                       "there needs to be defined a directory for new certificate to be placed in\n");
612
            goto end;
613
        }
614
#ifndef OPENSSL_SYS_VMS
615 616
        /*
         * outdir is a directory spec, but access() for VMS demands a
617 618 619 620
         * filename.  We could use the DEC C routine to convert the
         * directory syntax to Unixly, and give that to app_isdir,
         * but for now the fopen will catch the error if it's not a
         * directory
621 622
         */
        if (app_isdir(outdir) <= 0) {
623
            BIO_printf(bio_err, "%s: %s is not a directory\n", prog, outdir);
624
            perror(outdir);
625
            goto end;
626
        }
627
#endif
628 629
    }

F
FdaSilvaYY 已提交
630
    /*****************************************************************/
631
    /* we need to load the database file */
632 633
    dbfile = lookup_conf(conf, section, ENV_DATABASE);
    if (dbfile == NULL)
634
        goto end;
635

636 637
    db = load_index(dbfile, &db_attr);
    if (db == NULL)
638
        goto end;
639 640 641 642 643 644 645 646

    /* Lets check some fields */
    for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++) {
        pp = sk_OPENSSL_PSTRING_value(db->db->data, i);
        if ((pp[DB_type][0] != DB_TYPE_REV) && (pp[DB_rev_date][0] != '\0')) {
            BIO_printf(bio_err,
                       "entry %d: not revoked yet, but has a revocation date\n",
                       i + 1);
647
            goto end;
648 649 650 651
        }
        if ((pp[DB_type][0] == DB_TYPE_REV) &&
            !make_revoked(NULL, pp[DB_rev_date])) {
            BIO_printf(bio_err, " in entry %d\n", i + 1);
652
            goto end;
653 654 655
        }
        if (!check_time_format((char *)pp[DB_exp_date])) {
            BIO_printf(bio_err, "entry %d: invalid expiry date\n", i + 1);
656
            goto end;
657 658 659 660 661 662 663 664 665 666
        }
        p = pp[DB_serial];
        j = strlen(p);
        if (*p == '-') {
            p++;
            j--;
        }
        if ((j & 1) || (j < 2)) {
            BIO_printf(bio_err, "entry %d: bad serial number length (%d)\n",
                       i + 1, j);
667
            goto end;
668
        }
R
Rich Salz 已提交
669
        for ( ; *p; p++) {
670
            if (!isxdigit(_UC(*p))) {
671
                BIO_printf(bio_err,
R
Rich Salz 已提交
672 673
                           "entry %d: bad char 0%o '%c' in serial number\n",
                           i + 1, *p, *p);
674
                goto end;
675 676 677 678
            }
        }
    }
    if (verbose) {
679
        TXT_DB_write(bio_out, db->db);
680 681 682 683 684 685
        BIO_printf(bio_err, "%d entries loaded from the database\n",
                   sk_OPENSSL_PSTRING_num(db->db->data));
        BIO_printf(bio_err, "generating index\n");
    }

    if (!index_index(db))
686
        goto end;
687

F
FdaSilvaYY 已提交
688
    /*****************************************************************/
689 690 691 692 693 694 695 696
    /* Update the db file for expired certificates */
    if (doupdatedb) {
        if (verbose)
            BIO_printf(bio_err, "Updating %s ...\n", dbfile);

        i = do_updatedb(db);
        if (i == -1) {
            BIO_printf(bio_err, "Malloc failure\n");
697
            goto end;
698 699 700 701 702
        } else if (i == 0) {
            if (verbose)
                BIO_printf(bio_err, "No entries found to mark expired\n");
        } else {
            if (!save_index(dbfile, "new", db))
703
                goto end;
704 705

            if (!rotate_index(dbfile, "new", "old"))
706
                goto end;
707 708 709 710 711 712 713

            if (verbose)
                BIO_printf(bio_err,
                           "Done. %d entries marked as expired\n", i);
        }
    }

R
Rich Salz 已提交
714
    /*****************************************************************/
715 716
    /* Read extensions config file                                   */
    if (extfile) {
R
Rich Salz 已提交
717
        if ((extconf = app_load_config(extfile)) == NULL) {
718
            ret = 1;
719
            goto end;
720 721 722 723 724 725 726
        }

        if (verbose)
            BIO_printf(bio_err, "Successfully loaded extensions file %s\n",
                       extfile);

        /* We can have sections in the ext file */
727 728 729 730 731
        if (extensions == NULL) {
            extensions = NCONF_get_string(extconf, "default", "extensions");
            if (extensions == NULL)
                extensions = "default";
        }
732 733
    }

734
    /*****************************************************************/
735
    if (req || gencrl) {
736 737
        /* FIXME: Is it really always text? */
        Sout = bio_open_default(outfile, 'w', FORMAT_TEXT);
738 739
        if (Sout == NULL)
            goto end;
740 741
    }

742 743
    if (md == NULL
        && (md = lookup_conf(conf, section, ENV_DEFAULT_MD)) == NULL)
744
        goto end;
745

R
Rich Salz 已提交
746
    if (strcmp(md, "default") == 0) {
747 748 749
        int def_nid;
        if (EVP_PKEY_get_default_digest_nid(pkey, &def_nid) <= 0) {
            BIO_puts(bio_err, "no default digest\n");
750
            goto end;
751 752 753 754
        }
        md = (char *)OBJ_nid2sn(def_nid);
    }

755 756
    if (!opt_md(md, &dgst)) {
        goto end;
757 758 759
    }

    if (req) {
760 761 762 763 764
        if (email_dn == 1) {
            char *tmp_email_dn = NULL;

            tmp_email_dn = NCONF_get_string(conf, section, ENV_DEFAULT_EMAIL_DN);
            if (tmp_email_dn != NULL && strcmp(tmp_email_dn, "no") == 0)
765 766 767 768
                email_dn = 0;
        }
        if (verbose)
            BIO_printf(bio_err, "message digest is %s\n",
769
                       OBJ_nid2ln(EVP_MD_type(dgst)));
770 771
        if (policy == NULL
            && (policy = lookup_conf(conf, section, ENV_POLICY)) == NULL)
772
            goto end;
773

774 775 776
        if (verbose)
            BIO_printf(bio_err, "policy is %s\n", policy);

777 778
        serialfile = lookup_conf(conf, section, ENV_SERIAL);
        if (serialfile == NULL)
779
            goto end;
780

781
        if (extconf == NULL) {
782 783 784 785
            /*
             * no '-extfile' option, so we look for extensions in the main
             * configuration file
             */
786
            if (extensions == NULL) {
787
                extensions = NCONF_get_string(conf, section, ENV_EXTENSIONS);
788
                if (extensions == NULL)
789 790
                    ERR_clear_error();
            }
791
            if (extensions != NULL) {
792 793 794 795 796 797 798 799 800
                /* Check syntax of file */
                X509V3_CTX ctx;
                X509V3_set_ctx_test(&ctx);
                X509V3_set_nconf(&ctx, conf);
                if (!X509V3_EXT_add_nconf(conf, &ctx, extensions, NULL)) {
                    BIO_printf(bio_err,
                               "Error Loading extension section %s\n",
                               extensions);
                    ret = 1;
801
                    goto end;
802 803 804 805 806 807 808 809 810 811
                }
            }
        }

        if (startdate == NULL) {
            startdate = NCONF_get_string(conf, section,
                                         ENV_DEFAULT_STARTDATE);
            if (startdate == NULL)
                ERR_clear_error();
        }
812
        if (startdate != NULL && !ASN1_TIME_set_string_X509(NULL, startdate)) {
813 814
            BIO_printf(bio_err,
                       "start date is invalid, it should be YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ\n");
815
            goto end;
816 817 818 819 820 821 822 823 824
        }
        if (startdate == NULL)
            startdate = "today";

        if (enddate == NULL) {
            enddate = NCONF_get_string(conf, section, ENV_DEFAULT_ENDDATE);
            if (enddate == NULL)
                ERR_clear_error();
        }
825
        if (enddate != NULL && !ASN1_TIME_set_string_X509(NULL, enddate)) {
826 827
            BIO_printf(bio_err,
                       "end date is invalid, it should be YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ\n");
828
            goto end;
829 830 831 832 833 834
        }

        if (days == 0) {
            if (!NCONF_get_number(conf, section, ENV_DEFAULT_DAYS, &days))
                days = 0;
        }
835
        if (enddate == NULL && (days == 0)) {
836 837
            BIO_printf(bio_err,
                       "cannot lookup how many days to certify for\n");
838
            goto end;
839 840 841 842
        }

        if ((serial = load_serial(serialfile, create_ser, NULL)) == NULL) {
            BIO_printf(bio_err, "error while loading serial number\n");
843
            goto end;
844 845
        }
        if (verbose) {
846
            if (BN_is_zero(serial)) {
847
                BIO_printf(bio_err, "next serial number is 00\n");
848
            } else {
849
                if ((f = BN_bn2hex(serial)) == NULL)
850
                    goto end;
851 852 853 854 855 856 857
                BIO_printf(bio_err, "next serial number is %s\n", f);
                OPENSSL_free(f);
            }
        }

        if ((attribs = NCONF_get_section(conf, policy)) == NULL) {
            BIO_printf(bio_err, "unable to find 'section' for %s\n", policy);
858
            goto end;
859 860 861 862
        }

        if ((cert_sk = sk_X509_new_null()) == NULL) {
            BIO_printf(bio_err, "Memory allocation failure\n");
863
            goto end;
864 865 866 867 868 869
        }
        if (spkac_file != NULL) {
            total++;
            j = certify_spkac(&x, spkac_file, pkey, x509, dgst, sigopts,
                              attribs, db, serial, subj, chtype, multirdn,
                              email_dn, startdate, enddate, days, extensions,
870
                              conf, verbose, certopt, get_nameopt(), default_op,
871 872
                              ext_copy);
            if (j < 0)
873
                goto end;
874 875 876 877
            if (j > 0) {
                total_done++;
                BIO_printf(bio_err, "\n");
                if (!BN_add_word(serial, 1))
878
                    goto end;
879 880
                if (!sk_X509_push(cert_sk, x)) {
                    BIO_printf(bio_err, "Memory allocation failure\n");
881
                    goto end;
882 883 884 885 886 887 888 889 890 891 892 893 894
                }
                if (outfile) {
                    output_der = 1;
                    batch = 1;
                }
            }
        }
        if (ss_cert_file != NULL) {
            total++;
            j = certify_cert(&x, ss_cert_file, pkey, x509, dgst, sigopts,
                             attribs,
                             db, serial, subj, chtype, multirdn, email_dn,
                             startdate, enddate, days, batch, extensions,
895
                             conf, verbose, certopt, get_nameopt(), default_op,
896
                             ext_copy);
897
            if (j < 0)
898
                goto end;
899 900 901 902
            if (j > 0) {
                total_done++;
                BIO_printf(bio_err, "\n");
                if (!BN_add_word(serial, 1))
903
                    goto end;
904 905
                if (!sk_X509_push(cert_sk, x)) {
                    BIO_printf(bio_err, "Memory allocation failure\n");
906
                    goto end;
907 908 909 910 911 912 913 914
                }
            }
        }
        if (infile != NULL) {
            total++;
            j = certify(&x, infile, pkey, x509p, dgst, sigopts, attribs, db,
                        serial, subj, chtype, multirdn, email_dn, startdate,
                        enddate, days, batch, extensions, conf, verbose,
915
                        certopt, get_nameopt(), default_op, ext_copy, selfsign);
916
            if (j < 0)
917
                goto end;
918 919 920 921
            if (j > 0) {
                total_done++;
                BIO_printf(bio_err, "\n");
                if (!BN_add_word(serial, 1))
922
                    goto end;
923 924
                if (!sk_X509_push(cert_sk, x)) {
                    BIO_printf(bio_err, "Memory allocation failure\n");
925
                    goto end;
926 927 928 929 930 931 932 933
                }
            }
        }
        for (i = 0; i < argc; i++) {
            total++;
            j = certify(&x, argv[i], pkey, x509p, dgst, sigopts, attribs, db,
                        serial, subj, chtype, multirdn, email_dn, startdate,
                        enddate, days, batch, extensions, conf, verbose,
934
                        certopt, get_nameopt(), default_op, ext_copy, selfsign);
935
            if (j < 0)
936
                goto end;
937 938 939 940
            if (j > 0) {
                total_done++;
                BIO_printf(bio_err, "\n");
                if (!BN_add_word(serial, 1))
941
                    goto end;
942 943
                if (!sk_X509_push(cert_sk, x)) {
                    BIO_printf(bio_err, "Memory allocation failure\n");
944
                    goto end;
945 946 947 948 949 950 951 952 953 954 955 956 957 958
                }
            }
        }
        /*
         * we have a stack of newly certified certificates and a data base
         * and serial number that need updating
         */

        if (sk_X509_num(cert_sk) > 0) {
            if (!batch) {
                BIO_printf(bio_err,
                           "\n%d out of %d certificate requests certified, commit? [y/n]",
                           total_done, total);
                (void)BIO_flush(bio_err);
959 960
                tmp[0] = '\0';
                if (fgets(tmp, sizeof(tmp), stdin) == NULL) {
961 962 963
                    BIO_printf(bio_err,
                               "CERTIFICATION CANCELED: I/O error\n");
                    ret = 0;
964
                    goto end;
965
                }
966
                if (tmp[0] != 'y' && tmp[0] != 'Y') {
967 968
                    BIO_printf(bio_err, "CERTIFICATION CANCELED\n");
                    ret = 0;
969
                    goto end;
970 971 972 973 974 975 976
                }
            }

            BIO_printf(bio_err, "Write out database with %d new entries\n",
                       sk_X509_num(cert_sk));

            if (!save_serial(serialfile, "new", serial, NULL))
977
                goto end;
978 979

            if (!save_index(dbfile, "new", db))
980
                goto end;
981 982 983 984 985
        }

        if (verbose)
            BIO_printf(bio_err, "writing new certificates\n");
        for (i = 0; i < sk_X509_num(cert_sk); i++) {
986
            BIO *Cout = NULL;
F
FdaSilvaYY 已提交
987 988
            X509 *xi = sk_X509_value(cert_sk, i);
            ASN1_INTEGER *serialNumber = X509_get_serialNumber(xi);
989 990 991
            int k;
            char *n;

992
            j = ASN1_STRING_length(serialNumber);
993
            p = (const char *)ASN1_STRING_get0_data(serialNumber);
994

F
FdaSilvaYY 已提交
995
            if (strlen(outdir) >= (size_t)(j ? CERT_MAX - j * 2 - 6 : CERT_MAX - 8)) {
996
                BIO_printf(bio_err, "certificate file name too long\n");
997
                goto end;
998 999
            }

1000
            strcpy(new_cert, outdir);
1001
#ifndef OPENSSL_SYS_VMS
1002
            OPENSSL_strlcat(new_cert, "/", sizeof(new_cert));
U
Ulf Möller 已提交
1003 1004
#endif

1005
            n = (char *)&(new_cert[strlen(new_cert)]);
1006 1007
            if (j > 0) {
                for (k = 0; k < j; k++) {
1008
                    if (n >= &(new_cert[sizeof(new_cert)]))
1009 1010
                        break;
                    BIO_snprintf(n,
1011
                                 &new_cert[0] + sizeof(new_cert) - n,
1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024
                                 "%02X", (unsigned char)*(p++));
                    n += 2;
                }
            } else {
                *(n++) = '0';
                *(n++) = '0';
            }
            *(n++) = '.';
            *(n++) = 'p';
            *(n++) = 'e';
            *(n++) = 'm';
            *n = '\0';
            if (verbose)
1025
                BIO_printf(bio_err, "writing %s\n", new_cert);
1026

1027
            Cout = BIO_new_file(new_cert, "w");
1028
            if (Cout == NULL) {
1029
                perror(new_cert);
1030
                goto end;
1031
            }
F
FdaSilvaYY 已提交
1032 1033
            write_new_certificate(Cout, xi, 0, notext);
            write_new_certificate(Sout, xi, output_der, notext);
1034
            BIO_free_all(Cout);
1035 1036 1037 1038 1039
        }

        if (sk_X509_num(cert_sk)) {
            /* Rename the database and the serial file */
            if (!rotate_serial(serialfile, "new", "old"))
1040
                goto end;
1041 1042

            if (!rotate_index(dbfile, "new", "old"))
1043
                goto end;
1044 1045 1046 1047 1048

            BIO_printf(bio_err, "Data Base Updated\n");
        }
    }

F
FdaSilvaYY 已提交
1049
    /*****************************************************************/
1050 1051
    if (gencrl) {
        int crl_v2 = 0;
1052
        if (crl_ext == NULL) {
1053
            crl_ext = NCONF_get_string(conf, section, ENV_CRLEXT);
1054
            if (crl_ext == NULL)
1055 1056
                ERR_clear_error();
        }
1057
        if (crl_ext != NULL) {
1058 1059 1060 1061 1062 1063 1064 1065 1066
            /* Check syntax of file */
            X509V3_CTX ctx;
            X509V3_set_ctx_test(&ctx);
            X509V3_set_nconf(&ctx, conf);
            if (!X509V3_EXT_add_nconf(conf, &ctx, crl_ext, NULL)) {
                BIO_printf(bio_err,
                           "Error Loading CRL extension section %s\n",
                           crl_ext);
                ret = 1;
1067
                goto end;
1068 1069 1070 1071 1072 1073 1074
            }
        }

        if ((crlnumberfile = NCONF_get_string(conf, section, ENV_CRLNUMBER))
            != NULL)
            if ((crlnumber = load_serial(crlnumberfile, 0, NULL)) == NULL) {
                BIO_printf(bio_err, "error while loading CRL number\n");
1075
                goto end;
1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089
            }

        if (!crldays && !crlhours && !crlsec) {
            if (!NCONF_get_number(conf, section,
                                  ENV_DEFAULT_CRL_DAYS, &crldays))
                crldays = 0;
            if (!NCONF_get_number(conf, section,
                                  ENV_DEFAULT_CRL_HOURS, &crlhours))
                crlhours = 0;
            ERR_clear_error();
        }
        if ((crldays == 0) && (crlhours == 0) && (crlsec == 0)) {
            BIO_printf(bio_err,
                       "cannot lookup how long until the next CRL is issued\n");
1090
            goto end;
1091 1092 1093 1094 1095
        }

        if (verbose)
            BIO_printf(bio_err, "making CRL\n");
        if ((crl = X509_CRL_new()) == NULL)
1096
            goto end;
1097
        if (!X509_CRL_set_issuer_name(crl, X509_get_subject_name(x509)))
1098
            goto end;
1099 1100

        tmptm = ASN1_TIME_new();
1101
        if (tmptm == NULL)
1102
            goto end;
1103
        X509_gmtime_adj(tmptm, 0);
1104
        X509_CRL_set1_lastUpdate(crl, tmptm);
1105 1106 1107
        if (!X509_time_adj_ex(tmptm, crldays, crlhours * 60 * 60 + crlsec,
                              NULL)) {
            BIO_puts(bio_err, "error setting CRL nextUpdate\n");
1108
            goto end;
1109
        }
1110
        X509_CRL_set1_nextUpdate(crl, tmptm);
1111 1112 1113 1114 1115 1116 1117

        ASN1_TIME_free(tmptm);

        for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++) {
            pp = sk_OPENSSL_PSTRING_value(db->db->data, i);
            if (pp[DB_type][0] == DB_TYPE_REV) {
                if ((r = X509_REVOKED_new()) == NULL)
1118
                    goto end;
1119 1120
                j = make_revoked(r, pp[DB_rev_date]);
                if (!j)
1121
                    goto end;
1122 1123 1124
                if (j == 2)
                    crl_v2 = 1;
                if (!BN_hex2bn(&serial, pp[DB_serial]))
1125
                    goto end;
1126 1127 1128 1129
                tmpser = BN_to_ASN1_INTEGER(serial, NULL);
                BN_free(serial);
                serial = NULL;
                if (!tmpser)
1130
                    goto end;
1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147
                X509_REVOKED_set_serialNumber(r, tmpser);
                ASN1_INTEGER_free(tmpser);
                X509_CRL_add0_revoked(crl, r);
            }
        }

        /*
         * sort the data so it will be written in serial number order
         */
        X509_CRL_sort(crl);

        /* we now have a CRL */
        if (verbose)
            BIO_printf(bio_err, "signing CRL\n");

        /* Add any extensions asked for */

1148
        if (crl_ext != NULL || crlnumberfile != NULL) {
1149 1150 1151 1152
            X509V3_CTX crlctx;
            X509V3_set_ctx(&crlctx, x509, NULL, NULL, crl, 0);
            X509V3_set_nconf(&crlctx, conf);

1153
            if (crl_ext != NULL)
1154
                if (!X509V3_EXT_CRL_add_nconf(conf, &crlctx, crl_ext, crl))
1155
                    goto end;
1156 1157 1158
            if (crlnumberfile != NULL) {
                tmpser = BN_to_ASN1_INTEGER(crlnumber, NULL);
                if (!tmpser)
1159
                    goto end;
1160 1161 1162 1163
                X509_CRL_add1_ext_i2d(crl, NID_crl_number, tmpser, 0, 0);
                ASN1_INTEGER_free(tmpser);
                crl_v2 = 1;
                if (!BN_add_word(crlnumber, 1))
1164
                    goto end;
1165 1166
            }
        }
1167
        if (crl_ext != NULL || crl_v2) {
1168
            if (!X509_CRL_set_version(crl, 1))
1169
                goto end;       /* version 2 CRL */
1170 1171 1172 1173 1174
        }

        /* we have a CRL number that need updating */
        if (crlnumberfile != NULL)
            if (!save_serial(crlnumberfile, "new", crlnumber, NULL))
1175
                goto end;
1176

R
Rich Salz 已提交
1177 1178
        BN_free(crlnumber);
        crlnumber = NULL;
1179

1180 1181
        if (!do_X509_CRL_sign(crl, pkey, dgst, sigopts))
            goto end;
1182 1183 1184 1185 1186

        PEM_write_bio_X509_CRL(Sout, crl);

        if (crlnumberfile != NULL) /* Rename the crlnumber file */
            if (!rotate_serial(crlnumberfile, "new", "old"))
1187
                goto end;
1188 1189

    }
F
FdaSilvaYY 已提交
1190
    /*****************************************************************/
1191 1192 1193
    if (dorevoke) {
        if (infile == NULL) {
            BIO_printf(bio_err, "no input files\n");
1194
            goto end;
1195 1196
        } else {
            X509 *revcert;
1197
            revcert = load_cert(infile, FORMAT_PEM, infile);
1198
            if (revcert == NULL)
1199
                goto end;
1200
            if (dorevoke == 2)
1201
                rev_type = REV_VALID;
1202 1203
            j = do_revoke(revcert, db, rev_type, rev_arg);
            if (j <= 0)
1204
                goto end;
1205 1206 1207
            X509_free(revcert);

            if (!save_index(dbfile, "new", db))
1208
                goto end;
1209 1210

            if (!rotate_index(dbfile, "new", "old"))
1211
                goto end;
1212 1213 1214 1215

            BIO_printf(bio_err, "Data Base Updated\n");
        }
    }
F
FdaSilvaYY 已提交
1216
    /*****************************************************************/
1217
    ret = 0;
1218
 end:
1219 1220 1221
    BIO_free_all(Sout);
    BIO_free_all(out);
    BIO_free_all(in);
R
Rich Salz 已提交
1222
    sk_X509_pop_free(cert_sk, X509_free);
1223 1224 1225

    if (ret)
        ERR_print_errors(bio_err);
R
Rich Salz 已提交
1226
    if (free_key)
1227 1228 1229 1230
        OPENSSL_free(key);
    BN_free(serial);
    BN_free(crlnumber);
    free_index(db);
R
Rich Salz 已提交
1231
    sk_OPENSSL_STRING_free(sigopts);
1232
    EVP_PKEY_free(pkey);
R
Rich Salz 已提交
1233
    X509_free(x509);
1234 1235 1236
    X509_CRL_free(crl);
    NCONF_free(conf);
    NCONF_free(extconf);
1237
    release_engine(e);
1238
    return (ret);
1239
}
1240

1241
static char *lookup_conf(const CONF *conf, const char *section, const char *tag)
1242
{
1243 1244 1245 1246
    char *entry = NCONF_get_string(conf, section, tag);
    if (entry == NULL)
        BIO_printf(bio_err, "variable lookup failed for %s::%s\n", section, tag);
    return entry;
1247
}
1248

1249
static int certify(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,
1250 1251
                   const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
                   STACK_OF(CONF_VALUE) *policy, CA_DB *db,
1252 1253 1254 1255
                   BIGNUM *serial, const char *subj, unsigned long chtype,
                   int multirdn, int email_dn, const char *startdate,
                   const char *enddate,
                   long days, int batch, const char *ext_sect, CONF *lconf,
1256 1257 1258 1259 1260 1261 1262 1263
                   int verbose, unsigned long certopt, unsigned long nameopt,
                   int default_op, int ext_copy, int selfsign)
{
    X509_REQ *req = NULL;
    BIO *in = NULL;
    EVP_PKEY *pktmp = NULL;
    int ok = -1, i;

1264 1265 1266 1267
    in = BIO_new_file(infile, "r");
    if (in == NULL) {
        ERR_print_errors(bio_err);
        goto end;
1268 1269 1270 1271
    }
    if ((req = PEM_read_bio_X509_REQ(in, NULL, NULL, NULL)) == NULL) {
        BIO_printf(bio_err, "Error reading certificate request in %s\n",
                   infile);
1272
        goto end;
1273 1274
    }
    if (verbose)
1275
        X509_REQ_print_ex(bio_err, req, nameopt, X509_FLAG_COMPAT);
1276 1277 1278 1279 1280 1281 1282

    BIO_printf(bio_err, "Check that the request matches the signature\n");

    if (selfsign && !X509_REQ_check_private_key(req, pkey)) {
        BIO_printf(bio_err,
                   "Certificate request and CA private key do not match\n");
        ok = 0;
1283
        goto end;
1284
    }
F
FdaSilvaYY 已提交
1285
    if ((pktmp = X509_REQ_get0_pubkey(req)) == NULL) {
1286
        BIO_printf(bio_err, "error unpacking public key\n");
1287
        goto end;
1288 1289
    }
    i = X509_REQ_verify(req, pktmp);
F
FdaSilvaYY 已提交
1290
    pktmp = NULL;
1291 1292 1293 1294
    if (i < 0) {
        ok = 0;
        BIO_printf(bio_err, "Signature verification problems....\n");
        ERR_print_errors(bio_err);
1295
        goto end;
1296 1297 1298 1299 1300 1301
    }
    if (i == 0) {
        ok = 0;
        BIO_printf(bio_err,
                   "Signature did not match the certificate request\n");
        ERR_print_errors(bio_err);
1302
        goto end;
1303
    } else {
1304
        BIO_printf(bio_err, "Signature ok\n");
1305
    }
1306 1307 1308 1309 1310 1311

    ok = do_body(xret, pkey, x509, dgst, sigopts, policy, db, serial, subj,
                 chtype, multirdn, email_dn, startdate, enddate, days, batch,
                 verbose, req, ext_sect, lconf, certopt, nameopt, default_op,
                 ext_copy, selfsign);

1312
 end:
R
Rich Salz 已提交
1313
    X509_REQ_free(req);
R
Rich Salz 已提交
1314
    BIO_free(in);
1315 1316
    return (ok);
}
1317

1318
static int certify_cert(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,
1319 1320
                        const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
                        STACK_OF(CONF_VALUE) *policy, CA_DB *db,
1321 1322 1323
                        BIGNUM *serial, const char *subj, unsigned long chtype,
                        int multirdn, int email_dn, const char *startdate,
                        const char *enddate, long days, int batch, const char *ext_sect,
1324
                        CONF *lconf, int verbose, unsigned long certopt,
1325
                        unsigned long nameopt, int default_op, int ext_copy)
1326 1327 1328 1329 1330 1331
{
    X509 *req = NULL;
    X509_REQ *rreq = NULL;
    EVP_PKEY *pktmp = NULL;
    int ok = -1, i;

1332
    if ((req = load_cert(infile, FORMAT_PEM, infile)) == NULL)
1333
        goto end;
1334 1335 1336 1337 1338
    if (verbose)
        X509_print(bio_err, req);

    BIO_printf(bio_err, "Check that the request matches the signature\n");

D
Dr. Stephen Henson 已提交
1339
    if ((pktmp = X509_get0_pubkey(req)) == NULL) {
1340
        BIO_printf(bio_err, "error unpacking public key\n");
1341
        goto end;
1342 1343 1344 1345 1346
    }
    i = X509_verify(req, pktmp);
    if (i < 0) {
        ok = 0;
        BIO_printf(bio_err, "Signature verification problems....\n");
1347
        goto end;
1348 1349 1350 1351
    }
    if (i == 0) {
        ok = 0;
        BIO_printf(bio_err, "Signature did not match the certificate\n");
1352
        goto end;
1353
    } else {
1354
        BIO_printf(bio_err, "Signature ok\n");
1355
    }
1356

R
Rich Salz 已提交
1357
    if ((rreq = X509_to_X509_REQ(req, NULL, NULL)) == NULL)
1358
        goto end;
1359 1360 1361 1362 1363 1364

    ok = do_body(xret, pkey, x509, dgst, sigopts, policy, db, serial, subj,
                 chtype, multirdn, email_dn, startdate, enddate, days, batch,
                 verbose, rreq, ext_sect, lconf, certopt, nameopt, default_op,
                 ext_copy, 0);

1365
 end:
R
Rich Salz 已提交
1366 1367
    X509_REQ_free(rreq);
    X509_free(req);
1368 1369 1370 1371 1372 1373
    return (ok);
}

static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
                   const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
                   STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial,
1374 1375 1376
                   const char *subj, unsigned long chtype, int multirdn,
                   int email_dn, const char *startdate, const char *enddate, long days,
                   int batch, int verbose, X509_REQ *req, const char *ext_sect,
1377 1378 1379 1380 1381
                   CONF *lconf, unsigned long certopt, unsigned long nameopt,
                   int default_op, int ext_copy, int selfsign)
{
    X509_NAME *name = NULL, *CAname = NULL, *subject = NULL, *dn_subject =
        NULL;
1382
    const ASN1_TIME *tm;
1383 1384 1385
    ASN1_STRING *str, *str2;
    ASN1_OBJECT *obj;
    X509 *ret = NULL;
F
FdaSilvaYY 已提交
1386
    X509_NAME_ENTRY *ne, *tne;
1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403
    EVP_PKEY *pktmp;
    int ok = -1, i, j, last, nid;
    const char *p;
    CONF_VALUE *cv;
    OPENSSL_STRING row[DB_NUMBER];
    OPENSSL_STRING *irow = NULL;
    OPENSSL_STRING *rrow = NULL;
    char buf[25];

    for (i = 0; i < DB_NUMBER; i++)
        row[i] = NULL;

    if (subj) {
        X509_NAME *n = parse_name(subj, chtype, multirdn);

        if (!n) {
            ERR_print_errors(bio_err);
1404
            goto end;
1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418
        }
        X509_REQ_set_subject_name(req, n);
        X509_NAME_free(n);
    }

    if (default_op)
        BIO_printf(bio_err,
                   "The Subject's Distinguished Name is as follows\n");

    name = X509_REQ_get_subject_name(req);
    for (i = 0; i < X509_NAME_entry_count(name); i++) {
        ne = X509_NAME_get_entry(name, i);
        str = X509_NAME_ENTRY_get_data(ne);
        obj = X509_NAME_ENTRY_get_object(ne);
F
FdaSilvaYY 已提交
1419
        nid = OBJ_obj2nid(obj);
1420 1421 1422 1423 1424 1425 1426

        if (msie_hack) {
            /* assume all type should be strings */

            if (str->type == V_ASN1_UNIVERSALSTRING)
                ASN1_UNIVERSALSTRING_to_string(str);

F
FdaSilvaYY 已提交
1427
            if (str->type == V_ASN1_IA5STRING && nid != NID_pkcs9_emailAddress)
1428 1429
                str->type = V_ASN1_T61STRING;

F
FdaSilvaYY 已提交
1430 1431
            if (nid == NID_pkcs9_emailAddress
                && str->type == V_ASN1_PRINTABLESTRING)
1432 1433 1434 1435
                str->type = V_ASN1_IA5STRING;
        }

        /* If no EMAIL is wanted in the subject */
F
FdaSilvaYY 已提交
1436
        if (nid == NID_pkcs9_emailAddress && !email_dn)
1437 1438 1439
            continue;

        /* check some things */
F
FdaSilvaYY 已提交
1440
        if (nid == NID_pkcs9_emailAddress && str->type != V_ASN1_IA5STRING) {
1441 1442
            BIO_printf(bio_err,
                       "\nemailAddress type needs to be of type IA5STRING\n");
1443
            goto end;
1444
        }
F
FdaSilvaYY 已提交
1445
        if (str->type != V_ASN1_BMPSTRING && str->type != V_ASN1_UTF8STRING) {
1446
            j = ASN1_PRINTABLE_type(str->data, str->length);
F
FdaSilvaYY 已提交
1447 1448 1449
            if ((j == V_ASN1_T61STRING && str->type != V_ASN1_T61STRING) ||
                (j == V_ASN1_IA5STRING && str->type == V_ASN1_PRINTABLESTRING))
            {
1450 1451
                BIO_printf(bio_err,
                           "\nThe string contains characters that are illegal for the ASN.1 type\n");
1452
                goto end;
1453 1454 1455 1456
            }
        }

        if (default_op)
R
Rich Salz 已提交
1457
            old_entry_print(obj, str);
1458 1459 1460 1461 1462
    }

    /* Ok, now we check the 'policy' stuff. */
    if ((subject = X509_NAME_new()) == NULL) {
        BIO_printf(bio_err, "Memory allocation failure\n");
1463
        goto end;
1464 1465 1466 1467 1468 1469
    }

    /* take a copy of the issuer name before we mess with it. */
    if (selfsign)
        CAname = X509_NAME_dup(name);
    else
1470
        CAname = X509_NAME_dup(X509_get_subject_name(x509));
1471
    if (CAname == NULL)
1472
        goto end;
1473 1474 1475 1476 1477 1478 1479 1480
    str = str2 = NULL;

    for (i = 0; i < sk_CONF_VALUE_num(policy); i++) {
        cv = sk_CONF_VALUE_value(policy, i); /* get the object id */
        if ((j = OBJ_txt2nid(cv->name)) == NID_undef) {
            BIO_printf(bio_err,
                       "%s:unknown object type in 'policy' configuration\n",
                       cv->name);
1481
            goto end;
1482 1483 1484 1485 1486
        }
        obj = OBJ_nid2obj(j);

        last = -1;
        for (;;) {
F
FdaSilvaYY 已提交
1487 1488
            X509_NAME_ENTRY *push = NULL;

1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508
            /* lookup the object in the supplied name list */
            j = X509_NAME_get_index_by_OBJ(name, obj, last);
            if (j < 0) {
                if (last != -1)
                    break;
                tne = NULL;
            } else {
                tne = X509_NAME_get_entry(name, j);
            }
            last = j;

            /* depending on the 'policy', decide what to do. */
            if (strcmp(cv->value, "optional") == 0) {
                if (tne != NULL)
                    push = tne;
            } else if (strcmp(cv->value, "supplied") == 0) {
                if (tne == NULL) {
                    BIO_printf(bio_err,
                               "The %s field needed to be supplied and was missing\n",
                               cv->name);
1509
                    goto end;
1510
                } else {
1511
                    push = tne;
1512
                }
1513 1514 1515 1516 1517 1518 1519
            } else if (strcmp(cv->value, "match") == 0) {
                int last2;

                if (tne == NULL) {
                    BIO_printf(bio_err,
                               "The mandatory %s field was missing\n",
                               cv->name);
1520
                    goto end;
1521 1522 1523 1524 1525 1526 1527 1528
                }

                last2 = -1;

 again2:
                j = X509_NAME_get_index_by_OBJ(CAname, obj, last2);
                if ((j < 0) && (last2 == -1)) {
                    BIO_printf(bio_err,
F
FdaSilvaYY 已提交
1529 1530
                               "The %s field does not exist in the CA certificate,\n"
                               "the 'policy' is misconfigured\n",
1531
                               cv->name);
1532
                    goto end;
1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543
                }
                if (j >= 0) {
                    push = X509_NAME_get_entry(CAname, j);
                    str = X509_NAME_ENTRY_get_data(tne);
                    str2 = X509_NAME_ENTRY_get_data(push);
                    last2 = j;
                    if (ASN1_STRING_cmp(str, str2) != 0)
                        goto again2;
                }
                if (j < 0) {
                    BIO_printf(bio_err,
F
FdaSilvaYY 已提交
1544 1545
                               "The %s field is different between\n"
                               "CA certificate (%s) and the request (%s)\n",
1546 1547 1548
                               cv->name,
                               ((str2 == NULL) ? "NULL" : (char *)str2->data),
                               ((str == NULL) ? "NULL" : (char *)str->data));
1549
                    goto end;
1550 1551 1552 1553 1554
                }
            } else {
                BIO_printf(bio_err,
                           "%s:invalid type in 'policy' configuration\n",
                           cv->value);
1555
                goto end;
1556 1557 1558 1559
            }

            if (push != NULL) {
                if (!X509_NAME_add_entry(subject, push, -1, 0)) {
R
Rich Salz 已提交
1560
                    X509_NAME_ENTRY_free(push);
1561
                    BIO_printf(bio_err, "Memory allocation failure\n");
1562
                    goto end;
1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574
                }
            }
            if (j < 0)
                break;
        }
    }

    if (preserve) {
        X509_NAME_free(subject);
        /* subject=X509_NAME_dup(X509_REQ_get_subject_name(req)); */
        subject = X509_NAME_dup(name);
        if (subject == NULL)
1575
            goto end;
1576 1577 1578 1579 1580 1581
    }

    if (verbose)
        BIO_printf(bio_err,
                   "The subject name appears to be ok, checking data base for clashes\n");

1582
    /*
F
FdaSilvaYY 已提交
1583 1584
     * Build the correct Subject if no e-mail is wanted in the subject.
     * And add it later on because of the method extensions are added (altName)
1585 1586
     */

1587
    if (email_dn) {
1588
        dn_subject = subject;
1589
    } else {
1590 1591 1592 1593 1594
        X509_NAME_ENTRY *tmpne;
        /*
         * Its best to dup the subject DN and then delete any email addresses
         * because this retains its structure.
         */
1595
        if ((dn_subject = X509_NAME_dup(subject)) == NULL) {
1596
            BIO_printf(bio_err, "Memory allocation failure\n");
1597
            goto end;
1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608
        }
        while ((i = X509_NAME_get_index_by_NID(dn_subject,
                                               NID_pkcs9_emailAddress,
                                               -1)) >= 0) {
            tmpne = X509_NAME_get_entry(dn_subject, i);
            X509_NAME_delete_entry(dn_subject, i);
            X509_NAME_ENTRY_free(tmpne);
        }
    }

    if (BN_is_zero(serial))
R
Rich Salz 已提交
1609
        row[DB_serial] = OPENSSL_strdup("00");
1610 1611 1612 1613
    else
        row[DB_serial] = BN_bn2hex(serial);
    if (row[DB_serial] == NULL) {
        BIO_printf(bio_err, "Memory allocation failure\n");
1614
        goto end;
1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639
    }

    if (db->attributes.unique_subject) {
        OPENSSL_STRING *crow = row;

        rrow = TXT_DB_get_by_index(db->db, DB_name, crow);
        if (rrow != NULL) {
            BIO_printf(bio_err,
                       "ERROR:There is already a certificate for %s\n",
                       row[DB_name]);
        }
    }
    if (rrow == NULL) {
        rrow = TXT_DB_get_by_index(db->db, DB_serial, row);
        if (rrow != NULL) {
            BIO_printf(bio_err,
                       "ERROR:Serial number %s has already been issued,\n",
                       row[DB_serial]);
            BIO_printf(bio_err,
                       "      check the database/serial_file for corruption\n");
        }
    }

    if (rrow != NULL) {
        BIO_printf(bio_err, "The matching entry has the following details\n");
1640
        if (rrow[DB_type][0] == DB_TYPE_EXP)
1641
            p = "Expired";
1642
        else if (rrow[DB_type][0] == DB_TYPE_REV)
1643
            p = "Revoked";
1644
        else if (rrow[DB_type][0] == DB_TYPE_VAL)
1645 1646 1647 1648
            p = "Valid";
        else
            p = "\ninvalid type, Data base error\n";
        BIO_printf(bio_err, "Type          :%s\n", p);;
1649
        if (rrow[DB_type][0] == DB_TYPE_REV) {
1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671
            p = rrow[DB_exp_date];
            if (p == NULL)
                p = "undef";
            BIO_printf(bio_err, "Was revoked on:%s\n", p);
        }
        p = rrow[DB_exp_date];
        if (p == NULL)
            p = "undef";
        BIO_printf(bio_err, "Expires on    :%s\n", p);
        p = rrow[DB_serial];
        if (p == NULL)
            p = "undef";
        BIO_printf(bio_err, "Serial Number :%s\n", p);
        p = rrow[DB_file];
        if (p == NULL)
            p = "undef";
        BIO_printf(bio_err, "File name     :%s\n", p);
        p = rrow[DB_name];
        if (p == NULL)
            p = "undef";
        BIO_printf(bio_err, "Subject Name  :%s\n", p);
        ok = -1;                /* This is now a 'bad' error. */
1672
        goto end;
1673 1674 1675 1676 1677 1678 1679 1680
    }

    /* We are now totally happy, lets make and sign the certificate */
    if (verbose)
        BIO_printf(bio_err,
                   "Everything appears to be ok, creating and signing the certificate\n");

    if ((ret = X509_new()) == NULL)
1681
        goto end;
1682 1683

#ifdef X509_V3
1684 1685
    /* Make it an X509 v3 certificate. */
    if (!X509_set_version(ret, 2))
1686
        goto end;
1687 1688
#endif

1689
    if (BN_to_ASN1_INTEGER(serial, X509_get_serialNumber(ret)) == NULL)
1690
        goto end;
1691 1692
    if (selfsign) {
        if (!X509_set_issuer_name(ret, subject))
1693
            goto end;
1694 1695
    } else {
        if (!X509_set_issuer_name(ret, X509_get_subject_name(x509)))
1696
            goto end;
1697 1698
    }

1699 1700
    if (!set_cert_times(ret, startdate, enddate, days))
        goto end;
1701

1702
    if (enddate != NULL) {
1703
        int tdays;
1704
        ASN1_TIME_diff(&tdays, NULL, NULL, X509_get0_notAfter(ret));
1705 1706 1707 1708
        days = tdays;
    }

    if (!X509_set_subject_name(ret, subject))
1709
        goto end;
1710

D
Dr. Stephen Henson 已提交
1711
    pktmp = X509_REQ_get0_pubkey(req);
1712 1713
    i = X509_set_pubkey(ret, pktmp);
    if (!i)
1714
        goto end;
1715 1716 1717 1718

    /* Lets add the extensions, if there are any */
    if (ext_sect) {
        X509V3_CTX ctx;
1719
        X509_set_version(ret, 2);
1720 1721 1722 1723 1724 1725 1726

        /* Initialize the context structure */
        if (selfsign)
            X509V3_set_ctx(&ctx, ret, ret, req, NULL, 0);
        else
            X509V3_set_ctx(&ctx, x509, ret, req, NULL, 0);

1727
        if (extconf != NULL) {
1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742
            if (verbose)
                BIO_printf(bio_err, "Extra configuration file found\n");

            /* Use the extconf configuration db LHASH */
            X509V3_set_nconf(&ctx, extconf);

            /* Test the structure (needed?) */
            /* X509V3_set_ctx_test(&ctx); */

            /* Adds exts contained in the configuration file */
            if (!X509V3_EXT_add_nconf(extconf, &ctx, ext_sect, ret)) {
                BIO_printf(bio_err,
                           "ERROR: adding extensions in section %s\n",
                           ext_sect);
                ERR_print_errors(bio_err);
1743
                goto end;
1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756
            }
            if (verbose)
                BIO_printf(bio_err,
                           "Successfully added extensions from file.\n");
        } else if (ext_sect) {
            /* We found extensions to be set from config file */
            X509V3_set_nconf(&ctx, lconf);

            if (!X509V3_EXT_add_nconf(lconf, &ctx, ext_sect, ret)) {
                BIO_printf(bio_err,
                           "ERROR: adding extensions in section %s\n",
                           ext_sect);
                ERR_print_errors(bio_err);
1757
                goto end;
1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770
            }

            if (verbose)
                BIO_printf(bio_err,
                           "Successfully added extensions from config\n");
        }
    }

    /* Copy extensions from request (if any) */

    if (!copy_extensions(ret, req, ext_copy)) {
        BIO_printf(bio_err, "ERROR: adding extensions from request\n");
        ERR_print_errors(bio_err);
1771
        goto end;
1772 1773 1774 1775 1776
    }

    /* Set the right value for the noemailDN option */
    if (email_dn == 0) {
        if (!X509_set_subject_name(ret, dn_subject))
1777
            goto end;
1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789
    }

    if (!default_op) {
        BIO_printf(bio_err, "Certificate Details:\n");
        /*
         * Never print signature details because signature not present
         */
        certopt |= X509_FLAG_NO_SIGDUMP | X509_FLAG_NO_SIGNAME;
        X509_print_ex(bio_err, ret, nameopt, certopt);
    }

    BIO_printf(bio_err, "Certificate is to be certified until ");
1790
    ASN1_TIME_print(bio_err, X509_get0_notAfter(ret));
1791 1792 1793 1794 1795 1796 1797 1798 1799
    if (days)
        BIO_printf(bio_err, " (%ld days)", days);
    BIO_printf(bio_err, "\n");

    if (!batch) {

        BIO_printf(bio_err, "Sign the certificate? [y/n]:");
        (void)BIO_flush(bio_err);
        buf[0] = '\0';
1800
        if (fgets(buf, sizeof(buf), stdin) == NULL) {
1801 1802 1803
            BIO_printf(bio_err,
                       "CERTIFICATE WILL NOT BE CERTIFIED: I/O error\n");
            ok = 0;
1804
            goto end;
1805
        }
1806
        if (!(buf[0] == 'y' || buf[0] == 'Y')) {
1807 1808
            BIO_printf(bio_err, "CERTIFICATE WILL NOT BE CERTIFIED\n");
            ok = 0;
1809
            goto end;
1810 1811 1812
        }
    }

D
Dr. Stephen Henson 已提交
1813
    pktmp = X509_get0_pubkey(ret);
1814 1815 1816 1817
    if (EVP_PKEY_missing_parameters(pktmp) &&
        !EVP_PKEY_missing_parameters(pkey))
        EVP_PKEY_copy_parameters(pktmp, pkey);

1818 1819
    if (!do_X509_sign(ret, pkey, dgst, sigopts))
        goto end;
1820

1821
    /* We now just add it to the database as DB_TYPE_VAL('V') */
R
Rich Salz 已提交
1822
    row[DB_type] = OPENSSL_strdup("V");
1823
    tm = X509_get0_notAfter(ret);
R
Rich Salz 已提交
1824
    row[DB_exp_date] = app_malloc(tm->length + 1, "row expdate");
1825 1826 1827
    memcpy(row[DB_exp_date], tm->data, tm->length);
    row[DB_exp_date][tm->length] = '\0';
    row[DB_rev_date] = NULL;
R
Rich Salz 已提交
1828
    row[DB_file] = OPENSSL_strdup("unknown");
1829 1830 1831 1832 1833
    row[DB_name] = X509_NAME_oneline(X509_get_subject_name(ret), NULL, 0);

    if ((row[DB_type] == NULL) || (row[DB_exp_date] == NULL) ||
        (row[DB_file] == NULL) || (row[DB_name] == NULL)) {
        BIO_printf(bio_err, "Memory allocation failure\n");
1834
        goto end;
1835 1836
    }

R
Rich Salz 已提交
1837
    irow = app_malloc(sizeof(*irow) * (DB_NUMBER + 1), "row space");
B
Bernd Edlinger 已提交
1838
    for (i = 0; i < DB_NUMBER; i++)
1839 1840 1841 1842 1843 1844
        irow[i] = row[i];
    irow[DB_NUMBER] = NULL;

    if (!TXT_DB_insert(db->db, irow)) {
        BIO_printf(bio_err, "failed to update database\n");
        BIO_printf(bio_err, "TXT_DB error number %ld\n", db->db->error);
1845
        goto end;
1846
    }
B
Bernd Edlinger 已提交
1847
    irow = NULL;
1848
    ok = 1;
1849
 end:
B
Bernd Edlinger 已提交
1850 1851 1852 1853 1854
    if (irow != NULL) {
        for (i = 0; i < DB_NUMBER; i++)
            OPENSSL_free(row[i]);
        OPENSSL_free(irow);
    }
1855

R
Rich Salz 已提交
1856 1857 1858
    X509_NAME_free(CAname);
    X509_NAME_free(subject);
    if (dn_subject != subject)
1859
        X509_NAME_free(dn_subject);
R
Rich Salz 已提交
1860 1861 1862
    if (ok <= 0)
        X509_free(ret);
    else
1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879
        *xret = ret;
    return (ok);
}

static void write_new_certificate(BIO *bp, X509 *x, int output_der,
                                  int notext)
{

    if (output_der) {
        (void)i2d_X509_bio(bp, x);
        return;
    }
    if (!notext)
        X509_print(bp, x);
    PEM_write_bio_X509(bp, x);
}

1880
static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,
1881 1882 1883
                         X509 *x509, const EVP_MD *dgst,
                         STACK_OF(OPENSSL_STRING) *sigopts,
                         STACK_OF(CONF_VALUE) *policy, CA_DB *db,
1884 1885 1886
                         BIGNUM *serial, const char *subj, unsigned long chtype,
                         int multirdn, int email_dn, const char *startdate,
                         const char *enddate, long days, const char *ext_sect,
1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911
                         CONF *lconf, int verbose, unsigned long certopt,
                         unsigned long nameopt, int default_op, int ext_copy)
{
    STACK_OF(CONF_VALUE) *sk = NULL;
    LHASH_OF(CONF_VALUE) *parms = NULL;
    X509_REQ *req = NULL;
    CONF_VALUE *cv = NULL;
    NETSCAPE_SPKI *spki = NULL;
    char *type, *buf;
    EVP_PKEY *pktmp = NULL;
    X509_NAME *n = NULL;
    X509_NAME_ENTRY *ne = NULL;
    int ok = -1, i, j;
    long errline;
    int nid;

    /*
     * Load input file into a hash table.  (This is just an easy
     * way to read and parse the file, then put it into a convenient
     * STACK format).
     */
    parms = CONF_load(NULL, infile, &errline);
    if (parms == NULL) {
        BIO_printf(bio_err, "error on line %ld of %s\n", errline, infile);
        ERR_print_errors(bio_err);
1912
        goto end;
1913 1914 1915 1916 1917
    }

    sk = CONF_get_section(parms, "default");
    if (sk_CONF_VALUE_num(sk) == 0) {
        BIO_printf(bio_err, "no name/value pairs found in %s\n", infile);
1918
        goto end;
1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930
    }

    /*
     * Now create a dummy X509 request structure.  We don't actually
     * have an X509 request, but we have many of the components
     * (a public key, various DN components).  The idea is that we
     * put these components into the right X509 request structure
     * and we can use the same code as if you had a real X509 request.
     */
    req = X509_REQ_new();
    if (req == NULL) {
        ERR_print_errors(bio_err);
1931
        goto end;
1932 1933 1934 1935 1936
    }

    /*
     * Build up the subject name set.
     */
D
Dr. Stephen Henson 已提交
1937
    n = X509_REQ_get_subject_name(req);
1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963

    for (i = 0;; i++) {
        if (sk_CONF_VALUE_num(sk) <= i)
            break;

        cv = sk_CONF_VALUE_value(sk, i);
        type = cv->name;
        /*
         * Skip past any leading X. X: X, etc to allow for multiple instances
         */
        for (buf = cv->name; *buf; buf++)
            if ((*buf == ':') || (*buf == ',') || (*buf == '.')) {
                buf++;
                if (*buf)
                    type = buf;
                break;
            }

        buf = cv->value;
        if ((nid = OBJ_txt2nid(type)) == NID_undef) {
            if (strcmp(type, "SPKAC") == 0) {
                spki = NETSCAPE_SPKI_b64_decode(cv->value, -1);
                if (spki == NULL) {
                    BIO_printf(bio_err,
                               "unable to load Netscape SPKAC structure\n");
                    ERR_print_errors(bio_err);
1964
                    goto end;
1965 1966 1967 1968 1969 1970 1971
                }
            }
            continue;
        }

        if (!X509_NAME_add_entry_by_NID(n, nid, chtype,
                                        (unsigned char *)buf, -1, -1, 0))
1972
            goto end;
1973 1974 1975 1976
    }
    if (spki == NULL) {
        BIO_printf(bio_err, "Netscape SPKAC structure not found in %s\n",
                   infile);
1977
        goto end;
1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988
    }

    /*
     * Now extract the key from the SPKI structure.
     */

    BIO_printf(bio_err,
               "Check that the SPKAC request matches the signature\n");

    if ((pktmp = NETSCAPE_SPKI_get_pubkey(spki)) == NULL) {
        BIO_printf(bio_err, "error unpacking SPKAC public key\n");
1989
        goto end;
1990 1991 1992 1993
    }

    j = NETSCAPE_SPKI_verify(spki, pktmp);
    if (j <= 0) {
1994
        EVP_PKEY_free(pktmp);
1995 1996
        BIO_printf(bio_err,
                   "signature verification failed on SPKAC public key\n");
1997
        goto end;
1998 1999 2000 2001 2002 2003 2004 2005 2006
    }
    BIO_printf(bio_err, "Signature ok\n");

    X509_REQ_set_pubkey(req, pktmp);
    EVP_PKEY_free(pktmp);
    ok = do_body(xret, pkey, x509, dgst, sigopts, policy, db, serial, subj,
                 chtype, multirdn, email_dn, startdate, enddate, days, 1,
                 verbose, req, ext_sect, lconf, certopt, nameopt, default_op,
                 ext_copy, 0);
2007
 end:
R
Rich Salz 已提交
2008
    X509_REQ_free(req);
R
Rich Salz 已提交
2009 2010
    CONF_free(parms);
    NETSCAPE_SPKI_free(spki);
R
Rich Salz 已提交
2011
    X509_NAME_ENTRY_free(ne);
2012 2013 2014

    return (ok);
}
2015

D
Dr. Stephen Henson 已提交
2016
static int check_time_format(const char *str)
2017 2018 2019
{
    return ASN1_TIME_set_string(NULL, str);
}
2020

2021 2022
static int do_revoke(X509 *x509, CA_DB *db, REVINFO_TYPE rev_type,
                     const char *value)
2023
{
2024
    const ASN1_TIME *tm = NULL;
2025 2026 2027 2028 2029 2030 2031 2032 2033 2034
    char *row[DB_NUMBER], **rrow, **irow;
    char *rev_str = NULL;
    BIGNUM *bn = NULL;
    int ok = -1, i;

    for (i = 0; i < DB_NUMBER; i++)
        row[i] = NULL;
    row[DB_name] = X509_NAME_oneline(X509_get_subject_name(x509), NULL, 0);
    bn = ASN1_INTEGER_to_BN(X509_get_serialNumber(x509), NULL);
    if (!bn)
2035
        goto end;
2036
    if (BN_is_zero(bn))
R
Rich Salz 已提交
2037
        row[DB_serial] = OPENSSL_strdup("00");
2038 2039 2040 2041 2042
    else
        row[DB_serial] = BN_bn2hex(bn);
    BN_free(bn);
    if ((row[DB_name] == NULL) || (row[DB_serial] == NULL)) {
        BIO_printf(bio_err, "Memory allocation failure\n");
2043
        goto end;
2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054
    }
    /*
     * We have to lookup by serial number because name lookup skips revoked
     * certs
     */
    rrow = TXT_DB_get_by_index(db->db, DB_serial, row);
    if (rrow == NULL) {
        BIO_printf(bio_err,
                   "Adding Entry with serial number %s to DB for %s\n",
                   row[DB_serial], row[DB_name]);

2055
        /* We now just add it to the database as DB_TYPE_REV('V') */
R
Rich Salz 已提交
2056
        row[DB_type] = OPENSSL_strdup("V");
2057
        tm = X509_get0_notAfter(x509);
R
Rich Salz 已提交
2058
        row[DB_exp_date] = app_malloc(tm->length + 1, "row exp_data");
2059 2060 2061
        memcpy(row[DB_exp_date], tm->data, tm->length);
        row[DB_exp_date][tm->length] = '\0';
        row[DB_rev_date] = NULL;
R
Rich Salz 已提交
2062
        row[DB_file] = OPENSSL_strdup("unknown");
2063

2064 2065 2066 2067 2068
        if (row[DB_type] == NULL || row[DB_file] == NULL) {
            BIO_printf(bio_err, "Memory allocation failure\n");
            goto end;
        }

R
Rich Salz 已提交
2069
        irow = app_malloc(sizeof(*irow) * (DB_NUMBER + 1), "row ptr");
2070
        for (i = 0; i < DB_NUMBER; i++)
2071 2072 2073 2074 2075 2076
            irow[i] = row[i];
        irow[DB_NUMBER] = NULL;

        if (!TXT_DB_insert(db->db, irow)) {
            BIO_printf(bio_err, "failed to update database\n");
            BIO_printf(bio_err, "TXT_DB error number %ld\n", db->db->error);
2077
            OPENSSL_free(irow);
2078
            goto end;
2079 2080
        }

2081 2082 2083
        for (i = 0; i < DB_NUMBER; i++)
            row[i] = NULL;

2084
        /* Revoke Certificate */
2085
        if (rev_type == REV_VALID)
2086 2087
            ok = 1;
        else
2088 2089
            /* Retry revocation after DB insertion */
            ok = do_revoke(x509, db, rev_type, value);
2090

2091
        goto end;
2092 2093 2094

    } else if (index_name_cmp_noconst(row, rrow)) {
        BIO_printf(bio_err, "ERROR:name does not match %s\n", row[DB_name]);
2095
        goto end;
2096
    } else if (rev_type == REV_VALID) {
2097 2098
        BIO_printf(bio_err, "ERROR:Already present, serial number %s\n",
                   row[DB_serial]);
2099
        goto end;
2100
    } else if (rrow[DB_type][0] == DB_TYPE_REV) {
2101 2102
        BIO_printf(bio_err, "ERROR:Already revoked, serial number %s\n",
                   row[DB_serial]);
2103
        goto end;
2104 2105
    } else {
        BIO_printf(bio_err, "Revoking Certificate %s.\n", rrow[DB_serial]);
2106
        rev_str = make_revocation_str(rev_type, value);
2107 2108
        if (!rev_str) {
            BIO_printf(bio_err, "Error in revocation arguments\n");
2109
            goto end;
2110
        }
2111
        rrow[DB_type][0] = DB_TYPE_REV;
2112 2113 2114 2115
        rrow[DB_type][1] = '\0';
        rrow[DB_rev_date] = rev_str;
    }
    ok = 1;
2116
 end:
2117
    for (i = 0; i < DB_NUMBER; i++)
R
Rich Salz 已提交
2118
        OPENSSL_free(row[i]);
2119 2120
    return (ok);
}
2121

2122
static int get_certificate_status(const char *serial, CA_DB *db)
2123 2124 2125
{
    char *row[DB_NUMBER], **rrow;
    int ok = -1, i;
F
FdaSilvaYY 已提交
2126
    size_t serial_len = strlen(serial);
2127 2128 2129 2130 2131 2132

    /* Free Resources */
    for (i = 0; i < DB_NUMBER; i++)
        row[i] = NULL;

    /* Malloc needed char spaces */
F
FdaSilvaYY 已提交
2133
    row[DB_serial] = app_malloc(serial_len + 2, "row serial#");
2134

F
FdaSilvaYY 已提交
2135
    if (serial_len % 2) {
2136 2137
        /*
         * Set the first char to 0
2138
         */
2139 2140 2141
        row[DB_serial][0] = '0';

        /* Copy String from serial to row[DB_serial] */
F
FdaSilvaYY 已提交
2142 2143
        memcpy(row[DB_serial] + 1, serial, serial_len);
        row[DB_serial][serial_len + 1] = '\0';
2144 2145
    } else {
        /* Copy String from serial to row[DB_serial] */
F
FdaSilvaYY 已提交
2146 2147
        memcpy(row[DB_serial], serial, serial_len);
        row[DB_serial][serial_len] = '\0';
2148 2149 2150
    }

    /* Make it Upper Case */
2151
    make_uppercase(row[DB_serial]);
2152 2153 2154 2155 2156 2157 2158 2159

    ok = 1;

    /* Search for the certificate */
    rrow = TXT_DB_get_by_index(db->db, DB_serial, row);
    if (rrow == NULL) {
        BIO_printf(bio_err, "Serial %s not present in db.\n", row[DB_serial]);
        ok = -1;
2160
        goto end;
2161
    } else if (rrow[DB_type][0] == DB_TYPE_VAL) {
2162 2163
        BIO_printf(bio_err, "%s=Valid (%c)\n",
                   row[DB_serial], rrow[DB_type][0]);
2164
        goto end;
2165
    } else if (rrow[DB_type][0] == DB_TYPE_REV) {
2166 2167
        BIO_printf(bio_err, "%s=Revoked (%c)\n",
                   row[DB_serial], rrow[DB_type][0]);
2168
        goto end;
2169
    } else if (rrow[DB_type][0] == DB_TYPE_EXP) {
2170 2171
        BIO_printf(bio_err, "%s=Expired (%c)\n",
                   row[DB_serial], rrow[DB_type][0]);
2172
        goto end;
2173
    } else if (rrow[DB_type][0] == DB_TYPE_SUSP) {
2174 2175
        BIO_printf(bio_err, "%s=Suspended (%c)\n",
                   row[DB_serial], rrow[DB_type][0]);
2176
        goto end;
2177 2178 2179 2180 2181
    } else {
        BIO_printf(bio_err, "%s=Unknown (%c).\n",
                   row[DB_serial], rrow[DB_type][0]);
        ok = -1;
    }
2182
 end:
2183
    for (i = 0; i < DB_NUMBER; i++) {
R
Rich Salz 已提交
2184
        OPENSSL_free(row[i]);
2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196
    }
    return (ok);
}

static int do_updatedb(CA_DB *db)
{
    ASN1_UTCTIME *a_tm = NULL;
    int i, cnt = 0;
    int db_y2k, a_y2k;          /* flags = 1 if y >= 2000 */
    char **rrow, *a_tm_s;

    a_tm = ASN1_UTCTIME_new();
2197 2198
    if (a_tm == NULL)
        return -1;
2199 2200 2201

    /* get actual time and make a string */
    a_tm = X509_gmtime_adj(a_tm, 0);
2202
    a_tm_s = app_malloc(a_tm->length + 1, "time string");
2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214

    memcpy(a_tm_s, a_tm->data, a_tm->length);
    a_tm_s[a_tm->length] = '\0';

    if (strncmp(a_tm_s, "49", 2) <= 0)
        a_y2k = 1;
    else
        a_y2k = 0;

    for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++) {
        rrow = sk_OPENSSL_PSTRING_value(db->db->data, i);

2215
        if (rrow[DB_type][0] == DB_TYPE_VAL) {
2216 2217 2218 2219 2220 2221 2222 2223 2224
            /* ignore entries that are not valid */
            if (strncmp(rrow[DB_exp_date], "49", 2) <= 0)
                db_y2k = 1;
            else
                db_y2k = 0;

            if (db_y2k == a_y2k) {
                /* all on the same y2k side */
                if (strcmp(rrow[DB_exp_date], a_tm_s) <= 0) {
2225
                    rrow[DB_type][0] = DB_TYPE_EXP;
2226 2227 2228 2229 2230 2231
                    rrow[DB_type][1] = '\0';
                    cnt++;

                    BIO_printf(bio_err, "%s=Expired\n", rrow[DB_serial]);
                }
            } else if (db_y2k < a_y2k) {
2232
                rrow[DB_type][0] = DB_TYPE_EXP;
2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245
                rrow[DB_type][1] = '\0';
                cnt++;

                BIO_printf(bio_err, "%s=Expired\n", rrow[DB_serial]);
            }

        }
    }

    ASN1_UTCTIME_free(a_tm);
    OPENSSL_free(a_tm_s);
    return (cnt);
}
2246

N
Nils Larsch 已提交
2247
static const char *crl_reasons[] = {
2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260
    /* CRL reason strings */
    "unspecified",
    "keyCompromise",
    "CACompromise",
    "affiliationChanged",
    "superseded",
    "cessationOfOperation",
    "certificateHold",
    "removeFromCRL",
    /* Additional pseudo reasons */
    "holdInstruction",
    "keyTime",
    "CAkeyTime"
2261 2262
};

D
Dr. Stephen Henson 已提交
2263
#define NUM_REASONS OSSL_NELEM(crl_reasons)
2264

2265 2266 2267 2268 2269
/*
 * Given revocation information convert to a DB string. The format of the
 * string is: revtime[,reason,extra]. Where 'revtime' is the revocation time
 * (the current time). 'reason' is the optional CRL reason and 'extra' is any
 * additional argument
2270 2271
 */

2272
static char *make_revocation_str(REVINFO_TYPE rev_type, const char *rev_arg)
2273
{
2274
    char *str;
2275
    const char *reason = NULL, *other = NULL;
2276 2277 2278
    ASN1_OBJECT *otmp;
    ASN1_UTCTIME *revtm = NULL;
    int i;
2279

2280 2281
    switch (rev_type) {
    case REV_NONE:
2282
    case REV_VALID:
2283 2284 2285 2286
        break;

    case REV_CRL_REASON:
        for (i = 0; i < 8; i++) {
R
Rich Salz 已提交
2287
            if (strcasecmp(rev_arg, crl_reasons[i]) == 0) {
2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341
                reason = crl_reasons[i];
                break;
            }
        }
        if (reason == NULL) {
            BIO_printf(bio_err, "Unknown CRL reason %s\n", rev_arg);
            return NULL;
        }
        break;

    case REV_HOLD:
        /* Argument is an OID */
        otmp = OBJ_txt2obj(rev_arg, 0);
        ASN1_OBJECT_free(otmp);

        if (otmp == NULL) {
            BIO_printf(bio_err, "Invalid object identifier %s\n", rev_arg);
            return NULL;
        }

        reason = "holdInstruction";
        other = rev_arg;
        break;

    case REV_KEY_COMPROMISE:
    case REV_CA_COMPROMISE:
        /* Argument is the key compromise time  */
        if (!ASN1_GENERALIZEDTIME_set_string(NULL, rev_arg)) {
            BIO_printf(bio_err,
                       "Invalid time format %s. Need YYYYMMDDHHMMSSZ\n",
                       rev_arg);
            return NULL;
        }
        other = rev_arg;
        if (rev_type == REV_KEY_COMPROMISE)
            reason = "keyTime";
        else
            reason = "CAkeyTime";

        break;
    }

    revtm = X509_gmtime_adj(NULL, 0);

    if (!revtm)
        return NULL;

    i = revtm->length + 1;

    if (reason)
        i += strlen(reason) + 1;
    if (other)
        i += strlen(other) + 1;

R
Rich Salz 已提交
2342
    str = app_malloc(i, "revocation reason");
R
Rich Salz 已提交
2343
    OPENSSL_strlcpy(str, (char *)revtm->data, i);
2344
    if (reason) {
R
Rich Salz 已提交
2345 2346
        OPENSSL_strlcat(str, ",", i);
        OPENSSL_strlcat(str, reason, i);
2347 2348
    }
    if (other) {
R
Rich Salz 已提交
2349 2350
        OPENSSL_strlcat(str, ",", i);
        OPENSSL_strlcat(str, other, i);
2351 2352 2353 2354
    }
    ASN1_UTCTIME_free(revtm);
    return str;
}
2355

2356
/*-
2357
 * Convert revocation field to X509_REVOKED entry
2358 2359 2360 2361 2362 2363
 * return code:
 * 0 error
 * 1 OK
 * 2 OK and some extensions added (i.e. V2 CRL)
 */

2364
static int make_revoked(X509_REVOKED *rev, const char *str)
2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377
{
    char *tmp = NULL;
    int reason_code = -1;
    int i, ret = 0;
    ASN1_OBJECT *hold = NULL;
    ASN1_GENERALIZEDTIME *comp_time = NULL;
    ASN1_ENUMERATED *rtmp = NULL;

    ASN1_TIME *revDate = NULL;

    i = unpack_revinfo(&revDate, &reason_code, &hold, &comp_time, str);

    if (i == 0)
2378
        goto end;
2379 2380

    if (rev && !X509_REVOKED_set_revocationDate(rev, revDate))
2381
        goto end;
2382 2383 2384

    if (rev && (reason_code != OCSP_REVOKED_STATUS_NOSTATUS)) {
        rtmp = ASN1_ENUMERATED_new();
2385
        if (rtmp == NULL || !ASN1_ENUMERATED_set(rtmp, reason_code))
2386
            goto end;
2387
        if (!X509_REVOKED_add1_ext_i2d(rev, NID_crl_reason, rtmp, 0, 0))
2388
            goto end;
2389 2390 2391 2392 2393
    }

    if (rev && comp_time) {
        if (!X509_REVOKED_add1_ext_i2d
            (rev, NID_invalidity_date, comp_time, 0, 0))
2394
            goto end;
2395 2396 2397 2398
    }
    if (rev && hold) {
        if (!X509_REVOKED_add1_ext_i2d
            (rev, NID_hold_instruction_code, hold, 0, 0))
2399
            goto end;
2400 2401 2402 2403 2404 2405 2406
    }

    if (reason_code != OCSP_REVOKED_STATUS_NOSTATUS)
        ret = 2;
    else
        ret = 1;

2407
 end:
2408

R
Rich Salz 已提交
2409
    OPENSSL_free(tmp);
2410 2411 2412 2413 2414 2415 2416
    ASN1_OBJECT_free(hold);
    ASN1_GENERALIZEDTIME_free(comp_time);
    ASN1_ENUMERATED_free(rtmp);
    ASN1_TIME_free(revDate);

    return ret;
}
2417

F
FdaSilvaYY 已提交
2418
static int old_entry_print(const ASN1_OBJECT *obj, const ASN1_STRING *str)
2419
{
2420 2421
    char buf[25], *pbuf;
    const char *p;
2422
    int j;
2423

R
Rich Salz 已提交
2424
    j = i2a_ASN1_OBJECT(bio_err, obj);
2425 2426 2427 2428 2429
    pbuf = buf;
    for (j = 22 - j; j > 0; j--)
        *(pbuf++) = ' ';
    *(pbuf++) = ':';
    *(pbuf++) = '\0';
R
Rich Salz 已提交
2430
    BIO_puts(bio_err, buf);
2431 2432

    if (str->type == V_ASN1_PRINTABLESTRING)
R
Rich Salz 已提交
2433
        BIO_printf(bio_err, "PRINTABLE:'");
2434
    else if (str->type == V_ASN1_T61STRING)
R
Rich Salz 已提交
2435
        BIO_printf(bio_err, "T61STRING:'");
2436
    else if (str->type == V_ASN1_IA5STRING)
R
Rich Salz 已提交
2437
        BIO_printf(bio_err, "IA5STRING:'");
2438
    else if (str->type == V_ASN1_UNIVERSALSTRING)
R
Rich Salz 已提交
2439
        BIO_printf(bio_err, "UNIVERSALSTRING:'");
2440
    else
R
Rich Salz 已提交
2441
        BIO_printf(bio_err, "ASN.1 %2d:'", str->type);
2442

2443
    p = (const char *)str->data;
2444 2445
    for (j = str->length; j > 0; j--) {
        if ((*p >= ' ') && (*p <= '~'))
R
Rich Salz 已提交
2446
            BIO_printf(bio_err, "%c", *p);
2447
        else if (*p & 0x80)
R
Rich Salz 已提交
2448
            BIO_printf(bio_err, "\\0x%02X", *p);
2449
        else if ((unsigned char)*p == 0xf7)
R
Rich Salz 已提交
2450
            BIO_printf(bio_err, "^?");
2451
        else
R
Rich Salz 已提交
2452
            BIO_printf(bio_err, "^%c", *p + '@');
2453 2454
        p++;
    }
R
Rich Salz 已提交
2455
    BIO_printf(bio_err, "'\n");
2456 2457 2458 2459 2460 2461
    return 1;
}

int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
                   ASN1_GENERALIZEDTIME **pinvtm, const char *str)
{
2462
    char *tmp;
2463 2464 2465 2466 2467 2468 2469
    char *rtime_str, *reason_str = NULL, *arg_str = NULL, *p;
    int reason_code = -1;
    int ret = 0;
    unsigned int i;
    ASN1_OBJECT *hold = NULL;
    ASN1_GENERALIZEDTIME *comp_time = NULL;

R
Rich Salz 已提交
2470
    tmp = OPENSSL_strdup(str);
V
Viktor Dukhovni 已提交
2471
    if (!tmp) {
M
Matt Caswell 已提交
2472
        BIO_printf(bio_err, "memory allocation failure\n");
2473
        goto end;
M
Matt Caswell 已提交
2474 2475
    }

2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492
    p = strchr(tmp, ',');

    rtime_str = tmp;

    if (p) {
        *p = '\0';
        p++;
        reason_str = p;
        p = strchr(p, ',');
        if (p) {
            *p = '\0';
            arg_str = p + 1;
        }
    }

    if (prevtm) {
        *prevtm = ASN1_UTCTIME_new();
2493
        if (*prevtm == NULL) {
M
Matt Caswell 已提交
2494
            BIO_printf(bio_err, "memory allocation failure\n");
2495
            goto end;
M
Matt Caswell 已提交
2496
        }
2497 2498
        if (!ASN1_UTCTIME_set_string(*prevtm, rtime_str)) {
            BIO_printf(bio_err, "invalid revocation date %s\n", rtime_str);
2499
            goto end;
2500 2501 2502 2503
        }
    }
    if (reason_str) {
        for (i = 0; i < NUM_REASONS; i++) {
R
Rich Salz 已提交
2504
            if (strcasecmp(reason_str, crl_reasons[i]) == 0) {
2505 2506 2507 2508 2509 2510
                reason_code = i;
                break;
            }
        }
        if (reason_code == OCSP_REVOKED_STATUS_NOSTATUS) {
            BIO_printf(bio_err, "invalid reason code %s\n", reason_str);
2511
            goto end;
2512 2513
        }

2514
        if (reason_code == 7) {
2515
            reason_code = OCSP_REVOKED_STATUS_REMOVEFROMCRL;
2516
        } else if (reason_code == 8) { /* Hold instruction */
2517 2518
            if (!arg_str) {
                BIO_printf(bio_err, "missing hold instruction\n");
2519
                goto end;
2520 2521 2522 2523 2524 2525 2526
            }
            reason_code = OCSP_REVOKED_STATUS_CERTIFICATEHOLD;
            hold = OBJ_txt2obj(arg_str, 0);

            if (!hold) {
                BIO_printf(bio_err, "invalid object identifier %s\n",
                           arg_str);
2527
                goto end;
2528 2529 2530
            }
            if (phold)
                *phold = hold;
R
Rich Salz 已提交
2531 2532
            else
                ASN1_OBJECT_free(hold);
2533 2534 2535
        } else if ((reason_code == 9) || (reason_code == 10)) {
            if (!arg_str) {
                BIO_printf(bio_err, "missing compromised time\n");
2536
                goto end;
2537 2538
            }
            comp_time = ASN1_GENERALIZEDTIME_new();
2539
            if (comp_time == NULL) {
M
Matt Caswell 已提交
2540
                BIO_printf(bio_err, "memory allocation failure\n");
2541
                goto end;
M
Matt Caswell 已提交
2542
            }
2543 2544
            if (!ASN1_GENERALIZEDTIME_set_string(comp_time, arg_str)) {
                BIO_printf(bio_err, "invalid compromised time %s\n", arg_str);
2545
                goto end;
2546 2547 2548 2549 2550 2551 2552 2553 2554 2555
            }
            if (reason_code == 9)
                reason_code = OCSP_REVOKED_STATUS_KEYCOMPROMISE;
            else
                reason_code = OCSP_REVOKED_STATUS_CACOMPROMISE;
        }
    }

    if (preason)
        *preason = reason_code;
R
Rich Salz 已提交
2556
    if (pinvtm) {
2557
        *pinvtm = comp_time;
R
Rich Salz 已提交
2558 2559
        comp_time = NULL;
    }
2560 2561 2562

    ret = 1;

2563
 end:
2564

R
Rich Salz 已提交
2565
    OPENSSL_free(tmp);
R
Rich Salz 已提交
2566
    ASN1_GENERALIZEDTIME_free(comp_time);
2567 2568 2569

    return ret;
}