diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-06-01 14:54:43 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-06-02 17:17:51 +0200 |
| commit | ea8215810319722cf76f777f812688eb3d632678 (patch) | |
| tree | 071a9f88e1962d6268244de15a6f37c087f684b2 | |
| parent | 4388417157ce77974888089ec133d26d7bb0f465 (diff) | |
| download | openssl-new-ea8215810319722cf76f777f812688eb3d632678.tar.gz | |
ed25519 and ed448: fix incorrect OSSL_PKEY_PARAM_MAX_SIZE
Fixes #15552
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15566)
| -rw-r--r-- | providers/implementations/keymgmt/ecx_kmgmt.c | 4 | ||||
| -rw-r--r-- | test/evp_pkey_provided_test.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/providers/implementations/keymgmt/ecx_kmgmt.c b/providers/implementations/keymgmt/ecx_kmgmt.c index 9de954651b..b088c03b30 100644 --- a/providers/implementations/keymgmt/ecx_kmgmt.c +++ b/providers/implementations/keymgmt/ecx_kmgmt.c @@ -309,14 +309,14 @@ static int x448_get_params(void *key, OSSL_PARAM params[]) static int ed25519_get_params(void *key, OSSL_PARAM params[]) { return ecx_get_params(key, params, ED25519_BITS, ED25519_SECURITY_BITS, - ED25519_KEYLEN) + ED25519_SIGSIZE) && ed_get_params(key, params); } static int ed448_get_params(void *key, OSSL_PARAM params[]) { return ecx_get_params(key, params, ED448_BITS, ED448_SECURITY_BITS, - ED448_KEYLEN) + ED448_SIGSIZE) && ed_get_params(key, params); } diff --git a/test/evp_pkey_provided_test.c b/test/evp_pkey_provided_test.c index 92b3614f6e..bdfa3cd754 100644 --- a/test/evp_pkey_provided_test.c +++ b/test/evp_pkey_provided_test.c @@ -979,7 +979,7 @@ static int test_fromdata_ecx(int tst) fromdata_params = ed25519_fromdata_params; bits = ED25519_BITS; security_bits = ED25519_SECURITY_BITS; - size = ED25519_KEYLEN; + size = ED25519_SIGSIZE; alg = "ED25519"; break; @@ -987,7 +987,7 @@ static int test_fromdata_ecx(int tst) fromdata_params = ed448_fromdata_params; bits = ED448_BITS; security_bits = ED448_SECURITY_BITS; - size = ED448_KEYLEN; + size = ED448_SIGSIZE; alg = "ED448"; break; default: |