mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 15:17:01 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: ssl: Use only NIDs in curve name to id table

Browse Source 
The curve name to curve id mapping table was built out of multiple
internal tables found in openssl sources, namely the 'nid_to_group'
table found in 'ssl/t1_lib.c' which maps openssl specific NIDs to public
IANA curve identifiers. In this table, there were two instances of
EVP_PKEY_XXX ids being used while all the other ones are NID_XXX
identifiers.
Since the two EVP_PKEY are actually equal to their NID equivalent in
'include/openssl/evp.h' we can use NIDs all along for better coherence.
This commit is contained in:
Remi Tricot-Le Breton 2025-07-24 10:51:29 +02:00 committed by William Lallemand
parent a2267fafcf
commit 14615a8672
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ssl_utils.c
View File

@ -962,8 +962,8 @@ static struct curve {
V( 26, NID_brainpoolP256r1, "brainpoolP256r1", NULL ),
V( 27, NID_brainpoolP384r1, "brainpoolP384r1", NULL ),
V( 28, NID_brainpoolP512r1, "brainpoolP512r1", NULL ),
V( 29, EVP_PKEY_X25519, "ecdh_x25519", NULL ),
V( 30, EVP_PKEY_X448, "ecdh_x448", NULL ),
V( 29, NID_X25519, "ecdh_x25519", NULL ),
V( 30, NID_X448, "ecdh_x448", NULL ),
V( 31, NID_brainpoolP256r1tls13, "brainpoolP256r1tls13", NULL ),
V( 32, NID_brainpoolP384r1tls13, "brainpoolP384r1tls13", NULL ),
V( 33, NID_brainpoolP512r1tls13, "brainpoolP512r1tls13", NULL ),