ca.c 82.4 KB
Newer Older
R
Rich Salz 已提交
1 2
/*
 * Copyright 1995-2016 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 31 32 33 34
# ifdef OPENSSL_SYS_VMS
#  if defined(__DECC)
#   include <unistd.h>
#  else
#   include <unixlib.h>
U
Ulf Möller 已提交
35
#  endif
R
Rich Salz 已提交
36
# elif !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_WINDOWS)
37 38
#  include <sys/file.h>
# endif
U
Ulf Möller 已提交
39 40
#endif

41 42
#include "apps.h"

U
Ulf Möller 已提交
43
#ifndef W_OK
44 45 46 47
# define F_OK 0
# define X_OK 1
# define W_OK 2
# define R_OK 4
48 49
#endif

50 51
#undef BSIZE
#define BSIZE 256
52

A
Alessandro Ghedini 已提交
53
#define BASE_SECTION            "ca"
54

55 56
#define ENV_DEFAULT_CA          "default_ca"

A
Alessandro Ghedini 已提交
57
#define STRING_MASK             "string_mask"
58 59 60
#define UTF8_IN                 "utf8"

#define ENV_NEW_CERTS_DIR       "new_certs_dir"
A
Alessandro Ghedini 已提交
61
#define ENV_CERTIFICATE         "certificate"
62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82
#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"
83

84
/* Additional revocation information types */
85 86 87 88 89 90 91 92
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;
93

94
static char *lookup_conf(const CONF *conf, const char *group, const char *tag);
95 96

static int certify(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,
97 98
                   const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
                   STACK_OF(CONF_VALUE) *policy, CA_DB *db,
99 100 101 102
                   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,
103 104
                   int verbose, unsigned long certopt, unsigned long nameopt,
                   int default_op, int ext_copy, int selfsign);
105
static int certify_cert(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,
106 107
                        const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
                        STACK_OF(CONF_VALUE) *policy, CA_DB *db,
108 109 110
                        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,
111
                        CONF *conf, int verbose, unsigned long certopt,
112
                        unsigned long nameopt, int default_op, int ext_copy);
113
static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,
114 115 116
                         X509 *x509, const EVP_MD *dgst,
                         STACK_OF(OPENSSL_STRING) *sigopts,
                         STACK_OF(CONF_VALUE) *policy, CA_DB *db,
117 118 119
                         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,
120 121 122 123 124
                         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,
125 126 127
                   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,
128 129
                   CONF *conf, unsigned long certopt, unsigned long nameopt,
                   int default_op, int ext_copy, int selfsign);
130 131
static int get_certificate_status(const char *ser_status, CA_DB *db);
static int do_updatedb(CA_DB *db);
D
Dr. Stephen Henson 已提交
132
static int check_time_format(const char *str);
133 134 135 136
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 已提交
137
static int old_entry_print(const ASN1_OBJECT *obj, const ASN1_STRING *str);
138
static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext);
139

140 141 142
static CONF *extconf = NULL;
static int preserve = 0;
static int msie_hack = 0;
143

144 145 146 147 148 149 150 151 152 153
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,
154 155
    /* Do not change the order here; see related case statements below */
    OPT_CRL_REASON, OPT_CRL_HOLD, OPT_CRL_COMPROMISE, OPT_CRL_CA_COMPROMISE
156 157
} OPTION_CHOICE;

