diff options
| -rw-r--r-- | crypto/params_from_text.c | 31 | ||||
| -rw-r--r-- | crypto/sm2/sm2_pmeth.c | 3 | ||||
| -rw-r--r-- | doc/man3/OSSL_PARAM_allocate_from_text.pod (renamed from doc/man3/OSSL_PARAM_construct_from_text.pod) | 15 | ||||
| -rw-r--r-- | include/openssl/params.h | 5 | ||||
| -rw-r--r-- | util/libcrypto.num | 1 |
5 files changed, 4 insertions, 51 deletions
diff --git a/crypto/params_from_text.c b/crypto/params_from_text.c index 053b93d2c3..59cee5f115 100644 --- a/crypto/params_from_text.c +++ b/crypto/params_from_text.c @@ -160,37 +160,6 @@ static int construct_from_text(OSSL_PARAM *to, const OSSL_PARAM *paramdef, return 1; } -int OSSL_PARAM_construct_from_text(OSSL_PARAM *to, - const OSSL_PARAM *paramdefs, - const char *key, const char *value, - size_t value_n, - void *buf, size_t *buf_n) -{ - const OSSL_PARAM *paramdef = NULL; - int ishex = 0; - BIGNUM *tmpbn = NULL; - int ok = 0; - - if (to == NULL || paramdefs == NULL) - return 0; - - if (!prepare_from_text(paramdefs, key, value, value_n, - ¶mdef, &ishex, buf_n, &tmpbn)) - return 0; - - /* - * The user gets the expected buffer size back even if the buffer isn't - * allocated. - */ - if (buf == NULL) - return 1; - - ok = construct_from_text(to, paramdef, value, value_n, ishex, - buf, *buf_n, tmpbn); - BN_free(tmpbn); - return ok; -} - int OSSL_PARAM_allocate_from_text(OSSL_PARAM *to, const OSSL_PARAM *paramdefs, const char *key, const char *value, diff --git a/crypto/sm2/sm2_pmeth.c b/crypto/sm2/sm2_pmeth.c index 681a0ab130..c3ba9280c5 100644 --- a/crypto/sm2/sm2_pmeth.c +++ b/crypto/sm2/sm2_pmeth.c @@ -253,8 +253,7 @@ static int pkey_sm2_ctrl_str(EVP_PKEY_CTX *ctx, } else if (strcmp(type, "sm2_hex_id") == 0) { /* * TODO(3.0): reconsider the name "sm2_hex_id", OR change - * OSSL_PARAM_construct_from_text() / OSSL_PARAM_allocate_from_text() - * to handle infix "_hex_" + * OSSL_PARAM_allocate_from_text() to handle infix "_hex_" */ hex_id = OPENSSL_hexstr2buf((const char *)value, &hex_len); if (hex_id == NULL) { diff --git a/doc/man3/OSSL_PARAM_construct_from_text.pod b/doc/man3/OSSL_PARAM_allocate_from_text.pod index 7e6c3e9193..c16491e702 100644 --- a/doc/man3/OSSL_PARAM_construct_from_text.pod +++ b/doc/man3/OSSL_PARAM_allocate_from_text.pod @@ -2,18 +2,13 @@ =head1 NAME -OSSL_PARAM_construct_from_text, OSSL_PARAM_allocate_from_text +OSSL_PARAM_allocate_from_text - OSSL_PARAM construction utilities =head1 SYNOPSIS #include <openssl/params.h> - int OSSL_PARAM_construct_from_text(OSSL_PARAM *to, - const OSSL_PARAM *paramdefs, - const char *key, const char *value, - size_t value_n, - void *buf, size_t *buf_n) int OSSL_PARAM_allocate_from_text(OSSL_PARAM *to, const OSSL_PARAM *paramdefs, const char *key, const char *value, @@ -30,7 +25,7 @@ OpenSSL 3.0 introduces a new mechanism to do the same thing with an array of parameters that contain name, value, value type and value size (see L<OSSL_PARAM(3)> for more information). -OSSL_PARAM_construct_from_text() takes a control I<key>, I<value> and +OSSL_PARAM_allocate_from_text() takes a control I<key>, I<value> and value size I<value_n>, and given a parameter descriptor array I<paramdefs>, it converts the value to something suitable for L<OSSL_PARAM(3)> and stores that in the buffer I<buf>, and modifies @@ -42,9 +37,6 @@ left untouched, allowing a caller to find out how large the buffer should be. I<buf> needs to be correctly aligned for the type of the B<OSSL_PARAM> I<key>. - -OSSL_PARAM_allocate_from_text() works like OSSL_PARAM_construct_from_text(), -except it allocates the buffer internally. The caller must remember to free the data of I<to> when it's not useful any more. @@ -57,8 +49,7 @@ as parameter value. =head1 RETURN VALUES -OSSL_PARAM_construct_from_text() and OSSL_PARAM_allocate_from_text() -returns 1 on success, and 0 on error. +OSSL_PARAM_allocate_from_text() returns 1 on success, and 0 on error. =head1 NOTES diff --git a/include/openssl/params.h b/include/openssl/params.h index aec3bc18b8..a5d2fd4f41 100644 --- a/include/openssl/params.h +++ b/include/openssl/params.h @@ -89,11 +89,6 @@ OSSL_PARAM OSSL_PARAM_construct_octet_ptr(const char *key, void **buf, size_t bsize); OSSL_PARAM OSSL_PARAM_construct_end(void); -int OSSL_PARAM_construct_from_text(OSSL_PARAM *to, - const OSSL_PARAM *paramdefs, - const char *key, const char *value, - size_t value_n, - void *buf, size_t *buf_n); int OSSL_PARAM_allocate_from_text(OSSL_PARAM *to, const OSSL_PARAM *paramdefs, const char *key, const char *value, diff --git a/util/libcrypto.num b/util/libcrypto.num index 29e37b4a41..a87630b633 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4688,7 +4688,6 @@ EC_KEY_new_ex ? 3_0_0 EXIST::FUNCTION:EC EC_KEY_new_by_curve_name_ex ? 3_0_0 EXIST::FUNCTION:EC OPENSSL_hexstr2buf_ex ? 3_0_0 EXIST::FUNCTION: OPENSSL_buf2hexstr_ex ? 3_0_0 EXIST::FUNCTION: -OSSL_PARAM_construct_from_text ? 3_0_0 EXIST::FUNCTION: OSSL_PARAM_allocate_from_text ? 3_0_0 EXIST::FUNCTION: EVP_MD_gettable_params ? 3_0_0 EXIST::FUNCTION: EVP_MD_CTX_settable_params ? 3_0_0 EXIST::FUNCTION: |