Skip to content

Sync Master and Dev #2541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
normj merged 1 commit into from
Aug 21, 2026
+15 −1
Merged

Sync Master and Dev #2541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion LambdaRuntimeDockerfiles/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ param(
[ValidateSet('amd64','arm64')]
[string]$Architecture = "amd64",

[ValidateSet('net6', 'net8', 'net9')]
[ValidateSet('net8', 'net9', 'net10', 'net11')]
[string]$TargetFramework = "net6"
)

Expand Down
7 changes: 7 additions & 0 deletions Libraries/src/Amazon.Lambda.RuntimeSupport/bootstrap.net8.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#!/bin/bash

# PQC TLS keyshares are enabled by default via the AL2023 base-OS crypto policy. Customers can opt
# out by setting AWS_LAMBDA_DISABLE_PQC_KEYSHARES (presence-based, including an empty value), which
# selects the shipped classical-only openssl_non_pqc.cnf and takes precedence over a customer OPENSSL_CONF.
if [ -n "${AWS_LAMBDA_DISABLE_PQC_KEYSHARES+x}" ]; then
export OPENSSL_CONF=/var/runtime/openssl_conf/openssl_non_pqc.cnf
fi

# .NET on Linux uses OpenSSL to handle certificates. The .NET runtime will load the certs by first reading
# the default cert bundle file which can be overriden by the SSL_CERT_FILE env var. Then it will load the
# certs in the default cert directory which can be overriden by the SSL_CERT_DIR env var. On AL2023
Expand Down
7 changes: 7 additions & 0 deletions Libraries/src/Amazon.Lambda.RuntimeSupport/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#!/bin/bash

# PQC TLS keyshares are enabled by default via the AL2023 base-OS crypto policy. Customers can opt
# out by setting AWS_LAMBDA_DISABLE_PQC_KEYSHARES (presence-based, including an empty value), which
# selects the shipped classical-only openssl_non_pqc.cnf and takes precedence over a customer OPENSSL_CONF.
if [ -n "${AWS_LAMBDA_DISABLE_PQC_KEYSHARES+x}" ]; then
export OPENSSL_CONF=/var/runtime/openssl_conf/openssl_non_pqc.cnf
fi

# This script is used to locate 2 files in the /var/task folder, where the end-user assembly is located
# The 2 files are <assembly name>.deps.json and <assembly name>.runtimeconfig.json
# These files are used to add the end-user assembly into context and make the code reachable to the dotnet process
Expand Down
Loading