F
FdaSilvaYY 已提交
158
const OPTIONS ca_options[] = {
159 160 161 162 163 164
    {"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 已提交
165
    {"create_serial", OPT_CREATE_SERIAL, '-',
F
FdaSilvaYY 已提交
166
     "If reading serial fails, create a new random serial"},
167 168 169 170 171 172 173 174
    {"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"},
175
    {"keyfile", OPT_KEYFILE, 's', "Private key"},
176
    {"keyform", OPT_KEYFORM, 'f', "Private key file format (PEM or ENGINE)"},
177
    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
178 179 180 181 182 183 184
    {"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"},
185 186
    {"sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form"},
    {"notext", OPT_NOTEXT, '-', "Do not print the generated certificate"},
187 188 189 190 191 192
    {"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"},
193 194 195
    {"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"},
196 197 198 199 200
    {"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)"},
201 202
    {"valid", OPT_VALID, 's',
     "Add a Valid(not-revoked) DB entry about a cert (given in file)"},
203 204 205 206 207 208 209 210
    {"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 已提交
211 212 213 214 215 216 217
    {"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"},
218 219 220 221 222
#ifndef OPENSSL_NO_ENGINE
    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
#endif
    {NULL}
};
223

224
int ca_main(int argc, char **argv)
225
{
F
FdaSilvaYY 已提交
226
    CONF *conf = NULL;
227
    ENGINE *e = NULL;
228
    BIGNUM *crlnumber = NULL, *serial = NULL;
229
    EVP_PKEY *pkey = NULL;
230
    BIO *in = NULL, *out = NULL, *Sout = NULL;
231
    ASN1_INTEGER *tmpser;
232 233 234
    ASN1_TIME *tmptm;
    CA_DB *db = NULL;
    DB_ATTR db_attr;
235 236
    STACK_OF(CONF_VALUE) *attribs = NULL;
    STACK_OF(OPENSSL_STRING) *sigopts = NULL;
237 238 239
    STACK_OF(X509) *cert_sk = NULL;
    X509_CRL *crl = NULL;
    const EVP_MD *dgst = NULL;
F
FdaSilvaYY 已提交
240
    char *configfile = default_config_file, *section = NULL;
R
Rich Salz 已提交
241
    char *md = NULL, *policy = NULL, *keyfile = NULL;
242 243 244
    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;
245
    char *outdir = NULL, *outfile = NULL, *rev_arg = NULL, *ser_status = NULL;
246 247
    const char *serialfile = NULL, *subj = NULL;
    char *prog, *startdate = NULL, *enddate = NULL;
F
FdaSilvaYY 已提交
248
    char *dbfile = NULL, *f, *randfile = NULL;
249 250
    char new_cert[BSIZE] = { 0 };
    char tmp[10 + 1] = "\0";
R
Rich Salz 已提交
251
    char *const *pp;
252 253 254 255 256
    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;
257
    int i, j, selfsign = 0;
R
Rich Salz 已提交
258
    long crldays = 0, crlhours = 0, crlsec = 0, days = 0;
259 260
    unsigned long chtype = MBSTRING_ASC, nameopt = 0, certopt = 0;
    X509 *x509 = NULL, *x509p = NULL, *x = NULL;
261
    REVINFO_TYPE rev_type = REV_NONE;
262 263
    X509_REVOKED *r = NULL;
    OPTION_CHOICE o;
264

265 266 267
    prog = opt_init(argc, argv, ca_options);
    while ((o = opt_next()) != OPT_EOF) {
        switch (o) {
F
FdaSilvaYY 已提交
268 269
        case OPT_EOF:
        case OPT_ERR:
270
opthelp:
F
FdaSilvaYY 已提交
271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299
            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;
300
        case OPT_CREATE_SERIAL:
301
            create_ser = 1;
302 303
            break;
        case OPT_MULTIVALUE_RDN:
304
            multirdn = 1;
305 306 307 308 309 310 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 337
            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;
        case OPT_KEY:
            key = opt_arg();
            break;
        case OPT_CERT:
            certfile = opt_arg();
            break;
        case OPT_SELFSIGN:
338
            selfsign = 1;
339 340 341 342 343 344
            break;
        case OPT_OUTDIR:
            outdir = opt_arg();
            break;
        case OPT_SIGOPT:
            if (sigopts == NULL)
345
                sigopts = sk_OPENSSL_STRING_new_null();
346 347 348 349 350
            if (sigopts == NULL
                || !sk_OPENSSL_STRING_push(sigopts, opt_arg()))
                goto end;
            break;
        case OPT_NOTEXT:
351
            notext = 1;
352 353
            break;
        case OPT_BATCH:
354
            batch = 1;
355 356
            break;
        case OPT_PRESERVEDN:
357
            preserve = 1;
358 359
            break;
        case OPT_NOEMAILDN:
360
            email_dn = 0;
361 362
            break;
        case OPT_GENCRL:
363
            gencrl = 1;
364 365
            break;
        case OPT_MSIE_HACK:
366 367
            msie_hack = 1;
            break;
368 369 370 371 372 373 374 375 376 377
        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:
378
            req = 1;
379 380 381
            goto end_of_options;
        case OPT_SS_CERT:
            ss_cert_file = opt_arg();
382
            req = 1;
383 384 385 386 387 388 389
            break;
        case OPT_SPKAC:
            spkac_file = opt_arg();
            req = 1;
            break;
        case OPT_REVOKE:
            infile = opt_arg();
390
            dorevoke = 1;
391 392 393
            break;
        case OPT_VALID:
            infile = opt_arg();
394
            dorevoke = 2;
395 396 397 398 399 400 401 402 403 404 405
            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:
406
            doupdatedb = 1;
407 408 409 410
            break;
        case OPT_CRLEXTS:
            crl_ext = opt_arg();
            break;
411
        case OPT_CRL_REASON:        /* := REV_CRL_REASON */
412 413 414 415
        case OPT_CRL_HOLD:
        case OPT_CRL_COMPROMISE:
        case OPT_CRL_CA_COMPROMISE:
            rev_arg = opt_arg();
416
            rev_type = (o - OPT_CRL_REASON) + REV_CRL_REASON;
417 418
            break;
        case OPT_ENGINE:
R
Rich Salz 已提交
419
            e = setup_engine(opt_arg(), 0);
420 421 422
            break;
        }
    }
423 424 425
end_of_options:
    argc = opt_num_rest();
    argv = opt_rest();
426 427

    BIO_printf(bio_err, "Using configuration from %s\n", configfile);
428 429 430

    if ((conf = app_load_config(configfile)) == NULL)
        goto end;
431
    if (configfile != default_config_file && !app_load_modules(conf))
432
        goto end;
433

434
    /* Lets get the config section we are using */
435 436 437
    if (section == NULL
        && (section = lookup_conf(conf, BASE_SECTION, ENV_DEFAULT_CA)) == NULL)
        goto end;
438 439 440 441 442 443 444 445 446 447

    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) {
448 449 450 451
                /*-
                BIO_printf(bio_err,"problems opening %s for extra oid's\n",p);
                ERR_print_errors(bio_err);
                */
452 453 454 455 456 457
                ERR_clear_error();
            } else {
                OBJ_create_objects(oid_bio);
                BIO_free(oid_bio);
            }
        }
458
        if (!add_oid_section(conf)) {
459
            ERR_print_errors(bio_err);
460
            goto end;
461 462 463 464 465 466
        }
    }

    randfile = NCONF_get_string(conf, BASE_SECTION, "RANDFILE");
    if (randfile == NULL)
        ERR_clear_error();
467
    app_RAND_load_file(randfile, 0);
468 469 470 471 472 473 474

    f = NCONF_get_string(conf, section, STRING_MASK);
    if (!f)
        ERR_clear_error();

    if (f && !ASN1_STRING_set_default_mask_asc(f)) {
        BIO_printf(bio_err, "Invalid global string mask setting %s\n", f);
475
        goto end;
476 477 478 479 480 481
    }

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

    db_attr.unique_subject = 1;
    p = NCONF_get_string(conf, section, ENV_UNIQUE_SUBJECT);
    if (p) {
        db_attr.unique_subject = parse_yesno(p, 1);
    } else
        ERR_clear_error();

F
FdaSilvaYY 已提交
493
    /*****************************************************************/
494 495
    /* report status of cert with serial number given on command line */
    if (ser_status) {
496
        dbfile = lookup_conf(conf, section, ENV_DATABASE);
F
FdaSilvaYY 已提交
497
        if (dbfile == NULL)
498
            goto end;
499

500 501
        db = load_index(dbfile, &db_attr);
        if (db == NULL)
502
            goto end;
503 504

        if (!index_index(db))
505
            goto end;
506 507 508

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

F
FdaSilvaYY 已提交
512
    /*****************************************************************/
513 514
    /* we definitely need a private key, so let's get it */

515 516
    if (keyfile == NULL
        && (keyfile = lookup_conf(conf, section, ENV_PRIVATE_KEY)) == NULL)
517
        goto end;
518

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

F
FdaSilvaYY 已提交
534
    /*****************************************************************/
535 536
    /* we need a certificate */
    if (!selfsign || spkac_file || ss_cert_file || gencrl) {
537 538
        if (certfile == NULL
            && (certfile = lookup_conf(conf, section, ENV_CERTIFICATE)) == NULL)
539
            goto end;
540

541
        x509 = load_cert(certfile, FORMAT_PEM, "CA certificate");
542
        if (x509 == NULL)
543
            goto end;
544 545 546 547

        if (!X509_check_private_key(x509, pkey)) {
            BIO_printf(bio_err,
                       "CA certificate and CA private key do not match\n");
548
            goto end;
549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569
        }
    }
    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);

    if (f) {
        if (!set_name_ex(&nameopt, f)) {
            BIO_printf(bio_err, "Invalid name options: \"%s\"\n", f);
570
            goto end;
571 572
        }
        default_op = 0;
573 574
    } else {
        nameopt = XN_FLAG_ONELINE;
575
        ERR_clear_error();
576
    }
