Skip to content
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

chore: bump versions of aws-lc and aws-lc-fips #4716

Merged
merged 4 commits into from
Aug 22, 2024
Merged

chore: bump versions of aws-lc and aws-lc-fips #4716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6804ebd
chore: bump versions of aws-lc and aws-lc-fips
dougch Aug 20, 2024
50a28be
musl MEM_PRE_CONNECTION increased
dougch Aug 21, 2024
5490fc9
Merge branch 'main' into awslc_ver_bump
dougch Aug 21, 2024
259ddda
Merge branch 'main' into awslc_ver_bump
dougch Aug 22, 2024
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 codebuild/bin/install_awslc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ source codebuild/bin/jobs.sh
if [ "$IS_FIPS" == "1" ]; then
AWSLC_VERSION=AWS-LC-FIPS-1.0.3
else
AWSLC_VERSION=v1.17.4
AWSLC_VERSION=v1.33.0
fi
mkdir -p "$BUILD_DIR"||true
cd "$BUILD_DIR"
Expand Down
4 changes: 2 additions & 2 deletions codebuild/bin/install_awslc_fips_2022.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ INSTALL_DIR=$2
source codebuild/bin/jobs.sh

# There are currently no AWSLC release tags for the 2022 FIPS branch. The
# following is the latest commit in this branch as of 4/5/23:
# following is the latest commit in this branch as of 8/19/24:
# https://github.com/aws/aws-lc/commits/fips-2022-11-02
AWSLC_VERSION=03ea7816359a3e1babdf9f2cd0e694977c36ebbc
AWSLC_VERSION=ec94d74a19b5a0aa738b436a95bb06ff87fc7ba9

mkdir -p "$BUILD_DIR" || true
cd "$BUILD_DIR"
Expand Down
8 changes: 4 additions & 4 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
# TODO: https://github.com/aws/aws-lc/pull/830
inputs.awslc.url = "github:dougch/aws-lc?ref=nixv1.17.4";
inputs.awslc.url = "github:dougch/aws-lc?ref=nixv1.33.0";

outputs = { self, nix, nixpkgs, awslc, flake-utils }:
flake-utils.lib.eachDefaultSystem (system:
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/s2n_mem_usage_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
#elif defined(__OpenBSD__)
#define MEM_PER_CONNECTION 61
#else
#define MEM_PER_CONNECTION 50
#define MEM_PER_CONNECTION 51
#endif

/* This is the maximum memory per connection including 4KB of slack */
Expand Down
Loading