generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make better use of load_cert, load_certs and load_key.

Browse Source
This commit is contained in:
Richard Levitte 2001-06-27 09:12:43 +00:00
parent 9d2e51c199
commit ce16450a89
1 changed files with 11 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
apps/ca.c
View File

@ -221,7 +221,8 @@ static int certify_cert(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509,
TXT_DB *db, BIGNUM *serial, char *subj, char *startdate, TXT_DB *db, BIGNUM *serial, char *subj, char *startdate,
char *enddate, int days, int batch, char *ext_sect, char *enddate, int days, int batch, char *ext_sect,
LHASH *conf,int verbose, unsigned long certopt, LHASH *conf,int verbose, unsigned long certopt,
unsigned long nameopt, int default_op, int ext_copy); unsigned long nameopt, int default_op, int ext_copy,
ENGINE *e);
static int certify_spkac(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509, static int certify_spkac(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509,
const EVP_MD *dgst,STACK_OF(CONF_VALUE) *policy, const EVP_MD *dgst,STACK_OF(CONF_VALUE) *policy,
TXT_DB *db, BIGNUM *serial,char *subj, char *startdate, TXT_DB *db, BIGNUM *serial,char *subj, char *startdate,
@ -703,18 +704,10 @@ bad:
lookup_fail(section,ENV_CERTIFICATE); lookup_fail(section,ENV_CERTIFICATE);
goto err; goto err;
} }
if (BIO_read_filename(in,certfile) <= 0) x509=load_cert(bio_err, certfile, FORMAT_PEM, NULL, e,
{ "CA certificate");
perror(certfile);
BIO_printf(bio_err,"trying to load CA certificate\n");
goto err;
}
x509=PEM_read_bio_X509(in,NULL,NULL,NULL);
if (x509 == NULL) if (x509 == NULL)
{
BIO_printf(bio_err,"unable to load CA certificate\n");
goto err; goto err;
}
if (!X509_check_private_key(x509,pkey)) if (!X509_check_private_key(x509,pkey))
{ {
@ -1197,7 +1190,7 @@ bad:
j=certify_cert(&x,ss_cert_file,pkey,x509,dgst,attribs, j=certify_cert(&x,ss_cert_file,pkey,x509,dgst,attribs,
db,serial,subj,startdate,enddate,days,batch, db,serial,subj,startdate,enddate,days,batch,
extensions,conf,verbose, certopt, nameopt, extensions,conf,verbose, certopt, nameopt,
default_op, ext_copy); default_op, ext_copy, e);
if (j < 0) goto err; if (j < 0) goto err;
if (j > 0) if (j > 0)
{ {
@ -1539,18 +1532,10 @@ bad:
else else
{ {
X509 *revcert; X509 *revcert;
if (BIO_read_filename(in,infile) <= 0) revcert=load_cert(bio_err, infile, FORMAT_PEM,
{ NULL, e, infile);
perror(infile);
BIO_printf(bio_err,"error trying to load '%s' certificate\n",infile);
goto err;
}
revcert=PEM_read_bio_X509(in,NULL,NULL,NULL);
if (revcert == NULL) if (revcert == NULL)
{
BIO_printf(bio_err,"unable to load '%s' certificate\n",infile);
goto err; goto err;
}
j=do_revoke(revcert,db, rev_type, rev_arg); j=do_revoke(revcert,db, rev_type, rev_arg);
if (j <= 0) goto err; if (j <= 0) goto err;
X509_free(revcert); X509_free(revcert);
@ -1597,7 +1582,7 @@ err:
BIO_free_all(Cout); BIO_free_all(Cout);
BIO_free_all(Sout); BIO_free_all(Sout);
BIO_free_all(out); BIO_free_all(out);
BIO_free(in); BIO_free_all(in);
sk_X509_pop_free(cert_sk,X509_free); sk_X509_pop_free(cert_sk,X509_free);
@ -1610,6 +1595,7 @@ err:
X509_CRL_free(crl); X509_CRL_free(crl);
CONF_free(conf); CONF_free(conf);
OBJ_cleanup(); OBJ_cleanup();
apps_shutdown();
EXIT(ret); EXIT(ret);
} }
@ -1783,26 +1769,15 @@ static int certify_cert(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
BIGNUM *serial, char *subj, char *startdate, char *enddate, int days, BIGNUM *serial, char *subj, char *startdate, char *enddate, int days,
int batch, char *ext_sect, LHASH *lconf, int verbose, int batch, char *ext_sect, LHASH *lconf, int verbose,
unsigned long certopt, unsigned long nameopt, int default_op, unsigned long certopt, unsigned long nameopt, int default_op,
int ext_copy) int ext_copy, ENGINE *e)
{ {
X509 *req=NULL; X509 *req=NULL;
X509_REQ *rreq=NULL; X509_REQ *rreq=NULL;
BIO *in=NULL;
EVP_PKEY *pktmp=NULL; EVP_PKEY *pktmp=NULL;
int ok= -1,i; int ok= -1,i;
in=BIO_new(BIO_s_file()); if ((req=load_cert(bio_err, infile, FORMAT_PEM, NULL, e, infile)) == NULL)
if (BIO_read_filename(in,infile) <= 0)
{
perror(infile);
goto err; goto err;
}
if ((req=PEM_read_bio_X509(in,NULL,NULL,NULL)) == NULL)
{
BIO_printf(bio_err,"Error reading self signed certificate in %s\n",infile);
goto err;
}
if (verbose) if (verbose)
X509_print(bio_err,req); X509_print(bio_err,req);
@ -1840,7 +1815,6 @@ static int certify_cert(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
err: err:
if (rreq != NULL) X509_REQ_free(rreq); if (rreq != NULL) X509_REQ_free(rreq);
if (req != NULL) X509_free(req); if (req != NULL) X509_free(req);
if (in != NULL) BIO_free(in);
return(ok); return(ok);
} }