Skip to content

Commit 11c9be9

Browse files
authored
Add ML-KEM Support (#693)
1 parent b6bff6f commit 11c9be9

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

include/aws/io/tls_channel_handler.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ enum aws_tls_cipher_pref {
3434
/* Deprecated */ AWS_IO_TLS_CIPHER_PREF_KMS_PQ_TLSv1_0_2020_02 = 3,
3535
/* Deprecated */ AWS_IO_TLS_CIPHER_PREF_KMS_PQ_SIKE_TLSv1_0_2020_02 = 4,
3636
/* Deprecated */ AWS_IO_TLS_CIPHER_PREF_KMS_PQ_TLSv1_0_2020_07 = 5,
37+
/* Deprecated */ AWS_IO_TLS_CIPHER_PREF_PQ_TLSv1_0_2021_05 = 6,
3738

3839
/*
39-
* This TLS cipher preference list contains post-quantum key exchange algorithms that have been submitted to NIST
40-
* for potential future standardization. Support for this preference list, or PQ algorithms present in it, may be
41-
* removed at any time in the future. PQ algorithms in this preference list will be used in hybrid mode, and always
42-
* combined with a classical ECDHE key exchange.
40+
* This TLS cipher preference list contains post-quantum key exchange algorithms that have been standardized by
41+
* NIST. PQ algorithms in this preference list will be used in hybrid mode, and always combined with a classical
42+
* ECDHE key exchange.
4343
*/
44-
AWS_IO_TLS_CIPHER_PREF_PQ_TLSv1_0_2021_05 = 6,
44+
AWS_IO_TLS_CIPHER_PREF_PQ_TLSV1_2_2024_10 = 7,
4545

4646
AWS_IO_TLS_CIPHER_PREF_END_RANGE = 0xFFFF
4747
};

source/s2n/s2n_tls_channel_handler.c

+5
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,8 @@ bool aws_tls_is_cipher_pref_supported(enum aws_tls_cipher_pref cipher_pref) {
270270
#ifndef ANDROID
271271
case AWS_IO_TLS_CIPHER_PREF_PQ_TLSv1_0_2021_05:
272272
return true;
273+
case AWS_IO_TLS_CIPHER_PREF_PQ_TLSV1_2_2024_10:
274+
return true;
273275
#endif
274276

275277
default:
@@ -1536,6 +1538,9 @@ static struct aws_tls_ctx *s_tls_ctx_new(
15361538
case AWS_IO_TLS_CIPHER_PREF_PQ_TLSv1_0_2021_05:
15371539
security_policy = "PQ-TLS-1-0-2021-05-26";
15381540
break;
1541+
case AWS_IO_TLS_CIPHER_PREF_PQ_TLSV1_2_2024_10:
1542+
security_policy = "AWS-CRT-SDK-TLSv1.2-2023-PQ";
1543+
break;
15391544
default:
15401545
AWS_LOGF_ERROR(AWS_LS_IO_TLS, "Unrecognized TLS Cipher Preference: %d", options->cipher_pref);
15411546
aws_raise_error(AWS_IO_TLS_CIPHER_PREF_UNSUPPORTED);

0 commit comments

Comments
 (0)