Support new randomness generation in AWS-LC (#708)

aws/aws-lc#2220 introduces a new method to import Jitter Entropy and previous PRs added Jitter Entropy for all build types.

This didn't quite work with aws-lc-rs build that only expected Jitter Entropy for some select FIPS builds.

Author: torben-hansen

aws-lc-fips-sys/Cargo.toml

@@ -35,7 +35,8 @@ include = [
     "/aws-lc/third_party/fiat/**/*.h",
     "/aws-lc/third_party/s2n-bignum/**/*.S",
     "/aws-lc/third_party/s2n-bignum/**/*.h",
-    "/aws-lc/third_party/jitterentropy/**",
+    "/aws-lc/third_party/jitterentropy/**/*.c",
+    "/aws-lc/third_party/jitterentropy/**/*.h",
     "/aws-lc/util/fipstools/**/CMakeLists.txt",
     "/aws-lc/util/fipstools/**/*.c",
     "/aws-lc/util/fipstools/**/*.cc",

aws-lc-sys/Cargo.toml

@@ -32,6 +32,8 @@ include = [
     "/aws-lc/third_party/fiat/**/*.h",
     "/aws-lc/third_party/s2n-bignum/**/*.S",
     "/aws-lc/third_party/s2n-bignum/**/*.h",
+    "/aws-lc/third_party/jitterentropy/**/*.c",
+    "/aws-lc/third_party/jitterentropy/**/*.h",
     "/aws-lc/util/fipstools/**/CMakeLists.txt",
     "/aws-lc/util/fipstools/**/*.c",
     "/CMakeLists.txt",

aws-lc-sys/builder/cc_builder.rs

@@ -217,6 +217,13 @@ impl CcBuilder {
                     .join("third_party")
                     .join("s2n-bignum")
                     .join("include"),
+            )
+            .include(
+                self.manifest_dir
+                    .join("aws-lc")
+                    .join("third_party")
+                    .join("jitterentropy")
+                    .join("jitterentropy-library"),
             );
     }
 

scripts/build/collect_symbols.sh

@@ -57,7 +57,7 @@ if [[ ! -d "${AWS_LC_DIR}" ]]; then
 fi
 
 function filter_symbols() {
-  grep -E '^\w*$' | grep -v -E "^bignum_" | grep -v "curve25519_x25519" | grep -v "edwards25519_" | grep -v "p256_montj" | grep -v "p384_montj" | grep -v "p521_montj" | grep -v "p521_j"
+  grep -E '^\w*$' | grep -v -E "^bignum_" | grep -v "curve25519_x25519" | grep -v "edwards25519_" | grep -v "p256_montj" | grep -v "p384_montj" | grep -v "p521_montj" | grep -v "p521_j"  | grep -v "jent_"
 }
 
 function filter_nm_symbols() {

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_montj" | grep -v "_\?p384_montj" | grep -v "_\?p521_montj" | grep -v "_\?p521_j"
+  grep -v "^_\?bignum_" | grep -v "_\?curve25519_x25519" | grep -v "_\?edwards25519_" | grep -v "_\?p256_montj" | grep -v "_\?p384_montj" | grep -v "_\?p521_montj" | grep -v "_\?p521_j" | grep -v "_\?jent_"
 }
 
 REPO_ROOT=$(git rev-parse --show-toplevel)