summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2020-02-11 09:13:33 +1000
committerPauli <paul.dale@oracle.com>2020-02-12 19:45:42 +1000
commit99b9aa95c435058bd35fb3b83b885894e2247c82 (patch)
treeb502ad1a894ebcb8029c3f58c8ced55e7cffc9ca /crypto
parent663247bf1181043d168a542b0d0d56cc0318e2f7 (diff)
Remove unused OSSL_PARAM_construct_from_text() function.
This function is recently introduced and never called by the library or tests. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/11053)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/params_from_text.c31
-rw-r--r--crypto/sm2/sm2_pmeth.c3
2 files changed, 1 insertions, 33 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,
- &paramdef, &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) {