577 578 579 580 581 582

    f = NCONF_get_string(conf, section, ENV_CERTOPT);

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

    f = NCONF_get_string(conf, section, ENV_EXTCOPY);

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

F
FdaSilvaYY 已提交
599
    /*****************************************************************/
600 601 602
    /* lookup where to write new certificates */
    if ((outdir == NULL) && (req)) {

603 604
        outdir = NCONF_get_string(conf, section, ENV_NEW_CERTS_DIR);
        if (outdir == NULL) {
605 606
            BIO_printf(bio_err,
                       "there needs to be defined a directory for new certificate to be placed in\n");
607
            goto end;
608
        }
609
#ifndef OPENSSL_SYS_VMS
610 611
        /*
         * outdir is a directory spec, but access() for VMS demands a
612 613 614 615
         * 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
616 617
         */
        if (app_isdir(outdir) <= 0) {
618
            BIO_printf(bio_err, "%s: %s is not a directory\n", prog, outdir);
619
            perror(outdir);
620
            goto end;
621
        }
622
#endif
623 624
    }

F
FdaSilvaYY 已提交
625
    /*****************************************************************/
626
    /* we need to load the database file */
627 628
    dbfile = lookup_conf(conf, section, ENV_DATABASE);
    if (dbfile == NULL)
629
        goto end;
630

631 632
    db = load_index(dbfile, &db_attr);
    if (db == NULL)
633
        goto end;
634 635 636 637 638 639 640 641

    /* 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);
642
            goto end;
643 644 645 646
        }
        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);
647
            goto end;
648 649 650
        }
        if (!check_time_format((char *)pp[DB_exp_date])) {
            BIO_printf(bio_err, "entry %d: invalid expiry date\n", i + 1);
651
            goto end;
652 653 654 655 656 657 658 659 660 661
        }
        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);
662
            goto end;
663
        }
R
Rich Salz 已提交
664
        for ( ; *p; p++) {
665
            if (!isxdigit(_UC(*p))) {
666
                BIO_printf(bio_err,
R
Rich Salz 已提交
667 668
                           "entry %d: bad char 0%o '%c' in serial number\n",
                           i + 1, *p, *p);
669
                goto end;
670 671 672 673
            }
        }
    }
    if (verbose) {
674
        TXT_DB_write(bio_out, db->db);
675 676 677 678 679 680
        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))
681
        goto end;
682

F
FdaSilvaYY 已提交
683
    /*****************************************************************/
684 685 686 687 688 689 690 691
    /* 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");
692
            goto end;
693 694 695 696 697
        } else if (i == 0) {
            if (verbose)
                BIO_printf(bio_err, "No entries found to mark expired\n");
        } else {
            if (!save_index(dbfile, "new", db))
698
                goto end;
699 700

            if (!rotate_index(dbfile, "new", "old"))
701
                goto end;
702 703 704 705 706 707 708

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

R
Rich Salz 已提交
709
    /*****************************************************************/
710 711
    /* Read extensions config file                                   */
    if (extfile) {
R
Rich Salz 已提交
712
        if ((extconf = app_load_config(extfile)) == NULL) {
713
            ret = 1;
714
            goto end;
715 716 717 718 719 720 721
        }

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

        /* We can have sections in the ext file */
722 723 724 725 726
        if (extensions == NULL) {
            extensions = NCONF_get_string(extconf, "default", "extensions");
            if (extensions == NULL)
                extensions = "default";
        }
727 728
    }

729
    /*****************************************************************/
730
    if (req || gencrl) {
731 732
        /* FIXME: Is it really always text? */
        Sout = bio_open_default(outfile, 'w', FORMAT_TEXT);
733 734
        if (Sout == NULL)
            goto end;
735 736
    }

737 738
    if (md == NULL
        && (md = lookup_conf(conf, section, ENV_DEFAULT_MD)) == NULL)
739
        goto end;
740

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

750 751
    if (!opt_md(md, &dgst)) {
        goto end;
752 753 754
    }

    if (req) {
755 756 757 758 759
        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)
760 761 762 763
                email_dn = 0;
        }
        if (verbose)
            BIO_printf(bio_err, "message digest is %s\n",
764
                       OBJ_nid2ln(EVP_MD_type(dgst)));
765 766
        if (policy == NULL
            && (policy = lookup_conf(conf, section, ENV_POLICY)) == NULL)
767
            goto end;
768

769 770 771
        if (verbose)
            BIO_printf(bio_err, "policy is %s\n", policy);

772 773
        serialfile = lookup_conf(conf, section, ENV_SERIAL);
        if (serialfile == NULL)
774
            goto end;
