projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New utility pkeyparam. Enhance and bugfix algorithm specific parameter
[openssl.git]
/
crypto
/
pem
/
pem_pkey.c
diff --git
a/crypto/pem/pem_pkey.c
b/crypto/pem/pem_pkey.c
index b9067e074545e0aaf2c3d17bfc27428bad63dd4c..7747a057f4714f4b58c0d56b3e909720e4d51bd8 100644
(file)
--- a/
crypto/pem/pem_pkey.c
+++ b/
crypto/pem/pem_pkey.c
@@
-149,7
+149,7
@@
int PEM_write_bio_PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
pem_str,bp,(char *)x,enc,kstr,klen,cb,u);
}
pem_str,bp,(char *)x,enc,kstr,klen,cb,u);
}
-EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x
, pem_password_cb *cb, void *u
)
+EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x)
{
char *nm=NULL;
const unsigned char *p=NULL;
{
char *nm=NULL;
const unsigned char *p=NULL;
@@
-159,7
+159,7
@@
EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, vo
EVP_PKEY *ret=NULL;
if (!PEM_bytes_read_bio(&data, &len, &nm, PEM_STRING_PARAMETERS,
EVP_PKEY *ret=NULL;
if (!PEM_bytes_read_bio(&data, &len, &nm, PEM_STRING_PARAMETERS,
- bp,
cb, u
))
+ bp,
0, NULL
))
return NULL;
p = data;
return NULL;
p = data;
@@
-192,7
+192,7
@@
err:
return(ret);
}
return(ret);
}
-int PEM_write_bio_Paramters(BIO *bp, EVP_PKEY *x)
+int PEM_write_bio_Param
e
ters(BIO *bp, EVP_PKEY *x)
{
char pem_str[80];
if (!x->ameth || !x->ameth->param_encode)
{
char pem_str[80];
if (!x->ameth || !x->ameth->param_encode)