Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions aws-crt-kotlin/api/aws-crt-kotlin.api
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,7 @@ public final class aws/sdk/kotlin/crt/io/TlsCipherPreference : java/lang/Enum {
public static final field PQ_DEFAULT Laws/sdk/kotlin/crt/io/TlsCipherPreference;
public static final field PQ_TLSV1_2_2024_10 Laws/sdk/kotlin/crt/io/TlsCipherPreference;
public static final field SYSTEM_DEFAULT Laws/sdk/kotlin/crt/io/TlsCipherPreference;
public static final field TLSV1_0_2023_06 Laws/sdk/kotlin/crt/io/TlsCipherPreference;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public final fun getValue ()I
public final fun isSupported ()Z
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ public enum class TlsCipherPreference(public val value: Int) {
*/
PQ_DEFAULT(8),

/**
* This security policy was the system default before PQ was enabled by default, specifically
* aws-c-io's AWS_IO_TLS_CIPHER_PREF_TLSV1_0_2023_06.
*/
TLSV1_0_2023_06(10),

;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ internal actual fun isAlpnSupported(): Boolean = TlsContextOptionsJni.isAlpnSupp

private fun TlsCipherPreference.into(): TlsCipherPreferenceJni = when (this) {
TlsCipherPreference.SYSTEM_DEFAULT -> TlsCipherPreferenceJni.TLS_CIPHER_SYSTEM_DEFAULT
TlsCipherPreference.TLSV1_0_2023_06 -> TlsCipherPreferenceJni.TLS_CIPHER_PREF_TLSv1_0_2023
TlsCipherPreference.PQ_TLSV1_2_2024_10 -> TlsCipherPreferenceJni.TLS_CIPHER_PREF_PQ_TLSv1_2_2023
TlsCipherPreference.PQ_DEFAULT -> TlsCipherPreferenceJni.TLS_CIPHER_PQ_DEFAULT
}
Expand Down
2 changes: 1 addition & 1 deletion crt/aws-lc
Submodule aws-lc updated 1098 files
2 changes: 1 addition & 1 deletion crt/s2n
Submodule s2n updated 70 files
+2 −2 .github/workflows/bench.yml
+2 −2 .github/workflows/ci_rust.yml
+1 −1 .github/workflows/codebuild.yml
+1 −1 .github/workflows/stale.yml
+1 −1 .github/workflows/usage_guide.yml
+89 −0 api/unstable/async_offload.h
+2 −0 bindings/rust/aws-kms-tls-auth/.clippy.toml
+0 −513 bindings/rust/aws-kms-tls-auth/src/identity.rs
+0 −42 bindings/rust/aws-kms-tls-auth/src/lib.rs
+0 −472 bindings/rust/aws-kms-tls-auth/src/provider.rs
+0 −397 bindings/rust/aws-kms-tls-auth/src/receiver.rs
+3 −91 bindings/rust/aws-kms-tls-auth/src/test_utils.rs
+1 −0 bindings/rust/extended/generate/Cargo.toml
+2 −1 bindings/rust/extended/s2n-tls-sys/Cargo.toml
+1 −1 bindings/rust/extended/s2n-tls-sys/templates/Cargo.template
+2 −2 bindings/rust/extended/s2n-tls-tokio/Cargo.toml
+2 −2 bindings/rust/extended/s2n-tls/Cargo.toml
+2 −0 bindings/rust/standard/.clippy.toml
+3 −3 bindings/rust/standard/s2n-tls-hyper/Cargo.toml
+5 −5 codebuild/bin/install_s2n_head.sh
+1 −1 codebuild/bin/s2n_set_build_preset.sh
+0 −41 codebuild/spec/buildspec_al2023_ktls.yml
+11 −0 codebuild/spec/buildspec_generalbatch.yml
+1 −0 codebuild/spec/buildspec_ktls_keyupdate.yml
+12 −0 codebuild/spec/buildspec_sanitizer.yml
+1 −6 codebuild/spec/buildspec_ubuntu_integrationv2.yml
+7 −7 codebuild/spec/buildspec_valgrind.yml
+5 −4 docs/usage-guide/topics/SUMMARY.md
+0 −0 docs/usage-guide/topics/ch12-preshared-keys.md
+0 −0 docs/usage-guide/topics/ch13-private-key-ops.md
+61 −0 docs/usage-guide/topics/ch14-connection-serialization.md
+0 −0 docs/usage-guide/topics/ch15-early-data.md
+0 −0 docs/usage-guide/topics/ch16-post-quantum.md
+1 −0 error/s2n_errno.c
+1 −0 error/s2n_errno.h
+29 −150 flake.lock
+1 −1 flake.nix
+12 −0 tests/integrationv2/configuration.py
+3 −1 tests/integrationv2/pyproject.toml
+3 −3 tests/integrationv2/test_buffered_send.py
+226 −0 tests/unit/s2n_async_offload_cb_test.c
+33 −0 tests/unit/s2n_connection_serialize_test.c
+1 −1 tests/unit/s2n_connection_size_test.c
+5 −3 tests/unit/s2n_key_update_test.c
+71 −0 tests/unit/s2n_ktls_test.c
+194 −96 tests/unit/s2n_policy_builder_test.c
+135 −0 tests/unit/s2n_policy_defaults_test.c
+120 −16 tests/unit/s2n_self_talk_ktls_test.c
+2 −2 tests/unit/s2n_self_talk_offload_signing_test.c
+164 −104 tls/policy/s2n_policy_builder.c
+128 −0 tls/policy/s2n_policy_defaults.c
+0 −0 tls/policy/s2n_policy_defaults.h
+43 −0 tls/policy/s2n_policy_feature.h
+99 −0 tls/s2n_async_offload.c
+61 −0 tls/s2n_async_offload.h
+80 −0 tls/s2n_async_pkey.c
+12 −1 tls/s2n_async_pkey.h
+19 −17 tls/s2n_client_cert_verify.c
+13 −0 tls/s2n_config.c
+5 −0 tls/s2n_config.h
+2 −0 tls/s2n_connection.c
+3 −0 tls/s2n_connection.h
+8 −3 tls/s2n_key_update.c
+1 −0 tls/s2n_key_update.h
+148 −0 tls/s2n_ktls.c
+4 −0 tls/s2n_ktls.h
+2 −73 tls/s2n_ktls_io.c
+6 −0 tls/s2n_security_policies.h
+24 −22 tls/s2n_server_key_exchange.c
+13 −11 tls/s2n_tls13_certificate_verify.c
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kotlin-version = "2.2.0"
aws-kotlin-repo-tools-version = "0.4.65"

# libs
crt-java-version = "0.38.1"
crt-java-version = "0.39.3"
coroutines-version = "1.10.2"
binary-compatibility-validator-version = "0.18.0"

Expand Down
Loading