diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2021-05-07 21:30:53 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2021-09-17 16:33:07 -0400 |
| commit | c605e559e890ce77ec033a6c1cad819f266401a8 (patch) | |
| tree | 35cb8fe70d3840551cf52ee28013afa6602418c7 | |
| parent | 2edf7da98a667491962243e2378c33137cbdfea7 (diff) | |
| download | gnutls-c605e559e890ce77ec033a6c1cad819f266401a8.tar.gz | |
nettle: handle X25519 and X448 in pk_fixup
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
| -rw-r--r-- | lib/nettle/pk.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/lib/nettle/pk.c b/lib/nettle/pk.c index ec2f1e5df6..6af19c459f 100644 --- a/lib/nettle/pk.c +++ b/lib/nettle/pk.c @@ -3507,6 +3507,30 @@ wrap_nettle_pk_fixup(gnutls_pk_algorithm_t algo, } params->raw_pub.size = params->raw_priv.size; + } else if (algo == GNUTLS_PK_ECDH_X25519 || + algo == GNUTLS_PK_ECDH_X448) { + if (unlikely(get_ecdh_curve(algo) != params->curve)) + return gnutls_assert_val(GNUTLS_E_ECC_UNSUPPORTED_CURVE); + + if (params->raw_priv.data == NULL) + return gnutls_assert_val(GNUTLS_E_PK_INVALID_PRIVKEY); + + if (params->raw_pub.data == NULL) { + params->raw_pub.data = gnutls_malloc(params->raw_priv.size); + } + + if (params->raw_pub.data == NULL) + return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR); + + ret = edwards_curve_mul_g(algo, + params->raw_pub.data, + params->raw_priv.data); + if (ret < 0) { + gnutls_free(params->raw_pub.data); + return ret; + } + + params->raw_pub.size = params->raw_priv.size; } else if (algo == GNUTLS_PK_RSA_PSS) { if (params->params_nr < RSA_PRIVATE_PARAMS - 3) return gnutls_assert_val(GNUTLS_E_PK_INVALID_PRIVKEY); |