diff options
| author | Graham Woodward <graham.woodward@ibm.com> | 2022-08-19 09:46:47 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2022-09-23 18:40:02 +0200 |
| commit | e869c867c1c405de3b6538586f17b67937556a4b (patch) | |
| tree | 21feab85e639e54c1e2a8a6d1a68a807f2e7dae4 /util | |
| parent | Modify test/quic_record_test.c to also depacketize (diff) | |
| download | openssl-e869c867c1c405de3b6538586f17b67937556a4b.tar.xz openssl-e869c867c1c405de3b6538586f17b67937556a4b.zip | |
Allow PKCS12 export to set arbitrary bag attributes
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19025)
Diffstat (limited to 'util')
| -rw-r--r-- | util/libcrypto.num | 2 | ||||
| -rw-r--r-- | util/other.syms | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index 5e6c85b638..4c5cd7907d 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -5463,3 +5463,5 @@ BIO_s_dgram_pair ? 3_1_0 EXIST::FUNCTION:DGRAM BIO_new_bio_dgram_pair ? 3_1_0 EXIST::FUNCTION:DGRAM EVP_PKEY_auth_encapsulate_init ? 3_1_0 EXIST::FUNCTION: EVP_PKEY_auth_decapsulate_init ? 3_1_0 EXIST::FUNCTION: +PKCS12_SAFEBAG_set0_attrs ? 3_1_0 EXIST::FUNCTION: +PKCS12_create_ex2 ? 3_1_0 EXIST::FUNCTION: diff --git a/util/other.syms b/util/other.syms index 36ce26ee36..a35f6fd54a 100644 --- a/util/other.syms +++ b/util/other.syms @@ -139,6 +139,7 @@ pem_password_cb datatype ssl_ct_validation_cb datatype ASYNC_stack_alloc_fn datatype ASYNC_stack_free_fn datatype +PKCS12_create_cb datatype # ASN1_BIT_STRING_digest define BIO_IS_ERRNO define |