775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795

        if (!extconf) {
            /*
             * no '-extfile' option, so we look for extensions in the main
             * configuration file
             */
            if (!extensions) {
                extensions = NCONF_get_string(conf, section, ENV_EXTENSIONS);
                if (!extensions)
                    ERR_clear_error();
            }
            if (extensions) {
                /* 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;
796
                    goto end;
797 798 799 800 801 802 803 804 805 806 807 808 809
                }
            }
        }

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

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

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

        if ((serial = load_serial(serialfile, create_ser, NULL)) == NULL) {
            BIO_printf(bio_err, "error while loading serial number\n");
838
            goto end;
839 840 841 842 843 844
        }
        if (verbose) {
            if (BN_is_zero(serial))
                BIO_printf(bio_err, "next serial number is 00\n");
            else {
                if ((f = BN_bn2hex(serial)) == NULL)
845
                    goto end;
846 847 848 849 850 851 852
                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);
853
            goto end;
854 855 856 857
        }

        if ((cert_sk = sk_X509_new_null()) == NULL) {
            BIO_printf(bio_err, "Memory allocation failure\n");
858
            goto end;
859 860 861 862 863 864 865 866 867
        }
        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,
                              conf, verbose, certopt, nameopt, default_op,
                              ext_copy);
            if (j < 0)
868
                goto end;
869 870 871 872
            if (j > 0) {
                total_done++;
                BIO_printf(bio_err, "\n");
                if (!BN_add_word(serial, 1))
873
                    goto end;
874 875
                if (!sk_X509_push(cert_sk, x)) {
                    BIO_printf(bio_err, "Memory allocation failure\n");
876
                    goto end;
877 878 879 880 881 882 883 884 885 886 887 888 889 890
                }
                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,
                             conf, verbose, certopt, nameopt, default_op,
891
                             ext_copy);
892
            if (j < 0)
893
                goto end;
894 895 896 897
            if (j > 0) {
                total_done++;
                BIO_printf(bio_err, "\n");
                if (!BN_add_word(serial, 1))
898
                    goto end;
899 900
                if (!sk_X509_push(cert_sk, x)) {
                    BIO_printf(bio_err, "Memory allocation failure\n");
901
                    goto end;
902 903 904 905 906 907 908 909 910 911
                }
            }
        }
        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,
                        certopt, nameopt, default_op, ext_copy, selfsign);
            if (j < 0)
912
                goto end;
913 914 915 916
            if (j > 0) {
                total_done++;
                BIO_printf(bio_err, "\n");
                if (!BN_add_word(serial, 1))
917
                    goto end;
918 919
                if (!sk_X509_push(cert_sk, x)) {
                    BIO_printf(bio_err, "Memory allocation failure\n");
920
                    goto end;
921 922 923 924 925 926 927 928 929 930
                }
            }
        }
        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,
                        certopt, nameopt, default_op, ext_copy, selfsign);
            if (j < 0)
931
                goto end;
932 933 934 935
            if (j > 0) {
                total_done++;
                BIO_printf(bio_err, "\n");
                if (!BN_add_word(serial, 1))
936
                    goto end;
937 938
                if (!sk_X509_push(cert_sk, x)) {
                    BIO_printf(bio_err, "Memory allocation failure\n");
939
                    goto end;
940 941 942 943 944 945 946 947 948 949 950 951 952 953
                }
            }
        }
        /*
         * 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);
954 955
                tmp[0] = '\0';
                if (fgets(tmp, sizeof(tmp), stdin) == NULL) {
956 957 958
                    BIO_printf(bio_err,
                               "CERTIFICATION CANCELED: I/O error\n");
                    ret = 0;
959
                    goto end;
960
                }
961
                if (tmp[0] != 'y' && tmp[0] != 'Y') {
962 963
                    BIO_printf(bio_err, "CERTIFICATION CANCELED\n");
                    ret = 0;
964
                    goto end;
965 966 967 968 969 970 971
                }
            }

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

            if (!save_serial(serialfile, "new", serial, NULL))
972
                goto end;
973 974

            if (!save_index(dbfile, "new", db))
975
                goto end;
976 977 978 979 980
        }

        if (verbose)
            BIO_printf(bio_err, "writing new certificates\n");
        for (i = 0; i < sk_X509_num(cert_sk); i++) {
981
            BIO *Cout = NULL;
982
            ASN1_INTEGER *serialNumber = X509_get_serialNumber(x);
983 984 985 986 987
            int k;
            char *n;

            x = sk_X509_value(cert_sk, i);

988
            j = ASN1_STRING_length(serialNumber);
989
            p = (const char *)ASN1_STRING_get0_data(serialNumber);
990 991 992

            if (strlen(outdir) >= (size_t)(j ? BSIZE - j * 2 - 6 : BSIZE - 8)) {
                BIO_printf(bio_err, "certificate file name too long\n");
993
                goto end;
994 995
            }

996
            strcpy(new_cert, outdir);
997
#ifndef OPENSSL_SYS_VMS
998
            OPENSSL_strlcat(new_cert, "/", sizeof(new_cert));
U
Ulf Möller 已提交
999 1000
#endif

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

1023
            Cout = BIO_new_file(new_cert, "w");
1024
            if (Cout == NULL) {
1025
                perror(new_cert);
1026
                goto end;
1027 1028 1029
            }
            write_new_certificate(Cout, x, 0, notext);
            write_new_certificate(Sout, x, output_der, notext);
1030
            BIO_free_all(Cout);
1031 1032 1033 1034 1035
        }

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

            if (!rotate_index(dbfile, "new", "old"))
1039
                goto end;
1040 1041 1042 1043 1044

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

F
FdaSilvaYY 已提交
1045
    /*****************************************************************/
1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062
    if (gencrl) {
        int crl_v2 = 0;
        if (!crl_ext) {
            crl_ext = NCONF_get_string(conf, section, ENV_CRLEXT);
            if (!crl_ext)
                ERR_clear_error();
        }
        if (crl_ext) {
            /* 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;
1063
                goto end;
1064 1065 1066 1067 1068 1069 1070
            }
        }

        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");
1071
                goto end;
1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085
            }

        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");
1086
            goto end;
1087 1088 1089 1090 1091
        }

        if (verbose)
            BIO_printf(bio_err, "making CRL\n");
        if ((crl = X509_CRL_new()) == NULL)
1092
            goto end;
1093
        if (!X509_CRL_set_issuer_name(crl, X509_get_subject_name(x509)))
1094
            goto end;
1095 1096

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

        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)
1114
                    goto end;
1115 1116
                j = make_revoked(r, pp[DB_rev_date]);
                if (!j)
1117
                    goto end;
1118 1119 1120
                if (j == 2)
                    crl_v2 = 1;
                if (!BN_hex2bn(&serial, pp[DB_serial]))
1121
                    goto end;
1122 1123 1124 1125
                tmpser = BN_to_ASN1_INTEGER(serial, NULL);
                BN_free(serial);
                serial = NULL;
                if (!tmpser)
1126
                    goto end;
1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150
                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 */

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

            if (crl_ext)
                if (!X509V3_EXT_CRL_add_nconf(conf, &crlctx, crl_ext, crl))
1151
                    goto end;
1152 1153 1154
            if (crlnumberfile != NULL) {
                tmpser = BN_to_ASN1_INTEGER(crlnumber, NULL);
                if (!tmpser)
1155
                    goto end;
1156 1157 1158 1159
                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))
1160
                    goto end;
1161 1162 1163 1164
            }
        }
        if (crl_ext || crl_v2) {
            if (!X509_CRL_set_version(crl, 1))
1165
                goto end;       /* version 2 CRL */
1166 1167 1168 1169 1170
        }

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

R
Rich Salz 已提交
1173 1174
        BN_free(crlnumber);
        crlnumber = NULL;
1175

1176 1177
        if (!do_X509_CRL_sign(crl, pkey, dgst, sigopts))
            goto end;
1178 1179 1180 1181 1182

        PEM_write_bio_X509_CRL(Sout, crl);

        if (crlnumberfile != NULL) /* Rename the crlnumber file */
            if (!rotate_serial(crlnumberfile, "new", "old"))
1183
                goto end;
1184 1185

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

            if (!save_index(dbfile, "new", db))
1204
                goto end;
1205 1206

            if (!rotate_index(dbfile, "new", "old"))
1207
                goto end;
1208 1209 1210 1211

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

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

1238
static char *lookup_conf(const CONF *conf, const char *section, const char *tag)
1239
{
1240 1241 1242 1243
    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;
1244
}
1245

1246
static int certify(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,
1247 1248
                   const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
                   STACK_OF(CONF_VALUE) *policy, CA_DB *db,
1249 1250 1251 1252
                   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,
1253 1254 1255 1256 1257 1258 1259 1260
                   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;

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

    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;
1280
        goto end;
1281
    }
F
FdaSilvaYY 已提交
1282
    if ((pktmp = X509_REQ_get0_pubkey(req)) == NULL) {
1283
        BIO_printf(bio_err, "error unpacking public key\n");
1284
        goto end;
1285 1286
    }
    i = X509_REQ_verify(req, pktmp);
F
FdaSilvaYY 已提交
1287
    pktmp = NULL;
1288 1289 1290 1291
    if (i < 0) {
        ok = 0;
        BIO_printf(bio_err, "Signature verification problems....\n");
        ERR_print_errors(bio_err);
1292
        goto end;
1293 1294 1295 1296 1297 1298
    }
    if (i == 0) {
        ok = 0;
        BIO_printf(bio_err,
                   "Signature did not match the certificate request\n");
        ERR_print_errors(bio_err);
1299
        goto end;
1300 1301 1302 1303 1304 1305 1306 1307
    } else
        BIO_printf(bio_err, "Signature ok\n");

    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);

