From no-reply at appveyor.com Tue Aug 1 00:17:18 2017 From: no-reply at appveyor.com (AppVeyor) Date: Tue, 01 Aug 2017 00:17:18 +0000 Subject: [openssl-commits] Build failed: openssl master.12179 Message-ID: <20170801001716.62316.39AD3D63D3BF124A@appveyor.com> An HTML attachment was scrubbed... URL: From no-reply at appveyor.com Tue Aug 1 00:30:51 2017 From: no-reply at appveyor.com (AppVeyor) Date: Tue, 01 Aug 2017 00:30:51 +0000 Subject: [openssl-commits] Build completed: openssl master.12180 Message-ID: <20170801003050.61572.FA1F1B1EF734EF49@appveyor.com> An HTML attachment was scrubbed... URL: From appro at openssl.org Tue Aug 1 08:26:27 2017 From: appro at openssl.org (Andy Polyakov) Date: Tue, 01 Aug 2017 08:26:27 +0000 Subject: [openssl-commits] [openssl] master update Message-ID: <1501575987.125817.4306.nullmailer@dev.openssl.org> The branch master has been updated via c290853878ed2a6988521c01a8f675ed959ab5cc (commit) from a970b14f8d6f867a894824c60ae5c3e6cca5a89f (commit) - Log ----------------------------------------------------------------- commit c290853878ed2a6988521c01a8f675ed959ab5cc Author: Paul Yang Date: Thu Jul 27 15:33:14 2017 +0800 Add '-ext' option to display extensions in 'x509' This is to address issue #3932. Support comma-separated string to specify what extensions to be displayed. Reviewed-by: Paul Dale Reviewed-by: Andy Polyakov (Merged from https://github.com/openssl/openssl/pull/4016) Remove redundant variable [to be squashed] ----------------------------------------------------------------------- Summary of changes: apps/x509.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- doc/man1/x509.pod | 15 ++++++++ 2 files changed, 116 insertions(+), 3 deletions(-) diff --git a/apps/x509.c b/apps/x509.c index 7928ccb..850776f 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -42,6 +42,7 @@ static int x509_certify(X509_STORE *ctx, const char *CAfile, const EVP_MD *diges const char *section, ASN1_INTEGER *sno, int reqfile, int preserve_dates); static int purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt); +static int print_x509v3_exts(BIO *bio, X509 *x, const char *exts); typedef enum OPTION_choice { OPT_ERR = -1, OPT_EOF = 0, OPT_HELP, @@ -59,7 +60,7 @@ typedef enum OPTION_choice { OPT_SUBJECT_HASH_OLD, OPT_ISSUER_HASH_OLD, OPT_BADSIG, OPT_MD, OPT_ENGINE, OPT_NOCERT, OPT_PRESERVE_DATES, - OPT_R_ENUM + OPT_R_ENUM, OPT_EXT } OPTION_CHOICE; const OPTIONS x509_options[] = { @@ -117,6 +118,7 @@ const OPTIONS x509_options[] = { {"CAserial", OPT_CASERIAL, 's', "Serial file"}, {"set_serial", OPT_SET_SERIAL, 's', "Serial number to use"}, {"text", OPT_TEXT, '-', "Print the certificate in text form"}, + {"ext", OPT_EXT, 's', "Print various X509V3 extensions"}, {"C", OPT_C, '-', "Print out C code forms"}, {"extfile", OPT_EXTFILE, '<', "File with X509V3 extensions to add"}, OPT_R_OPTIONS, @@ -162,7 +164,7 @@ int x509_main(int argc, char **argv) X509_STORE *ctx = NULL; const EVP_MD *digest = NULL; char *CAkeyfile = NULL, *CAserial = NULL, *fkeyfile = NULL, *alias = NULL; - char *checkhost = NULL, *checkemail = NULL, *checkip = NULL; + char *checkhost = NULL, *checkemail = NULL, *checkip = NULL, *exts = NULL; char *extsect = NULL, *extfile = NULL, *passin = NULL, *passinarg = NULL; char *infile = NULL, *outfile = NULL, *keyfile = NULL, *CAfile = NULL; char *prog; @@ -174,7 +176,7 @@ int x509_main(int argc, char **argv) int noout = 0, sign_flag = 0, CA_flag = 0, CA_createserial = 0, email = 0; int ocsp_uri = 0, trustout = 0, clrtrust = 0, clrreject = 0, aliasout = 0; int ret = 1, i, num = 0, badsig = 0, clrext = 0, nocert = 0; - int text = 0, serial = 0, subject = 0, issuer = 0, startdate = 0; + int text = 0, serial = 0, subject = 0, issuer = 0, startdate = 0, ext = 0; int enddate = 0; time_t checkoffset = 0; unsigned long certflag = 0; @@ -377,6 +379,10 @@ int x509_main(int argc, char **argv) case OPT_NOOUT: noout = ++num; break; + case OPT_EXT: + ext = ++num; + exts = opt_arg(); + break; case OPT_NOCERT: nocert = 1; break; @@ -839,6 +845,8 @@ int x509_main(int argc, char **argv) noout = 1; } else if (ocspid == i) { X509_ocspid_print(out, x); + } else if (ext == i) { + print_x509v3_exts(out, x, exts); } } } @@ -1097,3 +1105,93 @@ static int purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt) } return 1; } + +static int parse_ext_names(char *names, const char **result) +{ + char *p, *q; + int cnt = 0, len = 0; + + p = q = names; + len = strlen(names); + + while (q - names <= len) { + if (*q != ',' && *q != '\0') { + q++; + continue; + } + if (p != q) { + /* found */ + if (result != NULL) { + result[cnt] = p; + *q = '\0'; + } + cnt++; + } + p = ++q; + } + + return cnt; +} + +static int print_x509v3_exts(BIO *bio, X509 *x, const char *ext_names) +{ + const STACK_OF(X509_EXTENSION) *exts = NULL; + STACK_OF(X509_EXTENSION) *exts2 = NULL; + X509_EXTENSION *ext = NULL; + ASN1_OBJECT *obj; + int i, j, ret = 0, num, nn = 0; + const char *sn, **names = NULL; + char *tmp_ext_names = NULL; + + exts = X509_get0_extensions(x); + if ((num = sk_X509_EXTENSION_num(exts)) <= 0) { + BIO_printf(bio, "No extensions in certificate\n"); + ret = 1; + goto end; + } + + /* parse comma separated ext name string */ + if ((tmp_ext_names = OPENSSL_strdup(ext_names)) == NULL) + goto end; + if ((nn = parse_ext_names(tmp_ext_names, NULL)) == 0) { + BIO_printf(bio, "Invalid extension names: %s\n", ext_names); + goto end; + } + if ((names = OPENSSL_malloc(sizeof(char *) * nn)) == NULL) + goto end; + parse_ext_names(tmp_ext_names, names); + + for (i = 0; i < num; i++) { + ext = sk_X509_EXTENSION_value(exts, i); + + /* check if this ext is what we want */ + obj = X509_EXTENSION_get_object(ext); + sn = OBJ_nid2sn(OBJ_obj2nid(obj)); + if (sn == NULL || strcmp(sn, "UNDEF") == 0) + continue; + + for (j = 0; j < nn; j++) { + if (strcmp(sn, names[j]) == 0) { + /* push the extension into a new stack */ + if (exts2 == NULL + && (exts2 = sk_X509_EXTENSION_new_null()) == NULL) + goto end; + if (!sk_X509_EXTENSION_push(exts2, ext)) + goto end; + } + } + } + + if (!sk_X509_EXTENSION_num(exts2)) { + BIO_printf(bio, "No extensions matched with %s\n", ext_names); + ret = 1; + goto end; + } + + ret = X509V3_extensions_print(bio, NULL, exts2, 0, 0); + end: + sk_X509_EXTENSION_free(exts2); + OPENSSL_free(names); + OPENSSL_free(tmp_ext_names); + return ret; +} diff --git a/doc/man1/x509.pod b/doc/man1/x509.pod index 68fbf81..0b79560 100644 --- a/doc/man1/x509.pod +++ b/doc/man1/x509.pod @@ -53,6 +53,7 @@ B B [B<-CAserial filename>] [B<-force_pubkey key>] [B<-text>] +[B<-ext extensions>] [B<-certopt option>] [B<-C>] [B<-[digest]>] @@ -157,6 +158,12 @@ Prints out the certificate in text form. Full details are output including the public key, signature algorithms, issuer and subject names, serial number any extensions present and any trust settings. +=item B<-ext extensions> + +Prints out the certificate extensions in text form. Extensions are specified +with a comma separated string, e.g., "subjectAltName,subjectKeyIdentifier". +See the L manual page for the extension names. + =item B<-certopt option> Customise the output format used with B<-text>. The B