diff options
Diffstat (limited to 'crypto/pem/pem_pkey.c')
| -rw-r--r-- | crypto/pem/pem_pkey.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c index 717fb4ef4d..c71bc24bb2 100644 --- a/crypto/pem/pem_pkey.c +++ b/crypto/pem/pem_pkey.c @@ -151,9 +151,9 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, return PEM_read_bio_PrivateKey_ex(bp, x, cb, u, NULL, NULL); } -PEM_write_cb_fnsig(PrivateKey, EVP_PKEY, BIO, write_bio) +PEM_write_cb_ex_fnsig(PrivateKey, EVP_PKEY, BIO, write_bio) { - IMPLEMENT_PEM_provided_write_body_vars(EVP_PKEY, PrivateKey); + IMPLEMENT_PEM_provided_write_body_vars(EVP_PKEY, PrivateKey, propq); IMPLEMENT_PEM_provided_write_body_pass(); IMPLEMENT_PEM_provided_write_body_main(EVP_PKEY, bio); @@ -165,6 +165,12 @@ PEM_write_cb_fnsig(PrivateKey, EVP_PKEY, BIO, write_bio) return PEM_write_bio_PrivateKey_traditional(out, x, enc, kstr, klen, cb, u); } +PEM_write_cb_fnsig(PrivateKey, EVP_PKEY, BIO, write_bio) +{ + return PEM_write_bio_PrivateKey_ex(out, x, enc, kstr, klen, cb, u, + NULL, NULL); +} + /* * Note: there is no way to tell a provided pkey encoder to use "traditional" * encoding. Therefore, if the pkey is provided, we try to take a copy @@ -212,7 +218,7 @@ EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x) PEM_write_fnsig(Parameters, EVP_PKEY, BIO, write_bio) { char pem_str[80]; - IMPLEMENT_PEM_provided_write_body_vars(EVP_PKEY, Parameters); + IMPLEMENT_PEM_provided_write_body_vars(EVP_PKEY, Parameters, NULL); IMPLEMENT_PEM_provided_write_body_main(EVP_PKEY, bio); @@ -249,20 +255,23 @@ EVP_PKEY *PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, return PEM_read_PrivateKey_ex(fp, x, cb, u, NULL, NULL); } -int PEM_write_PrivateKey(FILE *fp, const EVP_PKEY *x, const EVP_CIPHER *enc, - const unsigned char *kstr, int klen, - pem_password_cb *cb, void *u) +PEM_write_cb_ex_fnsig(PrivateKey, EVP_PKEY, FILE, write) { BIO *b; int ret; - if ((b = BIO_new_fp(fp, BIO_NOCLOSE)) == NULL) { + if ((b = BIO_new_fp(out, BIO_NOCLOSE)) == NULL) { ERR_raise(ERR_LIB_PEM, ERR_R_BUF_LIB); return 0; } - ret = PEM_write_bio_PrivateKey(b, x, enc, kstr, klen, cb, u); + ret = PEM_write_bio_PrivateKey_ex(b, x, enc, kstr, klen, cb, u, + libctx, propq); BIO_free(b); return ret; } +PEM_write_cb_fnsig(PrivateKey, EVP_PKEY, FILE, write) +{ + return PEM_write_PrivateKey_ex(out, x, enc, kstr, klen, cb, u, NULL, NULL); +} #endif |