diff options
author | Benjamin Kaduk <bkaduk@akamai.com> | 2016-02-18 21:24:27 -0600 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2017-05-08 21:17:28 +0200 |
commit | 204afd81b12c71d625e89599c0eef33588afc1f0 (patch) | |
tree | 8d53ed9eb9314f7342d12fba9e1647fb78419700 /util | |
parent | d396da33130aba2e77478d00fd369eb8d34bd8bf (diff) |
Add PEM_read_bio_ex
The extended function includes a 'flags' argument to allow callers
to specify different requested behaviors. In particular, callers can
request that temporary storage buffers are allocated from the secure heap,
which could be relevant when loading private key material.
Refactor PEM_read_bio to use BIO_mems instead of BUFs directly,
use some helper routines to reduce the overall function length, and make
some of the checks more reasonable.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1700)
Diffstat (limited to 'util')
-rw-r--r-- | util/libcrypto.num | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index 2e820426e9..fa14ab4c55 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4288,3 +4288,4 @@ TS_CONF_set_ess_cert_id_digest 4230 1_1_1 EXIST::FUNCTION:TS ESS_SIGNING_CERT_V2_free 4231 1_1_1 EXIST::FUNCTION:TS ESS_SIGNING_CERT_V2_dup 4232 1_1_1 EXIST::FUNCTION:TS ESS_CERT_ID_V2_new 4233 1_1_1 EXIST::FUNCTION:TS +PEM_read_bio_ex 4234 1_1_1 EXIST::FUNCTION: |