mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-01 19:28:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

ed25519 and ed448: fix incorrect OSSL_PKEY_PARAM_MAX_SIZE

Browse Source 
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)
This commit is contained in:
Tomas Mraz 2021-06-01 14:54:43 +02:00
parent 4388417157
commit ea82158103
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
providers/implementations/keymgmt/ecx_kmgmt.c
View File

@ -309,14 +309,14 @@ static int x448_get_params(void *key, OSSL_PARAM params[])
static int ed25519_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, return ecx_get_params(key, params, ED25519_BITS, ED25519_SECURITY_BITS,
ED25519_KEYLEN) ED25519_SIGSIZE)
&& ed_get_params(key, params); && ed_get_params(key, params);
} }
static int ed448_get_params(void *key, OSSL_PARAM params[]) static int ed448_get_params(void *key, OSSL_PARAM params[])
{ {
return ecx_get_params(key, params, ED448_BITS, ED448_SECURITY_BITS, return ecx_get_params(key, params, ED448_BITS, ED448_SECURITY_BITS,
ED448_KEYLEN) ED448_SIGSIZE)
&& ed_get_params(key, params); && ed_get_params(key, params);
} }

4
test/evp_pkey_provided_test.c
View File

@ -979,7 +979,7 @@ static int test_fromdata_ecx(int tst)
fromdata_params = ed25519_fromdata_params; fromdata_params = ed25519_fromdata_params;
bits = ED25519_BITS; bits = ED25519_BITS;
security_bits = ED25519_SECURITY_BITS; security_bits = ED25519_SECURITY_BITS;
size = ED25519_KEYLEN; size = ED25519_SIGSIZE;
alg = "ED25519"; alg = "ED25519";
break; break;
@ -987,7 +987,7 @@ static int test_fromdata_ecx(int tst)
fromdata_params = ed448_fromdata_params; fromdata_params = ed448_fromdata_params;
bits = ED448_BITS; bits = ED448_BITS;
security_bits = ED448_SECURITY_BITS; security_bits = ED448_SECURITY_BITS;
size = ED448_KEYLEN; size = ED448_SIGSIZE;
alg = "ED448"; alg = "ED448";
break; break;
default: default: