mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-10 03:54:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Teach PEM_read_bio_PrivateKey about libctx

Browse Source 
Now that d2i_PrivateKey_ex() and other similar functions exist we should
use it when loading a PEM PrivateKey.

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11494)
This commit is contained in:
Matt Caswell 2020-04-06 18:21:50 +01:00
parent 8755b08524
commit 1531241c54
3 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
crypto/pem/pem_pkey.c
View File

@ -27,8 +27,9 @@
int pem_check_suffix(const char *pem_str, const char *suffix); int pem_check_suffix(const char *pem_str, const char *suffix);
EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, EVP_PKEY *PEM_read_bio_PrivateKey_ex(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
void *u) void *u, OPENSSL_CTX *libctx,
const char *propq)
{ {
EVP_PKEY *ret = NULL; EVP_PKEY *ret = NULL;
OSSL_STORE_CTX *ctx = NULL; OSSL_STORE_CTX *ctx = NULL;
@ -38,7 +39,8 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
if ((ui_method = UI_UTIL_wrap_read_pem_callback(cb, 0)) == NULL) if ((ui_method = UI_UTIL_wrap_read_pem_callback(cb, 0)) == NULL)
return NULL; return NULL;
if ((ctx = ossl_store_attach_pem_bio(bp, ui_method, u)) == NULL) if ((ctx = ossl_store_attach_pem_bio(bp, ui_method, u, libctx,
propq)) == NULL)
goto err; goto err;
#ifndef OPENSSL_NO_SECURE_HEAP #ifndef OPENSSL_NO_SECURE_HEAP
{ {
@ -66,6 +68,12 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
return ret; return ret;
} }
EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
void *u)
{
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_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);
@ -97,7 +105,7 @@ EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x)
OSSL_STORE_CTX *ctx = NULL; OSSL_STORE_CTX *ctx = NULL;
OSSL_STORE_INFO *info = NULL; OSSL_STORE_INFO *info = NULL;
if ((ctx = ossl_store_attach_pem_bio(bp, UI_null(), NULL)) == NULL) if ((ctx = ossl_store_attach_pem_bio(bp, UI_null(), NULL, NULL, NULL)) == NULL)
goto err; goto err;
while (!OSSL_STORE_eof(ctx) && (info = OSSL_STORE_load(ctx)) != NULL) { while (!OSSL_STORE_eof(ctx) && (info = OSSL_STORE_load(ctx)) != NULL) {
@ -134,22 +142,29 @@ PEM_write_fnsig(Parameters, EVP_PKEY, BIO, write_bio)
} }
#ifndef OPENSSL_NO_STDIO #ifndef OPENSSL_NO_STDIO
EVP_PKEY *PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, EVP_PKEY *PEM_read_PrivateKey_ex(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
void *u) void *u, OPENSSL_CTX *libctx,
const char *propq)
{ {
BIO *b; BIO *b;
EVP_PKEY *ret; EVP_PKEY *ret;
if ((b = BIO_new(BIO_s_file())) == NULL) { if ((b = BIO_new(BIO_s_file())) == NULL) {
PEMerr(PEM_F_PEM_READ_PRIVATEKEY, ERR_R_BUF_LIB); PEMerr(0, ERR_R_BUF_LIB);
return 0; return 0;
} }
BIO_set_fp(b, fp, BIO_NOCLOSE); BIO_set_fp(b, fp, BIO_NOCLOSE);
ret = PEM_read_bio_PrivateKey(b, x, cb, u); ret = PEM_read_bio_PrivateKey_ex(b, x, cb, u, libctx, propq);
BIO_free(b); BIO_free(b);
return ret; return ret;
} }
EVP_PKEY *PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
void *u)
{
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, int PEM_write_PrivateKey(FILE *fp, const EVP_PKEY *x, const EVP_CIPHER *enc,
const unsigned char *kstr, int klen, const unsigned char *kstr, int klen,
pem_password_cb *cb, void *u) pem_password_cb *cb, void *u)
@ -183,7 +198,7 @@ DH *PEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u)
if ((ui_method = UI_UTIL_wrap_read_pem_callback(cb, 0)) == NULL) if ((ui_method = UI_UTIL_wrap_read_pem_callback(cb, 0)) == NULL)
return NULL; return NULL;
if ((ctx = ossl_store_attach_pem_bio(bp, ui_method, u)) == NULL) if ((ctx = ossl_store_attach_pem_bio(bp, ui_method, u, NULL, NULL)) == NULL)
goto err; goto err;
while (!OSSL_STORE_eof(ctx) && (info = OSSL_STORE_load(ctx)) != NULL) { while (!OSSL_STORE_eof(ctx) && (info = OSSL_STORE_load(ctx)) != NULL) {

8
include/openssl/pem.h
View File

@ -347,6 +347,14 @@ DECLARE_PEM_rw(DHparams, DH)
DECLARE_PEM_write(DHxparams, DH) DECLARE_PEM_write(DHxparams, DH)
# endif # endif
DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY) DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY)
EVP_PKEY *PEM_read_bio_PrivateKey_ex(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
void *u, OPENSSL_CTX *libctx,
const char *propq);
# ifndef OPENSSL_NO_STDIO
EVP_PKEY *PEM_read_PrivateKey_ex(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
void *u, OPENSSL_CTX *libctx,
const char *propq);
# endif
DECLARE_PEM_rw(PUBKEY, EVP_PKEY) DECLARE_PEM_rw(PUBKEY, EVP_PKEY)
int PEM_write_bio_PrivateKey_traditional(BIO *bp, const EVP_PKEY *x, int PEM_write_bio_PrivateKey_traditional(BIO *bp, const EVP_PKEY *x,

2
util/libcrypto.num
View File

@ -5054,3 +5054,5 @@ d2i_PrivateKey_ex ? 3_0_0 EXIST::FUNCTION:
d2i_AutoPrivateKey_ex ? 3_0_0 EXIST::FUNCTION: d2i_AutoPrivateKey_ex ? 3_0_0 EXIST::FUNCTION:
d2i_PrivateKey_ex_fp ? 3_0_0 EXIST::FUNCTION:STDIO d2i_PrivateKey_ex_fp ? 3_0_0 EXIST::FUNCTION:STDIO
d2i_PrivateKey_ex_bio ? 3_0_0 EXIST::FUNCTION: d2i_PrivateKey_ex_bio ? 3_0_0 EXIST::FUNCTION:
PEM_read_bio_PrivateKey_ex ? 3_0_0 EXIST::FUNCTION:
PEM_read_PrivateKey_ex ? 3_0_0 EXIST::FUNCTION:STDIO