Update aws-lc-fips-sys to v0.13, FIPS v3.0

aws · Dec 10, 2024 · 1af55e9 · 1af55e9
1 parent a7a70cb
commit 1af55e9
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ update-aws-lc-fips-sys:
 	git submodule update --init --remote --checkout -- aws-lc-fips-sys/aws-lc
 	cd aws-lc-fips-sys/aws-lc && \
 		git fetch --all && \
-		git tag -l | xargs ../../scripts/tools/semver.rs fips-v2 | xargs git checkout
+		git tag -l | xargs ../../scripts/tools/semver.rs fips-v3 | xargs git checkout
 
 update-aws-lc-sys:
 	git submodule update --init --remote --checkout -- aws-lc-sys/aws-lc

diff --git a/aws-lc-fips-sys/Cargo.toml b/aws-lc-fips-sys/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "aws-lc-fips-sys"
 description = "AWS-LC is a general-purpose cryptographic library maintained by the AWS Cryptography team for AWS and their customers. This is the FIPS validated version of AWS-LC."
-version = "0.12.15"
-links = "aws_lc_fips_0_12_15"
+version = "0.13.0"
+links = "aws_lc_fips_0_13_0"
 authors = ["AWS-LC"]
 edition = "2021"
 repository = "https://github.com/aws/aws-lc-rs"

diff --git a/aws-lc-fips-sys/aws-lc b/aws-lc-fips-sys/aws-lc
diff --git a/aws-lc-rs/Cargo.toml b/aws-lc-rs/Cargo.toml
@@ -48,7 +48,7 @@ fips = ["dep:aws-lc-fips-sys"]
 [dependencies]
 untrusted = { version = "0.7.1", optional = true }
 aws-lc-sys = { version = "0.23.0", path = "../aws-lc-sys", optional = true }
-aws-lc-fips-sys = { version = "0.12.0", path = "../aws-lc-fips-sys", optional = true }
+aws-lc-fips-sys = { version = "0.13.0", path = "../aws-lc-fips-sys", optional = true }
 zeroize = "1.7"
 paste = "1.0.11"
 

diff --git a/scripts/generate/_collect_symbols_build.sh b/scripts/generate/_collect_symbols_build.sh
@@ -20,7 +20,7 @@ function cmake_build_options() {
 }
 
 function filter_symbols() {
-  grep -v "^_\?bignum_" | grep -v "_\?curve25519_x25519" | grep -v "_\?edwards25519_" | grep -v "_\?p256_montjscalarmul"
+  grep -v "^_\?bignum_" | grep -v "_\?curve25519_x25519" | grep -v "_\?edwards25519_" | grep -v "_\?p256_montjscalarmul"  | grep -v "_\?p384_montjscalarmul"  | grep -v "_\?p521_montjscalarmul"
 }
 
 REPO_ROOT=$(git rev-parse --show-toplevel)

diff --git a/scripts/tools/semver.rs b/scripts/tools/semver.rs
@@ -23,6 +23,7 @@ struct Args {
 enum Release {
     Main { tags: Vec<String> },
     FipsV2 { tags: Vec<String> },
+    FipsV3 { tags: Vec<String> },
 }
 
 // regex from https://semver.org/
@@ -34,6 +35,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     let latest = match args.release {
         Release::Main { tags } => get_latest_main(tags)?,
         Release::FipsV2 { tags } => get_latest_fips(tags, 2)?,
+        Release::FipsV3 { tags } => get_latest_fips(tags, 3)?,
     };
 
     println!("{latest}");