X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=apps%2Fx509.c;h=407f839504e64160cf56cb4dcbbcd4ee5a636f06;hp=0ed5ef1d037a3d3bd09c4c327bc94a3a62bf8516;hb=c7cb16a8ffa2a791949044378f278e8f4089d7d6;hpb=dd4134101fb41261b20fe47fdf9068c84e923102 diff --git a/apps/x509.c b/apps/x509.c index 0ed5ef1d03..407f839504 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -92,6 +92,7 @@ static char *x509_usage[]={ " -CAkeyform arg - CA key format - default PEM\n", " -in arg - input file - default stdin\n", " -out arg - output file - default stdout\n", +" -passin arg - private key password source\n", " -serial - print serial number value\n", " -hash - print hash value\n", " -subject - print subject DN\n", @@ -117,7 +118,7 @@ static char *x509_usage[]={ " -req - input is a certificate request, sign and output.\n", " -CA arg - set the CA certificate, must be PEM format.\n", " -CAkey arg - set the CA key, must be PEM format\n", -" missing, it is asssumed to be in the CA file.\n", +" missing, it is assumed to be in the CA file.\n", " -CAcreateserial - create serial number file if it does not exist\n", " -CAserial - serial file\n", " -text - print the certificate in text form\n", @@ -125,37 +126,41 @@ static char *x509_usage[]={ " -md2/-md5/-sha1/-mdc2 - digest to use\n", " -extfile - configuration file with X509V3 extensions to add\n", " -extensions - section from config file with X509V3 extensions to add\n", +" -crlext - delete extensions before signing and input certificate\n", NULL }; static int MS_CALLBACK callb(int ok, X509_STORE_CTX *ctx); -static EVP_PKEY *load_key(char *file, int format); +static EVP_PKEY *load_key(char *file, int format, char *passin); static X509 *load_cert(char *file, int format); -static int sign (X509 *x, EVP_PKEY *pkey,int days,const EVP_MD *digest, +static int sign (X509 *x, EVP_PKEY *pkey,int days,int clrext, 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); + int create,int days, int clrext, LHASH *conf, char *section); static int purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt); static int reqfile=0; +int MAIN(int, char **); + int MAIN(int argc, char **argv) { int ret=1; X509_REQ *req=NULL; X509 *x=NULL,*xca=NULL; + ASN1_OBJECT *objtmp; EVP_PKEY *Upkey=NULL,*CApkey=NULL; int i,num,badops=0; BIO *out=NULL; BIO *STDout=NULL; - STACK *trust = NULL, *reject = NULL; + STACK_OF(ASN1_OBJECT) *trust = NULL, *reject = NULL; int informat,outformat,keyformat,CAformat,CAkeyformat; char *infile=NULL,*outfile=NULL,*keyfile=NULL,*CAfile=NULL; char *CAkeyfile=NULL,*CAserial=NULL; - char *alias=NULL, *trstr=NULL; + char *alias=NULL; int text=0,serial=0,hash=0,subject=0,issuer=0,startdate=0,enddate=0; int noout=0,sign_flag=0,CA_flag=0,CA_createserial=0; - int trustout=0,clrtrust=0,clrreject=0,aliasout=0; + int trustout=0,clrtrust=0,clrreject=0,aliasout=0,clrext=0; int C=0; int x509req=0,days=DEF_DAYS,modulus=0,pubkey=0; int pprint = 0; @@ -166,7 +171,7 @@ int MAIN(int argc, char **argv) char buf[256]; const EVP_MD *md_alg,*digest=EVP_md5(); LHASH *extconf = NULL; - char *extsect = NULL, *extfile = NULL; + char *extsect = NULL, *extfile = NULL, *passin = NULL, *passargin = NULL; int need_rand = 0; reqfile=0; @@ -232,6 +237,11 @@ int MAIN(int argc, char **argv) goto bad; } } + else if (strcmp(*argv,"-passin") == 0) + { + if (--argc < 1) goto bad; + passargin= *(++argv); + } else if (strcmp(*argv,"-extfile") == 0) { if (--argc < 1) goto bad; @@ -279,27 +289,25 @@ int MAIN(int argc, char **argv) else if (strcmp(*argv,"-addtrust") == 0) { if (--argc < 1) goto bad; - trstr= *(++argv); - if(!X509_trust_set_bit_asc(NULL, trstr, 0)) { + if(!(objtmp = OBJ_txt2obj(*(++argv), 0))) { BIO_printf(bio_err, - "Unknown trust value %s\n", trstr); + "Invalid trust object value %s\n", *argv); goto bad; } - if(!trust) trust = sk_new_null(); - sk_push(trust, trstr); + if(!trust) trust = sk_ASN1_OBJECT_new_null(); + sk_ASN1_OBJECT_push(trust, objtmp); trustout = 1; } else if (strcmp(*argv,"-addreject") == 0) { if (--argc < 1) goto bad; - trstr= *(++argv); - if(!X509_reject_set_bit_asc(NULL, trstr, 0)) { + if(!(objtmp = OBJ_txt2obj(*(++argv), 0))) { BIO_printf(bio_err, - "Unknown trust value %s\n", trstr); + "Invalid reject object value %s\n", *argv); goto bad; } - if(!reject) reject = sk_new_null(); - sk_push(reject, trstr); + if(!reject) reject = sk_ASN1_OBJECT_new_null(); + sk_ASN1_OBJECT_push(reject, objtmp); trustout = 1; } else if (strcmp(*argv,"-setalias") == 0) @@ -357,6 +365,8 @@ int MAIN(int argc, char **argv) aliasout= ++num; else if (strcmp(*argv,"-CAcreateserial") == 0) CA_createserial= ++num; + else if (strcmp(*argv,"-crlext") == 0) + clrext = 1; else if ((md_alg=EVP_get_digestbyname(*argv + 1))) { /* ok */ @@ -385,6 +395,11 @@ bad: ERR_load_crypto_strings(); + if(!app_passwd(bio_err, passargin, NULL, &passin, NULL)) { + BIO_printf(bio_err, "Error getting password\n"); + goto end; + } + if (!X509_STORE_set_default_paths(ctx)) { ERR_print_errors(bio_err); @@ -503,15 +518,9 @@ bad: X509_gmtime_adj(X509_get_notBefore(x),0); X509_gmtime_adj(X509_get_notAfter(x),(long)60*60*24*days); -#if 0 - X509_PUBKEY_free(ci->key); - ci->key=req->req_info->pubkey; - req->req_info->pubkey=NULL; -#else pkey = X509_REQ_get_pubkey(req); X509_set_pubkey(x,pkey); EVP_PKEY_free(pkey); -#endif } else x=load_cert(infile,informat); @@ -546,25 +555,23 @@ bad: } } - if(alias) X509_alias_set(x, (unsigned char *)alias, -1); + if(alias) X509_alias_rset(x, (unsigned char *)alias, -1); - if(clrtrust) X509_trust_set_bit(x, -1, 0); - if(clrreject) X509_reject_set_bit(x, -1, 0); + if(clrtrust) X509_trust_clear(x); + if(clrreject) X509_reject_clear(x); if(trust) { - for(i = 0; i < sk_num(trust); i++) { - trstr = sk_value(trust, i); - X509_trust_set_bit_asc(x, trstr, 1); + for(i = 0; i < sk_ASN1_OBJECT_num(trust); i++) { + objtmp = sk_ASN1_OBJECT_value(trust, i); + X509_add1_trust_object(x, objtmp); } - sk_free(trust); } if(reject) { - for(i = 0; i < sk_num(reject); i++) { - trstr = sk_value(reject, i); - X509_reject_set_bit_asc(x, trstr, 1); + for(i = 0; i < sk_ASN1_OBJECT_num(reject); i++) { + objtmp = sk_ASN1_OBJECT_value(reject, i); + X509_add1_reject_object(x, objtmp); } - sk_free(reject); } if (num) @@ -592,7 +599,7 @@ bad: else if (aliasout == i) { unsigned char *alstr; - alstr = X509_alias_get(x, NULL); + alstr = X509_alias_iget(x, NULL); if(alstr) BIO_printf(STDout,"%s\n", alstr); else BIO_puts(STDout,"\n"); } @@ -751,7 +758,7 @@ bad: BIO_printf(bio_err,"Getting Private key\n"); if (Upkey == NULL) { - Upkey=load_key(keyfile,keyformat); + Upkey=load_key(keyfile,keyformat, passin); if (Upkey == NULL) goto end; } #ifndef NO_DSA @@ -760,7 +767,7 @@ bad: #endif assert(need_rand); - if (!sign(x,Upkey,days,digest, + if (!sign(x,Upkey,days,clrext,digest, extconf, extsect)) goto end; } else if (CA_flag == i) @@ -768,7 +775,7 @@ bad: BIO_printf(bio_err,"Getting CA Private Key\n"); if (CAkeyfile != NULL) { - CApkey=load_key(CAkeyfile,CAkeyformat); + CApkey=load_key(CAkeyfile,CAkeyformat, passin); if (CApkey == NULL) goto end; } #ifndef NO_DSA @@ -778,7 +785,7 @@ bad: assert(need_rand); if (!x509_certify(ctx,CAfile,digest,x,xca, - CApkey, CAserial,CA_createserial,days, + CApkey, CAserial,CA_createserial,days, clrext, extconf, extsect)) goto end; } @@ -794,7 +801,7 @@ bad: } else { - pk=load_key(keyfile,FORMAT_PEM); + pk=load_key(keyfile,FORMAT_PEM, passin); if (pk == NULL) goto end; } @@ -869,12 +876,15 @@ end: EVP_PKEY_free(Upkey); EVP_PKEY_free(CApkey); X509_REQ_free(rq); + sk_ASN1_OBJECT_pop_free(trust, ASN1_OBJECT_free); + sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free); + if(passin) Free(passin); EXIT(ret); } 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 days, int clrext, LHASH *conf, char *section) { int ret=0; BIO *io=NULL; @@ -890,7 +900,7 @@ static int x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest, EVP_PKEY_free(upkey); X509_STORE_CTX_init(&xsc,ctx,x,NULL); - buf=(char *)Malloc(EVP_PKEY_size(pkey)*2+ + buf=Malloc(EVP_PKEY_size(pkey)*2+ ((serialfile == NULL) ?(strlen(CAfile)+strlen(POSTFIX)+1) :(strlen(serialfile)))+1); @@ -932,8 +942,8 @@ static int x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest, } else { - ASN1_INTEGER_set(bs,0); - BN_zero(serial); + ASN1_INTEGER_set(bs,1); + BN_one(serial); } } else @@ -995,6 +1005,10 @@ static int x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest, if (X509_gmtime_adj(X509_get_notAfter(x),(long)60*60*24*days) == NULL) goto end; + if(clrext) { + while(X509_get_ext_count(x) > 0) X509_delete_ext(x, 0); + } + if(conf) { X509V3_CTX ctx2; X509_set_version(x,2); /* version 3 certificate */ @@ -1049,7 +1063,7 @@ static int MS_CALLBACK callb(int ok, X509_STORE_CTX *ctx) } } -static EVP_PKEY *load_key(char *file, int format) +static EVP_PKEY *load_key(char *file, int format, char *passin) { BIO *key=NULL; EVP_PKEY *pkey=NULL; @@ -1070,25 +1084,13 @@ static EVP_PKEY *load_key(char *file, int format) perror(file); goto end; } -#ifndef NO_RSA - if (format == FORMAT_ASN1) + if (format == FORMAT_ASN1) { - RSA *rsa; - - rsa=d2i_RSAPrivateKey_bio(key,NULL); - if (rsa != NULL) - { - if ((pkey=EVP_PKEY_new()) != NULL) - EVP_PKEY_assign_RSA(pkey,rsa); - else - RSA_free(rsa); - } + pkey=d2i_PrivateKey_bio(key, NULL); } - else -#endif - if (format == FORMAT_PEM) + else if (format == FORMAT_PEM) { - pkey=PEM_read_bio_PrivateKey(key,NULL,NULL,NULL); + pkey=PEM_read_bio_PrivateKey(key,NULL,NULL,passin); } else { @@ -1189,7 +1191,7 @@ end: } /* self sign */ -static int sign(X509 *x, EVP_PKEY *pkey, int days, const EVP_MD *digest, +static int sign(X509 *x, EVP_PKEY *pkey, int days, int clrext, const EVP_MD *digest, LHASH *conf, char *section) { @@ -1211,6 +1213,9 @@ static int sign(X509 *x, EVP_PKEY *pkey, int days, const EVP_MD *digest, goto err; if (!X509_set_pubkey(x,pkey)) goto err; + if(clrext) { + while(X509_get_ext_count(x) > 0) X509_delete_ext(x, 0); + } if(conf) { X509V3_CTX ctx; X509_set_version(x,2); /* version 3 certificate */ @@ -1230,7 +1235,7 @@ static int purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt) int id, i, idret; char *pname; id = X509_PURPOSE_get_id(pt); - pname = X509_PURPOSE_iget_name(pt); + pname = X509_PURPOSE_get0_name(pt); for(i = 0; i < 2; i++) { idret = X509_check_purpose(cert, id, i); BIO_printf(bio, "%s%s : ", pname, i ? " CA" : "");