diff options
| author | Pauli <paul.dale@oracle.com> | 2019-06-24 14:43:55 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-06-24 14:43:55 +1000 |
| commit | 4e7991b497b65145ec5d570485020e1658208866 (patch) | |
| tree | 34e384b7aa820b0b7ccefddee9a0fbd86c8850fb /util | |
| parent | 0ccff7a7ea82a921f780a483fc91c6b90a1378d9 (diff) | |
Change OSSL_PARAM return size to not be a pointer.
Instead of referencing the return size from the OSSL_PARAM structure, make the
size a field within the structure.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9135)
Diffstat (limited to 'util')
| -rw-r--r-- | util/libcrypto.num | 1 | ||||
| -rw-r--r-- | util/private.num | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index af6e2b96b4..766c735b2f 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4832,3 +4832,4 @@ OPENSSL_CTX_get0_private_drbg 4776 3_0_0 EXIST::FUNCTION: BN_CTX_new_ex 4777 3_0_0 EXIST::FUNCTION: BN_CTX_secure_new_ex 4778 3_0_0 EXIST::FUNCTION: OPENSSL_thread_stop_ex 4779 3_0_0 EXIST::FUNCTION: +OSSL_PARAM_locate_const 4780 3_0_0 EXIST::FUNCTION: diff --git a/util/private.num b/util/private.num index 7f4bf907ea..fb5d0b2644 100644 --- a/util/private.num +++ b/util/private.num @@ -332,14 +332,15 @@ OSSL_PARAM_TYPE define OSSL_PARAM_octet_ptr define OSSL_PARAM_octet_string define OSSL_PARAM_utf8_ptr define +OSSL_PARAM_BN define +OSSL_PARAM_TYPE generic +OSSL_PARAM_construct_TYPE generic +OSSL_PARAM_octet_string define OSSL_PARAM_utf8_string define -OSSL_PARAM_SIZED_BN define -OSSL_PARAM_SIZED_TYPE define -OSSL_PARAM_SIZED_octet_ptr define -OSSL_PARAM_SIZED_octet_string define -OSSL_PARAM_SIZED_utf8_ptr define -OSSL_PARAM_SIZED_utf8_string define +OSSL_PARAM_octet_ptr define +OSSL_PARAM_get_TYPE generic OSSL_PARAM_END define +OSSL_PARAM_set_TYPE generic PEM_FLAG_EAY_COMPATIBLE define PEM_FLAG_ONLY_B64 define PEM_FLAG_SECURE define |