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

More EVP_PKEY patches for new functionality.

Browse Source
This commit is contained in:
Dr. Stephen Henson 1999-01-03 23:00:45 +00:00
parent cb0f35d716
commit 10061c7c47
5 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/ca.c
View File

@ -1228,6 +1228,7 @@ int verbose;
goto err; goto err;
} }
i=X509_REQ_verify(req,pktmp); i=X509_REQ_verify(req,pktmp);
EVP_PKEY_free(pktmp);
if (i < 0) if (i < 0)
{ {
ok=0; ok=0;
@ -1297,6 +1298,7 @@ int verbose;
goto err; goto err;
} }
i=X509_verify(req,pktmp); i=X509_verify(req,pktmp);
EVP_PKEY_free(pktmp);
if (i < 0) if (i < 0)
{ {
ok=0; ok=0;
@ -1651,7 +1653,9 @@ again2:
if (!X509_set_subject_name(ret,subject)) goto err; if (!X509_set_subject_name(ret,subject)) goto err;
pktmp=X509_REQ_get_pubkey(req); pktmp=X509_REQ_get_pubkey(req);
if (!X509_set_pubkey(ret,pktmp)) goto err; i = X509_set_pubkey(ret,pktmp);
EVP_PKEY_free(pktmp);
if (!i) goto err;
/* Lets add the extensions, if there are any */ /* Lets add the extensions, if there are any */
if ((extensions != NULL) && (sk_num(extensions) > 0)) if ((extensions != NULL) && (sk_num(extensions) > 0))
@ -1701,6 +1705,7 @@ again2:
if (EVP_PKEY_missing_parameters(pktmp) && if (EVP_PKEY_missing_parameters(pktmp) &&
!EVP_PKEY_missing_parameters(pkey)) !EVP_PKEY_missing_parameters(pkey))
EVP_PKEY_copy_parameters(pktmp,pkey); EVP_PKEY_copy_parameters(pktmp,pkey);
EVP_PKEY_free(pktmp);
#endif #endif
if (!X509_sign(ret,pkey,dgst)) if (!X509_sign(ret,pkey,dgst))
@ -1953,6 +1958,7 @@ int verbose;
BIO_printf(bio_err,"Signature ok\n"); BIO_printf(bio_err,"Signature ok\n");
X509_REQ_set_pubkey(req,pktmp); X509_REQ_set_pubkey(req,pktmp);
EVP_PKEY_free(pktmp);
ok=do_body(xret,pkey,x509,dgst,policy,db,serial,startdate, ok=do_body(xret,pkey,x509,dgst,policy,db,serial,startdate,
days,1,verbose,req,extensions); days,1,verbose,req,extensions);
err: err:

5
apps/req.c
View File

@ -624,6 +624,7 @@ loop:
} }
if (x509) if (x509)
{ {
EVP_PKEY *tmppkey;
if ((x509ss=X509_new()) == NULL) goto end; if ((x509ss=X509_new()) == NULL) goto end;
/* don't set the version number, for starters /* don't set the version number, for starters
@ -639,7 +640,9 @@ loop:
(long)60*60*24*days); (long)60*60*24*days);
X509_set_subject_name(x509ss, X509_set_subject_name(x509ss,
X509_REQ_get_subject_name(req)); X509_REQ_get_subject_name(req));
X509_set_pubkey(x509ss,X509_REQ_get_pubkey(req)); tmppkey = X509_REQ_get_pubkey(req);
X509_set_pubkey(x509ss,tmppkey);
EVP_PKEY_free(tmppkey);
if (!(i=X509_sign(x509ss,pkey,digest))) if (!(i=X509_sign(x509ss,pkey,digest)))
goto end; goto end;

17
apps/x509.c
View File

@ -402,7 +402,9 @@ bad:
ci->key=req->req_info->pubkey; ci->key=req->req_info->pubkey;
req->req_info->pubkey=NULL; req->req_info->pubkey=NULL;
#else #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 #endif
} }
else else
@ -715,7 +717,9 @@ int days;
X509_STORE_CTX xsc; X509_STORE_CTX xsc;
EVP_PKEY *upkey; 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); X509_STORE_CTX_init(&xsc,ctx,x,NULL);
buf=(char *)Malloc(EVP_PKEY_size(pkey)*2+ buf=(char *)Malloc(EVP_PKEY_size(pkey)*2+
@ -833,6 +837,7 @@ int days;
/* Force a re-write */ /* Force a re-write */
X509_set_pubkey(x,upkey); X509_set_pubkey(x,upkey);
} }
EVP_PKEY_free(upkey);
if (!X509_sign(x,pkey,digest)) goto end; if (!X509_sign(x,pkey,digest)) goto end;
ret=1; ret=1;
@ -1033,8 +1038,12 @@ int days;
EVP_MD *digest; EVP_MD *digest;
{ {
EVP_PKEY_copy_parameters(X509_get_pubkey(x),pkey); EVP_PKEY *pktmp;
EVP_PKEY_save_parameters(X509_get_pubkey(x),1);
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_set_issuer_name(x,X509_get_subject_name(x))) goto err;
if (X509_gmtime_adj(X509_get_notBefore(x),0) == NULL) goto err; if (X509_gmtime_adj(X509_get_notBefore(x),0) == NULL) goto err;

1
crypto/x509/x509_cmp.c
View File

@ -297,5 +297,6 @@ EVP_PKEY *k;
ok=1; ok=1;
err: err:
EVP_PKEY_free(xk);
return(ok); return(ok);
} }

5
crypto/x509/x509_req.c
View File

@ -74,6 +74,7 @@ EVP_MD *md;
X509_REQ *ret; X509_REQ *ret;
X509_REQ_INFO *ri; X509_REQ_INFO *ri;
int i; int i;
EVP_PKEY *pktmp;
ret=X509_REQ_new(); ret=X509_REQ_new();
if (ret == NULL) if (ret == NULL)
@ -92,7 +93,9 @@ EVP_MD *md;
if (!X509_REQ_set_subject_name(ret,X509_get_subject_name(x))) if (!X509_REQ_set_subject_name(ret,X509_get_subject_name(x)))
goto err; goto err;
i=X509_REQ_set_pubkey(ret,X509_get_pubkey(x)); pktmp = X509_get_pubkey(x);
i=X509_REQ_set_pubkey(ret,pktmp);
EVP_PKEY_free(pktmp);
if (!i) goto err; if (!i) goto err;
if (pkey != NULL) if (pkey != NULL)