X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=apps%2Fx509.c;h=d88eb56c044bfaa216422909e4efef0958192b6f;hp=71af49f7f53eee7a87f6415a181668af517e327a;hb=a31011e8e0ea18f1cc79d7eb53238768ae9369c6;hpb=cfcf645356b0957e9ec7190e3afb3e4d6c406d5b diff --git a/apps/x509.c b/apps/x509.c index 71af49f7f5..d88eb56c04 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -56,6 +56,7 @@ * [including the GNU Public Licence.] */ +#include #include #include #include @@ -63,14 +64,15 @@ #define APPS_WIN16 #endif #include "apps.h" -#include "bio.h" -#include "asn1.h" -#include "err.h" -#include "bn.h" -#include "evp.h" -#include "x509.h" -#include "objects.h" -#include "pem.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #undef PROG #define PROG x509_main @@ -84,7 +86,7 @@ static char *x509_usage[]={ "usage: x509 args\n", " -inform arg - input format - default PEM (one of DER, NET or PEM)\n", -" -outform arg - output format - default PEM (one of DER, NET or PEM\n", +" -outform arg - output format - default PEM (one of DER, NET or PEM)\n", " -keyform arg - private key format - default PEM\n", " -CAform arg - CA format - default PEM\n", " -CAkeyform arg - CA key format - default PEM\n", @@ -96,6 +98,7 @@ static char *x509_usage[]={ " -issuer - print issuer DN\n", " -startdate - notBefore field\n", " -enddate - notAfter field\n", +" -purpose - print out certificate purposes\n", " -dates - both Before and After dates\n", " -modulus - print the RSA key modulus\n", " -fingerprint - print the certificate fingerprint\n", @@ -113,29 +116,28 @@ static char *x509_usage[]={ " -text - print the certificate in text form\n", " -C - print out C code forms\n", " -md2/-md5/-sha1/-mdc2 - digest to do an RSA sign with\n", +" -extfile - configuration file with X509V3 extensions to add\n", +" -extensions - section from config file with X509V3 extensions to add\n", NULL }; -#ifndef NOPROTO static int MS_CALLBACK callb(int ok, X509_STORE_CTX *ctx); static EVP_PKEY *load_key(char *file, int format); static X509 *load_cert(char *file, int format); -static int sign (X509 *x, EVP_PKEY *pkey,int days,EVP_MD *digest); -static int x509_certify (X509_STORE *ctx,char *CAfile, EVP_MD *digest,X509 *x, - X509 *xca, EVP_PKEY *pkey,char *serial, int create, int days); -#else -static int MS_CALLBACK callb(); -static EVP_PKEY *load_key(); -static X509 *load_cert(); -static int sign (); -static int x509_certify (); -#endif - +static int sign (X509 *x, EVP_PKEY *pkey,int days,const EVP_MD *digest, + LHASH *conf, char *section); +static int x509_certify (X509_STORE *ctx,char *CAfile,const EVP_MD *digest, + X509 *x,X509 *xca,EVP_PKEY *pkey,char *serial, + int create,int days, LHASH *conf, char *section); +static int efunc(X509_PURPOSE *pt, void *arg); static int reqfile=0; -int MAIN(argc, argv) -int argc; -char **argv; +typedef struct { +BIO *bio; +X509 *cert; +} X509_PPRINT; + +int MAIN(int argc, char **argv) { int ret=1; X509_REQ *req=NULL; @@ -151,12 +153,16 @@ char **argv; int noout=0,sign_flag=0,CA_flag=0,CA_createserial=0; int C=0; int x509req=0,days=DEF_DAYS,modulus=0; + int pprint = 0; char **pp; X509_STORE *ctx=NULL; X509_REQ *rq=NULL; int fingerprint=0; char buf[256]; - EVP_MD *md_alg,*digest=EVP_md5(); + const EVP_MD *md_alg,*digest=EVP_md5(); + LHASH *extconf = NULL; + char *extsect = NULL, *extfile = NULL; + int need_rand = 0; reqfile=0; @@ -197,7 +203,10 @@ char **argv; keyformat=str2fmt(*(++argv)); } else if (strcmp(*argv,"-req") == 0) + { reqfile=1; + need_rand = 1; + } else if (strcmp(*argv,"-CAform") == 0) { if (--argc < 1) goto bad; @@ -218,6 +227,16 @@ char **argv; goto bad; } } + else if (strcmp(*argv,"-extfile") == 0) + { + if (--argc < 1) goto bad; + extfile= *(++argv); + } + else if (strcmp(*argv,"-extensions") == 0) + { + if (--argc < 1) goto bad; + extsect= *(++argv); + } else if (strcmp(*argv,"-in") == 0) { if (--argc < 1) goto bad; @@ -233,6 +252,7 @@ char **argv; if (--argc < 1) goto bad; keyfile= *(++argv); sign_flag= ++num; + need_rand = 1; } else if (strcmp(*argv,"-CA") == 0) { @@ -273,6 +293,8 @@ char **argv; startdate= ++num; enddate= ++num; } + else if (strcmp(*argv,"-purpose") == 0) + pprint= ++num; else if (strcmp(*argv,"-startdate") == 0) startdate= ++num; else if (strcmp(*argv,"-enddate") == 0) @@ -304,8 +326,12 @@ bad: goto end; } + if (need_rand) + app_RAND_load_file(NULL, bio_err, 0); + ERR_load_crypto_strings(); - X509v3_add_netscape_extensions(); + X509V3_add_standard_extensions(); + X509_PURPOSE_add_standard(); if (!X509_STORE_set_default_paths(ctx)) { @@ -321,6 +347,34 @@ bad: goto end; } + if (extfile) { + long errorline; + X509V3_CTX ctx2; + if (!(extconf=CONF_load(NULL,extfile,&errorline))) { + if (errorline <= 0) + BIO_printf(bio_err, + "error loading the config file '%s'\n", + extfile); + else + BIO_printf(bio_err, + "error on line %ld of config file '%s'\n" + ,errorline,extfile); + goto end; + } + if(!extsect && !(extsect = CONF_get_string(extconf, "default", + "extensions"))) extsect = "default"; + X509V3_set_ctx_test(&ctx2); + X509V3_set_conf_lhash(&ctx2, extconf); + if(!X509V3_EXT_add_conf(extconf, &ctx2, extsect, NULL)) { + BIO_printf(bio_err, + "Error Loading extension section %s\n", + extsect); + ERR_print_errors(bio_err); + goto end; + } + } + + if (reqfile) { EVP_PKEY *pkey; @@ -349,7 +403,7 @@ bad: goto end; } } - req=PEM_read_bio_X509_REQ(in,NULL,NULL); + req=PEM_read_bio_X509_REQ(in,NULL,NULL,NULL); BIO_free(in); if (req == NULL) { perror(infile); goto end; } @@ -402,7 +456,9 @@ bad: ci->key=req->req_info->pubkey; req->req_info->pubkey=NULL; #else - X509_set_pubkey(x,X509_REQ_get_pubkey(req)); + pkey = X509_REQ_get_pubkey(req); + X509_set_pubkey(x,pkey); + EVP_PKEY_free(pkey); #endif } else @@ -464,8 +520,15 @@ bad: { BIO_printf(STDout,"%08lx\n",X509_subject_name_hash(x)); } + else if (pprint == i) + { + X509_PPRINT ptmp; + ptmp.bio = STDout; + ptmp.cert = x; + BIO_printf(STDout, "Certificate purposes:\n"); + X509_PURPOSE_enum(efunc, &ptmp); + } else -#ifndef NO_RSA if (modulus == i) { EVP_PKEY *pkey; @@ -478,15 +541,21 @@ bad: goto end; } BIO_printf(STDout,"Modulus="); +#ifndef NO_RSA if (pkey->type == EVP_PKEY_RSA) BN_print(STDout,pkey->pkey.rsa->n); else +#endif +#ifndef NO_DSA + if (pkey->type == EVP_PKEY_DSA) + BN_print(STDout,pkey->pkey.dsa->pub_key); + else +#endif BIO_printf(STDout,"Wrong Algorithm type"); BIO_printf(STDout,"\n"); EVP_PKEY_free(pkey); } else -#endif if (C == i) { unsigned char *d; @@ -548,13 +617,13 @@ bad: else if (startdate == i) { BIO_puts(STDout,"notBefore="); - ASN1_UTCTIME_print(STDout,X509_get_notBefore(x)); + ASN1_TIME_print(STDout,X509_get_notBefore(x)); BIO_puts(STDout,"\n"); } else if (enddate == i) { BIO_puts(STDout,"notAfter="); - ASN1_UTCTIME_print(STDout,X509_get_notAfter(x)); + ASN1_TIME_print(STDout,X509_get_notAfter(x)); BIO_puts(STDout,"\n"); } else if (fingerprint == i) @@ -591,7 +660,9 @@ bad: digest=EVP_dss1(); #endif - if (!sign(x,Upkey,days,digest)) goto end; + assert(need_rand); + if (!sign(x,Upkey,days,digest, + extconf, extsect)) goto end; } else if (CA_flag == i) { @@ -606,9 +677,10 @@ bad: digest=EVP_dss1(); #endif + assert(need_rand); if (!x509_certify(ctx,CAfile,digest,x,xca, - CApkey, - CAserial,CA_createserial,days)) + CApkey, CAserial,CA_createserial,days, + extconf, extsect)) goto end; } else if (x509req == i) @@ -681,30 +753,27 @@ bad: } ret=0; end: + if (need_rand) + app_RAND_write_file(NULL, bio_err); OBJ_cleanup(); - if (out != NULL) BIO_free(out); - if (STDout != NULL) BIO_free(STDout); - if (ctx != NULL) X509_STORE_free(ctx); - if (req != NULL) X509_REQ_free(req); - if (x != NULL) X509_free(x); - if (xca != NULL) X509_free(xca); - if (Upkey != NULL) EVP_PKEY_free(Upkey); - if (CApkey != NULL) EVP_PKEY_free(CApkey); - if (rq != NULL) X509_REQ_free(rq); - X509v3_cleanup_extensions(); + CONF_free(extconf); + BIO_free(out); + BIO_free(STDout); + X509_STORE_free(ctx); + X509_REQ_free(req); + X509_free(x); + X509_free(xca); + EVP_PKEY_free(Upkey); + EVP_PKEY_free(CApkey); + X509_REQ_free(rq); + X509V3_EXT_cleanup(); + X509_PURPOSE_cleanup(); EXIT(ret); } -static int x509_certify(ctx,CAfile,digest,x,xca,pkey,serialfile,create,days) -X509_STORE *ctx; -char *CAfile; -EVP_MD *digest; -X509 *x; -X509 *xca; -EVP_PKEY *pkey; -char *serialfile; -int create; -int days; +static int x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest, + X509 *x, X509 *xca, EVP_PKEY *pkey, char *serialfile, int create, + int days, LHASH *conf, char *section) { int ret=0; BIO *io=NULL; @@ -715,7 +784,9 @@ int days; X509_STORE_CTX xsc; EVP_PKEY *upkey; - EVP_PKEY_copy_parameters(X509_get_pubkey(xca),pkey); + upkey = X509_get_pubkey(xca); + EVP_PKEY_copy_parameters(upkey,pkey); + EVP_PKEY_free(upkey); X509_STORE_CTX_init(&xsc,ctx,x,NULL); buf=(char *)Malloc(EVP_PKEY_size(pkey)*2+ @@ -823,16 +894,13 @@ int days; if (X509_gmtime_adj(X509_get_notAfter(x),(long)60*60*24*days) == NULL) goto end; - /* don't save DSA parameters in child if parent has them - * and the parents and the childs are the same. */ - upkey=X509_get_pubkey(x); - if (!EVP_PKEY_missing_parameters(pkey) && - (EVP_PKEY_cmp_parameters(pkey,upkey) == 0)) - { - EVP_PKEY_save_parameters(upkey,0); - /* Force a re-write */ - X509_set_pubkey(x,upkey); - } + if(conf) { + X509V3_CTX ctx2; + X509_set_version(x,2); /* version 3 certificate */ + X509V3_set_ctx(&ctx2, xca, x, NULL, NULL, 0); + X509V3_set_conf_lhash(&ctx2, conf); + if(!X509V3_EXT_add_conf(conf, &ctx2, section, x)) goto end; + } if (!X509_sign(x,pkey,digest)) goto end; ret=1; @@ -847,9 +915,7 @@ end: return(ret); } -static int MS_CALLBACK callb(ok, ctx) -int ok; -X509_STORE_CTX *ctx; +static int MS_CALLBACK callb(int ok, X509_STORE_CTX *ctx) { char buf[256]; int err; @@ -882,9 +948,7 @@ X509_STORE_CTX *ctx; } } -static EVP_PKEY *load_key(file, format) -char *file; -int format; +static EVP_PKEY *load_key(char *file, int format) { BIO *key=NULL; EVP_PKEY *pkey=NULL; @@ -923,7 +987,7 @@ int format; #endif if (format == FORMAT_PEM) { - pkey=PEM_read_bio_PrivateKey(key,NULL,NULL); + pkey=PEM_read_bio_PrivateKey(key,NULL,NULL,NULL); } else { @@ -937,9 +1001,7 @@ end: return(pkey); } -static X509 *load_cert(file, format) -char *file; -int format; +static X509 *load_cert(char *file, int format) { ASN1_HEADER *ah=NULL; BUF_MEM *buf=NULL; @@ -1008,7 +1070,7 @@ int format; ah->data=NULL; } else if (format == FORMAT_PEM) - x=PEM_read_bio_X509(cert,NULL,NULL); + x=PEM_read_bio_X509(cert,NULL,NULL,NULL); else { BIO_printf(bio_err,"bad input format specified for input cert\n"); goto end; @@ -1026,15 +1088,16 @@ end: } /* self sign */ -static int sign(x, pkey, days, digest) -X509 *x; -EVP_PKEY *pkey; -int days; -EVP_MD *digest; +static int sign(X509 *x, EVP_PKEY *pkey, int days, const EVP_MD *digest, + LHASH *conf, char *section) { - EVP_PKEY_copy_parameters(X509_get_pubkey(x),pkey); - EVP_PKEY_save_parameters(X509_get_pubkey(x),1); + EVP_PKEY *pktmp; + + pktmp = X509_get_pubkey(x); + EVP_PKEY_copy_parameters(pktmp,pkey); + EVP_PKEY_save_parameters(pktmp,1); + EVP_PKEY_free(pktmp); if (!X509_set_issuer_name(x,X509_get_subject_name(x))) goto err; if (X509_gmtime_adj(X509_get_notBefore(x),0) == NULL) goto err; @@ -1047,9 +1110,37 @@ EVP_MD *digest; goto err; if (!X509_set_pubkey(x,pkey)) goto err; + if(conf) { + X509V3_CTX ctx; + X509_set_version(x,2); /* version 3 certificate */ + X509V3_set_ctx(&ctx, x, x, NULL, NULL, 0); + X509V3_set_conf_lhash(&ctx, conf); + if(!X509V3_EXT_add_conf(conf, &ctx, section, x)) goto err; + } if (!X509_sign(x,pkey,digest)) goto err; return(1); err: ERR_print_errors(bio_err); return(0); } + +static int efunc(X509_PURPOSE *pt, void *arg) +{ + X509_PPRINT *ptmp; + int id, i, idret; + char *pname; + ptmp = arg; + id = X509_PURPOSE_get_id(pt); + pname = X509_PURPOSE_get_name(pt); + for(i = 0; i < 2; i++) { + idret = X509_check_purpose(ptmp->cert, id, i); + BIO_printf(ptmp->bio, "%s%s : ", pname, i ? " CA" : ""); + if(idret == 1) BIO_printf(ptmp->bio, "Yes\n"); + else if (idret == 0) BIO_printf(ptmp->bio, "No\n"); + else BIO_printf(ptmp->bio, "Yes (WARNING code=%d)\n", idret); + } + return 1; +} + + +