Skip to content

Commit d59fbda

Browse files
authored
Update internal IANA values of PQ SupportedGroups (#2235)
### Issues: N/A ### Description of changes: Pulls in the latest IANA SupportedGroup identifiers from draft RFC's/IANA. See: https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8 ### Call-outs: The IANA values of `SSL_GROUP_MLKEM768` and `SSL_GROUP_MLKEM1024` changed. This PR to change their values is safe because AWS-LC does not support negotiating ML-KEM groups as standalone, only as hybrid when combined with ECDH. These standalone ML-KEM IANA values were never sent/received over the wire during any TLS handshakes by AWS-LC. ### Testing: Unit Tests. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.
1 parent 51c6c84 commit d59fbda

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

include/openssl/ssl.h

+6-7
Original file line numberDiff line numberDiff line change
@@ -2696,13 +2696,11 @@ OPENSSL_EXPORT int SSL_set1_groups_list(SSL *ssl, const char *groups);
26962696
// https://datatracker.ietf.org/doc/html/draft-tls-westerbaan-xyber768d00
26972697
#define SSL_GROUP_X25519_KYBER768_DRAFT00 0x6399
26982698

2699-
// SSL_GROUP_SECP256R1_MLKEM768 is defined at
2699+
// The following are defined at
27002700
// https://datatracker.ietf.org/doc/html/draft-kwiatkowski-tls-ecdhe-mlkem.html
27012701
#define SSL_GROUP_SECP256R1_MLKEM768 0x11EB
2702-
2703-
// SSL_GROUP_X25519_MLKEM768 is defined at
2704-
// https://datatracker.ietf.org/doc/html/draft-kwiatkowski-tls-ecdhe-mlkem.html
2705-
#define SSL_GROUP_X25519_MLKEM768 0x11EC
2702+
#define SSL_GROUP_X25519_MLKEM768 0x11EC
2703+
#define SSL_GROUP_SECP384R1_MLKEM1024 0x11ED
27062704

27072705
// The following PQ and hybrid group IDs are not yet standardized. Current IDs
27082706
// are driven by community consensus and are defined at:
@@ -2713,8 +2711,9 @@ OPENSSL_EXPORT int SSL_set1_groups_list(SSL *ssl, const char *groups);
27132711

27142712
// The following are defined at
27152713
// https://datatracker.ietf.org/doc/html/draft-connolly-tls-mlkem-key-agreement.html
2716-
#define SSL_GROUP_MLKEM768 0x0768
2717-
#define SSL_GROUP_MLKEM1024 0x1024
2714+
#define SSL_GROUP_MLKEM512 0x0200
2715+
#define SSL_GROUP_MLKEM768 0x0201
2716+
#define SSL_GROUP_MLKEM1024 0x0202
27182717

27192718
// SSL_get_group_id returns the ID of the group used by |ssl|'s most recently
27202719
// completed handshake, or 0 if not applicable.

0 commit comments

Comments
 (0)