1308
 end:
R
Rich Salz 已提交
1309
    X509_REQ_free(req);
R
Rich Salz 已提交
1310
    BIO_free(in);
1311 1312
    return (ok);
}
1313

1314
static int certify_cert(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,
1315 1316
                        const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
                        STACK_OF(CONF_VALUE) *policy, CA_DB *db,
1317 1318 1319
                        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,
1320
                        CONF *lconf, int verbose, unsigned long certopt,
1321
                        unsigned long nameopt, int default_op, int ext_copy)
1322 1323 1324 1325 1326 1327
{
    X509 *req = NULL;
    X509_REQ *rreq = NULL;
    EVP_PKEY *pktmp = NULL;
    int ok = -1, i;

1328
    if ((req = load_cert(infile, FORMAT_PEM, infile)) == NULL)
1329
        goto end;
1330 1331 1332 1333 1334
    if (verbose)
        X509_print(bio_err, req);

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

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

R
Rich Salz 已提交
1352
    if ((rreq = X509_to_X509_REQ(req, NULL, NULL)) == NULL)
1353
        goto end;
1354 1355 1356 1357 1358 1359

    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);

1360
 end:
R
Rich Salz 已提交
1361 1362
    X509_REQ_free(rreq);
    X509_free(req);
1363 1364 1365 1366 1367 1368
    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,
1369 1370 1371
                   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,
1372 1373 1374 1375 1376
                   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;
1377
    const ASN1_TIME *tm;
1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399
    ASN1_STRING *str, *str2;
    ASN1_OBJECT *obj;
    X509 *ret = NULL;
    X509_NAME_ENTRY *ne;
    X509_NAME_ENTRY *tne, *push;
    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);
1400
            goto end;
1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417
        }
        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);

        if (msie_hack) {
            /* assume all type should be strings */
D
Dr. Stephen Henson 已提交
1418
            nid = OBJ_obj2nid(X509_NAME_ENTRY_get_object(ne));
1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440

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

            if ((str->type == V_ASN1_IA5STRING) &&
                (nid != NID_pkcs9_emailAddress))
                str->type = V_ASN1_T61STRING;

            if ((nid == NID_pkcs9_emailAddress) &&
                (str->type == V_ASN1_PRINTABLESTRING))
                str->type = V_ASN1_IA5STRING;
        }

        /* If no EMAIL is wanted in the subject */
        if ((OBJ_obj2nid(obj) == NID_pkcs9_emailAddress) && (!email_dn))
            continue;

        /* check some things */
        if ((OBJ_obj2nid(obj) == NID_pkcs9_emailAddress) &&
            (str->type != V_ASN1_IA5STRING)) {
            BIO_printf(bio_err,
                       "\nemailAddress type needs to be of type IA5STRING\n");
1441
            goto end;
1442 1443 1444 1445 1446 1447 1448 1449 1450 1451
        }
        if ((str->type != V_ASN1_BMPSTRING)
            && (str->type != V_ASN1_UTF8STRING)) {
            j = ASN1_PRINTABLE_type(str->data, str->length);
            if (((j == V_ASN1_T61STRING) &&
                 (str->type != V_ASN1_T61STRING)) ||
                ((j == V_ASN1_IA5STRING) &&
                 (str->type == V_ASN1_PRINTABLESTRING))) {
                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 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507
        }
        obj = OBJ_nid2obj(j);

        last = -1;
        for (;;) {
            /* 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. */
            push = NULL;
            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);
1508
                    goto end;
1509 1510 1511 1512 1513 1514 1515 1516 1517
                } else
                    push = tne;
            } 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);
1518
                    goto end;
1519 1520 1521 1522 1523 1524 1525 1526
                }

                last2 = -1;

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

            if (push != NULL) {
                if (!X509_NAME_add_entry(subject, push, -1, 0)) {
R
Rich Salz 已提交
1558
                    X509_NAME_ENTRY_free(push);
1559
                    BIO_printf(bio_err, "Memory allocation failure\n");
1560
                    goto end;
1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572
                }
            }
            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)
