diff options
| author | Matt Caswell <matt@openssl.org> | 2020-10-09 14:19:42 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-20 16:39:41 +0100 |
| commit | 5ac8fb584a0ba8e4223e98b87a5416d67340360e (patch) | |
| tree | d127cc3bc9bb60a2c0a0da2dab13b9ed779eb4dd /test | |
| parent | 6a13c9c9842f54ed8d98c6f37cc4ae6c1cde8b7a (diff) | |
Rename EVP_PKEY_set1_tls_encodedpoint to EVP_PKEY_set1_encoded_public_key
We do the same thing for the "get1" version. In reality this has broader
use than just TLS (it can also be used in CMS), and "encodedpoint" only
makes sense when you are talking about EC based algorithms.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13105)
Diffstat (limited to 'test')
| -rw-r--r-- | test/tls-provider.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/tls-provider.c b/test/tls-provider.c index 86d204240b..d3188d0c20 100644 --- a/test/tls-provider.c +++ b/test/tls-provider.c @@ -476,7 +476,8 @@ static ossl_inline int xor_get_params(void *vkey, OSSL_PARAM params[]) && !OSSL_PARAM_set_int(p, xor_group.secbits)) return 0; - if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_TLS_ENCODED_PT)) != NULL) { + if ((p = OSSL_PARAM_locate(params, + OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY)) != NULL) { if (p->data_type != OSSL_PARAM_OCTET_STRING) return 0; p->return_size = XOR_KEY_SIZE; @@ -490,7 +491,7 @@ static ossl_inline int xor_get_params(void *vkey, OSSL_PARAM params[]) static const OSSL_PARAM xor_params[] = { OSSL_PARAM_int(OSSL_PKEY_PARAM_BITS, NULL), OSSL_PARAM_int(OSSL_PKEY_PARAM_SECURITY_BITS, NULL), - OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_TLS_ENCODED_PT, NULL, 0), + OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY, NULL, 0), OSSL_PARAM_END }; @@ -504,7 +505,7 @@ static int xor_set_params(void *vkey, const OSSL_PARAM params[]) XORKEY *key = vkey; const OSSL_PARAM *p; - p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_TLS_ENCODED_PT); + p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY); if (p != NULL) { if (p->data_type != OSSL_PARAM_OCTET_STRING || p->data_size != XOR_KEY_SIZE) @@ -517,7 +518,7 @@ static int xor_set_params(void *vkey, const OSSL_PARAM params[]) } static const OSSL_PARAM xor_known_settable_params[] = { - OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_TLS_ENCODED_PT, NULL, 0), + OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY, NULL, 0), OSSL_PARAM_END }; |