1573
            goto end;
1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593
    }

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

    /* 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)
     */

    if (email_dn)
        dn_subject = subject;
    else {
        X509_NAME_ENTRY *tmpne;
        /*
         * Its best to dup the subject DN and then delete any email addresses
         * because this retains its structure.
         */
1594
        if ((dn_subject = X509_NAME_dup(subject)) == NULL) {
1595
            BIO_printf(bio_err, "Memory allocation failure\n");
1596
            goto end;
1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607
        }
        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 已提交
1608
        row[DB_serial] = OPENSSL_strdup("00");
1609 1610 1611 1612
    else
        row[DB_serial] = BN_bn2hex(serial);
    if (row[DB_serial] == NULL) {
        BIO_printf(bio_err, "Memory allocation failure\n");
1613
        goto end;
1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638
    }

    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");
1639
        if (rrow[DB_type][0] == DB_TYPE_EXP)
1640
            p = "Expired";
1641
        else if (rrow[DB_type][0] == DB_TYPE_REV)
1642
            p = "Revoked";
1643
        else if (rrow[DB_type][0] == DB_TYPE_VAL)
1644 1645 1646 1647
            p = "Valid";
        else
            p = "\ninvalid type, Data base error\n";
        BIO_printf(bio_err, "Type          :%s\n", p);;
1648
        if (rrow[DB_type][0] == DB_TYPE_REV) {
1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670
            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. */
1671
        goto end;
1672 1673 1674 1675 1676 1677 1678 1679
    }

    /* 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)
1680
        goto end;
1681 1682

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

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

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

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

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

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

    /* Lets add the extensions, if there are any */
    if (ext_sect) {
        X509V3_CTX ctx;
1718
        X509_set_version(ret, 2);
1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741

        /* 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);

        if (extconf) {
            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);
1742
                goto end;
1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755
            }
            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);
1756
                goto end;
1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769
            }

            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);
1770
        goto end;
1771 1772 1773 1774 1775
    }

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

    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 ");
1789
    ASN1_TIME_print(bio_err, X509_get0_notAfter(ret));
1790 1791 1792 1793 1794 1795 1796 1797 1798
    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';
1799
        if (fgets(buf, sizeof(buf), stdin) == NULL) {
1800 1801 1802
            BIO_printf(bio_err,
                       "CERTIFICATE WILL NOT BE CERTIFIED: I/O error\n");
            ok = 0;
1803
            goto end;
1804
        }
1805
        if (!(buf[0] == 'y' || buf[0] == 'Y')) {
1806 1807
            BIO_printf(bio_err, "CERTIFICATE WILL NOT BE CERTIFIED\n");
            ok = 0;
1808
            goto end;
1809 1810 1811
        }
    }

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

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

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

R
Rich Salz 已提交
1836
    irow = app_malloc(sizeof(*irow) * (DB_NUMBER + 1), "row space");
1837 1838 1839 1840 1841 1842 1843 1844 1845
    for (i = 0; i < DB_NUMBER; i++) {
        irow[i] = row[i];
        row[i] = NULL;
    }
    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);
1846
        goto end;
1847 1848
    }
    ok = 1;
1849
 end:
1850
    for (i = 0; i < DB_NUMBER; i++)
R
Rich Salz 已提交
1851
        OPENSSL_free(row[i]);
1852

R
Rich Salz 已提交
1853 1854 1855
    X509_NAME_free(CAname);
    X509_NAME_free(subject);
    if (dn_subject != subject)
1856
        X509_NAME_free(dn_subject);
R
Rich Salz 已提交
1857 1858 1859
    if (ok <= 0)
        X509_free(ret);
    else
1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876
        *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);
}

1877
static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,
1878 1879 1880
                         X509 *x509, const EVP_MD *dgst,
                         STACK_OF(OPENSSL_STRING) *sigopts,
                         STACK_OF(CONF_VALUE) *policy, CA_DB *db,
1881 1882 1883
                         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,
1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908
                         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);
1909
        goto end;
1910 1911 1912 1913 1914
    }

    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);
1915
        goto end;
1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927
    }

    /*
     * 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);
1928
        goto end;
1929 1930 1931 1932 1933
    }

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

    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);
1961
                    goto end;
1962 1963 1964 1965 1966 1967 1968
                }
            }
            continue;
        }

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

    /*
     * 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");
1986
        goto end;
1987 1988 1989 1990
    }

    j = NETSCAPE_SPKI_verify(spki, pktmp);
    if (j <= 0) {
1991
        EVP_PKEY_free(pktmp);
1992 1993
        BIO_printf(bio_err,
                   "signature verification failed on SPKAC public key\n");
1994
        goto end;
1995 1996 1997 1998 1999 2000 2001 2002 2003
    }
    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);
2004
 end:
R
Rich Salz 已提交
2005
    X509_REQ_free(req);
R
Rich Salz 已提交
2006 2007
    CONF_free(parms);
    NETSCAPE_SPKI_free(spki);
R
Rich Salz 已提交
2008
    X509_NAME_ENTRY_free(ne);
2009 2010 2011

    return (ok);
}
2012

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

2018 2019
static int do_revoke(X509 *x509, CA_DB *db, REVINFO_TYPE rev_type,
                     const char *value)
2020
{
2021
    const ASN1_TIME *tm = NULL;
2022 2023 2024 2025 2026 2027 2028 2029 2030 2031
    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)
2032
        goto end;
2033
    if (BN_is_zero(bn))
R
Rich Salz 已提交
2034
        row[DB_serial] = OPENSSL_strdup("00");
2035 2036 2037 2038 2039
    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");
2040
        goto end;
2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051
    }
    /*
     * 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]);

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

R
Rich Salz 已提交
2061
        irow = app_malloc(sizeof(*irow) * (DB_NUMBER + 1), "row ptr");
2062 2063 2064 2065 2066 2067 2068 2069 2070
        for (i = 0; i < DB_NUMBER; i++) {
            irow[i] = row[i];
            row[i] = NULL;
        }
        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);
2071
            goto end;
2072 2073 2074
        }

        /* Revoke Certificate */
2075
        if (rev_type == REV_VALID)
2076 2077
            ok = 1;
        else
2078 2079
            /* Retry revocation after DB insertion */
            ok = do_revoke(x509, db, rev_type, value);
2080

2081
        goto end;
2082 2083 2084

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

2113
static int get_certificate_status(const char *serial, CA_DB *db)
2114 2115 2116
{
    char *row[DB_NUMBER], **rrow;
    int ok = -1, i;
F
FdaSilvaYY 已提交
2117
    size_t serial_len = strlen(serial);
2118 2119 2120 2121 2122 2123

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

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

F
FdaSilvaYY 已提交
2126
    if (serial_len % 2) {
2127 2128 2129 2130 2131 2132
        /*
         * Set the first char to 0
         */ ;
        row[DB_serial][0] = '0';

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

    /* Make it Upper Case */
    for (i = 0; row[DB_serial][i] != '\0'; i++)
        row[DB_serial][i] = toupper((unsigned char)row[DB_serial][i]);

    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;
2152
        goto end;
2153
    } else if (rrow[DB_type][0] == DB_TYPE_VAL) {
2154 2155
        BIO_printf(bio_err, "%s=Valid (%c)\n",
                   row[DB_serial], rrow[DB_type][0]);
2156
        goto end;
2157
    } else if (rrow[DB_type][0] == DB_TYPE_REV) {
2158 2159
        BIO_printf(bio_err, "%s=Revoked (%c)\n",
                   row[DB_serial], rrow[DB_type][0]);
2160
        goto end;
2161
    } else if (rrow[DB_type][0] == DB_TYPE_EXP) {
2162 2163
        BIO_printf(bio_err, "%s=Expired (%c)\n",
                   row[DB_serial], rrow[DB_type][0]);
2164
        goto end;
2165
    } else if (rrow[DB_type][0] == DB_TYPE_SUSP) {
2166 2167
        BIO_printf(bio_err, "%s=Suspended (%c)\n",
                   row[DB_serial], rrow[DB_type][0]);
2168
        goto end;
2169 2170 2171 2172 2173
    } else {
        BIO_printf(bio_err, "%s=Unknown (%c).\n",
                   row[DB_serial], rrow[DB_type][0]);
        ok = -1;
    }
2174
 end:
2175
    for (i = 0; i < DB_NUMBER; i++) {
R
Rich Salz 已提交
2176
        OPENSSL_free(row[i]);
2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188
    }
    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();
2189 2190
    if (a_tm == NULL)
        return -1;
2191 2192 2193

    /* get actual time and make a string */
    a_tm = X509_gmtime_adj(a_tm, 0);
2194
    a_tm_s = app_malloc(a_tm->length + 1, "time string");
2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206

    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);

2207
        if (rrow[DB_type][0] == DB_TYPE_VAL) {
2208 2209 2210 2211 2212 2213 2214 2215 2216
            /* 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) {
2217
                    rrow[DB_type][0] = DB_TYPE_EXP;
2218 2219 2220 2221 2222 2223
                    rrow[DB_type][1] = '\0';
                    cnt++;

                    BIO_printf(bio_err, "%s=Expired\n", rrow[DB_serial]);
                }
            } else if (db_y2k < a_y2k) {
2224
                rrow[DB_type][0] = DB_TYPE_EXP;
2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237
                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);
}
2238

N
Nils Larsch 已提交
2239
static const char *crl_reasons[] = {
2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252
    /* CRL reason strings */
    "unspecified",
    "keyCompromise",
    "CACompromise",
    "affiliationChanged",
    "superseded",
    "cessationOfOperation",
    "certificateHold",
    "removeFromCRL",
    /* Additional pseudo reasons */
    "holdInstruction",
    "keyTime",
    "CAkeyTime"
2253 2254
};

D
Dr. Stephen Henson 已提交
2255
#define NUM_REASONS OSSL_NELEM(crl_reasons)
2256

2257 2258 2259 2260 2261
/*
 * 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
2262 2263
 */

2264
static char *make_revocation_str(REVINFO_TYPE rev_type, const char *rev_arg)
2265
{
2266
    char *str;
2267
    const char *reason = NULL, *other = NULL;
2268 2269 2270
    ASN1_OBJECT *otmp;
    ASN1_UTCTIME *revtm = NULL;
    int i;
2271

2272 2273
    switch (rev_type) {
    case REV_NONE:
2274
    case REV_VALID:
2275 2276 2277 2278
        break;

    case REV_CRL_REASON:
        for (i = 0; i < 8; i++) {
R
Rich Salz 已提交
2279
            if (strcasecmp(rev_arg, crl_reasons[i]) == 0) {
2280 2281 2282 2283 2284 2285 2286 2287 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
                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 已提交
2334
    str = app_malloc(i, "revocation reason");
R
Rich Salz 已提交
2335
    OPENSSL_strlcpy(str, (char *)revtm->data, i);
2336
    if (reason) {
R
Rich Salz 已提交
2337 2338
        OPENSSL_strlcat(str, ",", i);
        OPENSSL_strlcat(str, reason, i);
2339 2340
    }
    if (other) {
R
Rich Salz 已提交
2341 2342
        OPENSSL_strlcat(str, ",", i);
        OPENSSL_strlcat(str, other, i);
2343 2344 2345 2346
    }
    ASN1_UTCTIME_free(revtm);
    return str;
}
2347

2348
/*-
2349
 * Convert revocation field to X509_REVOKED entry
2350 2351 2352 2353 2354 2355
 * return code:
 * 0 error
 * 1 OK
 * 2 OK and some extensions added (i.e. V2 CRL)
 */

2356
static int make_revoked(X509_REVOKED *rev, const char *str)
2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369
{
    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)
2370
        goto end;
2371 2372

    if (rev && !X509_REVOKED_set_revocationDate(rev, revDate))
2373
        goto end;
2374 2375 2376

    if (rev && (reason_code != OCSP_REVOKED_STATUS_NOSTATUS)) {
        rtmp = ASN1_ENUMERATED_new();
2377
        if (rtmp == NULL || !ASN1_ENUMERATED_set(rtmp, reason_code))
2378
            goto end;
2379
        if (!X509_REVOKED_add1_ext_i2d(rev, NID_crl_reason, rtmp, 0, 0))
2380
            goto end;
2381 2382 2383 2384 2385
    }

    if (rev && comp_time) {
        if (!X509_REVOKED_add1_ext_i2d
            (rev, NID_invalidity_date, comp_time, 0, 0))
2386
            goto end;
2387 2388 2389 2390
    }
    if (rev && hold) {
        if (!X509_REVOKED_add1_ext_i2d
            (rev, NID_hold_instruction_code, hold, 0, 0))
2391
            goto end;
2392 2393 2394 2395 2396 2397 2398
    }

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

2399
 end:
2400

R
Rich Salz 已提交
2401
    OPENSSL_free(tmp);
2402 2403 2404 2405 2406 2407 2408
    ASN1_OBJECT_free(hold);
    ASN1_GENERALIZEDTIME_free(comp_time);
    ASN1_ENUMERATED_free(rtmp);
    ASN1_TIME_free(revDate);

    return ret;
}
2409

F
FdaSilvaYY 已提交
2410
static int old_entry_print(const ASN1_OBJECT *obj, const ASN1_STRING *str)
2411
{
2412 2413
    char buf[25], *pbuf;
    const char *p;
2414
    int j;
2415

R
Rich Salz 已提交
2416
    j = i2a_ASN1_OBJECT(bio_err, obj);
2417 2418 2419 2420 2421
    pbuf = buf;
    for (j = 22 - j; j > 0; j--)
        *(pbuf++) = ' ';
    *(pbuf++) = ':';
    *(pbuf++) = '\0';
R
Rich Salz 已提交
2422
    BIO_puts(bio_err, buf);
2423 2424

    if (str->type == V_ASN1_PRINTABLESTRING)
R
Rich Salz 已提交
2425
        BIO_printf(bio_err, "PRINTABLE:'");
2426
    else if (str->type == V_ASN1_T61STRING)
R
Rich Salz 已提交
2427
        BIO_printf(bio_err, "T61STRING:'");
2428
    else if (str->type == V_ASN1_IA5STRING)
R
Rich Salz 已提交
2429
        BIO_printf(bio_err, "IA5STRING:'");
2430
    else if (str->type == V_ASN1_UNIVERSALSTRING)
R
Rich Salz 已提交
2431
        BIO_printf(bio_err, "UNIVERSALSTRING:'");
2432
    else
R
Rich Salz 已提交
2433
        BIO_printf(bio_err, "ASN.1 %2d:'", str->type);
2434

2435
    p = (const char *)str->data;
2436 2437
    for (j = str->length; j > 0; j--) {
        if ((*p >= ' ') && (*p <= '~'))
R
Rich Salz 已提交
2438
            BIO_printf(bio_err, "%c", *p);
2439
        else if (*p & 0x80)
R
Rich Salz 已提交
2440
            BIO_printf(bio_err, "\\0x%02X", *p);
2441
        else if ((unsigned char)*p == 0xf7)
R
Rich Salz 已提交
2442
            BIO_printf(bio_err, "^?");
2443
        else
R
Rich Salz 已提交
2444
            BIO_printf(bio_err, "^%c", *p + '@');
2445 2446
        p++;
    }
R
Rich Salz 已提交
2447
    BIO_printf(bio_err, "'\n");
2448 2449 2450 2451 2452 2453
    return 1;
}

int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
                   ASN1_GENERALIZEDTIME **pinvtm, const char *str)
{
2454
    char *tmp;
2455 2456 2457 2458 2459 2460 2461
    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 已提交
2462
    tmp = OPENSSL_strdup(str);
V
Viktor Dukhovni 已提交
2463
    if (!tmp) {
M
Matt Caswell 已提交
2464
        BIO_printf(bio_err, "memory allocation failure\n");
2465
        goto end;
M
Matt Caswell 已提交
2466 2467
    }

2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484
    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();
2485
        if (*prevtm == NULL) {
M
Matt Caswell 已提交
2486
            BIO_printf(bio_err, "memory allocation failure\n");
2487
            goto end;
M
Matt Caswell 已提交
2488
        }
2489 2490
        if (!ASN1_UTCTIME_set_string(*prevtm, rtime_str)) {
            BIO_printf(bio_err, "invalid revocation date %s\n", rtime_str);
2491
            goto end;
2492 2493 2494 2495
        }
    }
    if (reason_str) {
        for (i = 0; i < NUM_REASONS; i++) {
R
Rich Salz 已提交
2496
            if (strcasecmp(reason_str, crl_reasons[i]) == 0) {
2497 2498 2499 2500 2501 2502
                reason_code = i;
                break;
            }
        }
        if (reason_code == OCSP_REVOKED_STATUS_NOSTATUS) {
            BIO_printf(bio_err, "invalid reason code %s\n", reason_str);
2503
            goto end;
2504 2505 2506 2507 2508 2509 2510
        }

        if (reason_code == 7)
            reason_code = OCSP_REVOKED_STATUS_REMOVEFROMCRL;
        else if (reason_code == 8) { /* Hold instruction */
            if (!arg_str) {
                BIO_printf(bio_err, "missing hold instruction\n");
2511
                goto end;
2512 2513 2514 2515 2516 2517 2518
            }
            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);
2519
                goto end;
2520 2521 2522
            }
            if (phold)
                *phold = hold;
R
Rich Salz 已提交
2523 2524
            else
                ASN1_OBJECT_free(hold);
2525 2526 2527
        } else if ((reason_code == 9) || (reason_code == 10)) {
            if (!arg_str) {
                BIO_printf(bio_err, "missing compromised time\n");
2528
                goto end;
2529 2530
            }
            comp_time = ASN1_GENERALIZEDTIME_new();
2531
            if (comp_time == NULL) {
M
Matt Caswell 已提交
2532
                BIO_printf(bio_err, "memory allocation failure\n");
2533
                goto end;
M
Matt Caswell 已提交
2534
            }
2535 2536
            if (!ASN1_GENERALIZEDTIME_set_string(comp_time, arg_str)) {
                BIO_printf(bio_err, "invalid compromised time %s\n", arg_str);
2537
                goto end;
2538 2539 2540 2541 2542 2543 2544 2545 2546 2547
            }
            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 已提交
2548
    if (pinvtm) {
2549
        *pinvtm = comp_time;
R
Rich Salz 已提交
2550 2551
        comp_time = NULL;
    }
2552 2553 2554

    ret = 1;

2555
 end:
2556

R
Rich Salz 已提交
2557
    OPENSSL_free(tmp);
R
Rich Salz 已提交
2558
    ASN1_GENERALIZEDTIME_free(comp_time);
2559 2560 2561

    return ret;
}