Update aws-lc-fips-sys to 0.12.4

aws · Feb 26, 2024 · 65f0c0d · 65f0c0d
1 parent 65c9d11
commit 65f0c0d
Show file tree

Hide file tree

Showing 9 changed files with 10,713 additions and 10,693 deletions.
diff --git a/aws-lc-fips-sys/Cargo.toml b/aws-lc-fips-sys/Cargo.toml
@@ -1,7 +1,7 @@
 [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.3"
+version = "0.12.4"
 links = "aws_lc_fips_0_12_3"
 authors = ["AWS-LC"]
 edition = "2021"
@@ -74,4 +74,4 @@ libc = "0.2"
 paste = "1.0.11"
 
 [package.metadata.aws-lc-fips-sys]
-commit-hash = "31b52d2ec1e329481f74d5ffa329030b7c65bce7"
+commit-hash = "e7968359f4e009f3859e6a7a72828bdb66c5e184"
diff --git a/aws-lc-fips-sys/aws-lc b/aws-lc-fips-sys/aws-lc
diff --git a/aws-lc-fips-sys/generated-include/openssl/boringssl_prefix_symbols.h b/aws-lc-fips-sys/generated-include/openssl/boringssl_prefix_symbols.h
@@ -12,9 +12,14 @@
 // OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+#ifndef BORINGSSL_PREFIX_SYMBOLS_H
+
+#define BORINGSSL_PREFIX_SYMBOLS_H	
+
 #ifndef BORINGSSL_PREFIX
-#define BORINGSSL_PREFIX aws_lc_fips_0_12_3
-#endif
+#define BORINGSSL_PREFIX aws_lc_fips_0_12_4
+#endif // BORINGSSL_PREFIX
+
 
 // BORINGSSL_ADD_PREFIX pastes two identifiers into one. It performs one
 // iteration of macro expansion on its arguments before pasting.
@@ -3889,3 +3894,5 @@
 #define x509v3_hex_to_bytes BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, x509v3_hex_to_bytes)
 #define x509v3_looks_like_dns_name BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, x509v3_looks_like_dns_name)
 #define x86_64_assembly_implementation_FOR_TESTING BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, x86_64_assembly_implementation_FOR_TESTING)
+
+#endif // BORINGSSL_PREFIX_SYMBOLS_H
diff --git a/aws-lc-fips-sys/generated-include/openssl/boringssl_prefix_symbols_asm.h b/aws-lc-fips-sys/generated-include/openssl/boringssl_prefix_symbols_asm.h
@@ -12,13 +12,17 @@
 // OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-#ifndef BORINGSSL_PREFIX
-#define BORINGSSL_PREFIX aws_lc_fips_0_12_3
-#endif
-
 #if !defined(__APPLE__)
 #include <openssl/boringssl_prefix_symbols.h>
 #else
+#ifndef BORINGSSL_PREFIX_SYMBOLS_ASM_H
+
+#define BORINGSSL_PREFIX_SYMBOLS_ASM_H
+
+#ifndef BORINGSSL_PREFIX
+#define BORINGSSL_PREFIX aws_lc_fips_0_12_4
+#endif // BORINGSSL_PREFIX
+
 // On iOS and macOS, we need to treat assembly symbols differently from other
 // symbols. The linker expects symbols to be prefixed with an underscore.
 // Perlasm thus generates symbol with this underscore applied. Our macros must,
@@ -3894,4 +3898,6 @@
 #define _x509v3_hex_to_bytes BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, x509v3_hex_to_bytes)
 #define _x509v3_looks_like_dns_name BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, x509v3_looks_like_dns_name)
 #define _x86_64_assembly_implementation_FOR_TESTING BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, x86_64_assembly_implementation_FOR_TESTING)
-#endif
+
+#endif // BORINGSSL_PREFIX_SYMBOLS_ASM_H
+#endif // !defined(__APPLE__)
diff --git a/aws-lc-fips-sys/generated-include/openssl/boringssl_prefix_symbols_nasm.inc b/aws-lc-fips-sys/generated-include/openssl/boringssl_prefix_symbols_nasm.inc
@@ -12,12 +12,17 @@
 ; OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 ; CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+%ifndef BORINGSSL_PREFIX_SYMBOLS_NASM_INC
+
+%define BORINGSSL_PREFIX_SYMBOLS_NASM_INC
+
 %ifndef BORINGSSL_PREFIX
-%define BORINGSSL_PREFIX aws_lc_fips_0_12_3
-%endif
+%define BORINGSSL_PREFIX aws_lc_fips_0_12_4
+%endif ; BORINGSSL_PREFIX
 
 ; 32-bit Windows adds underscores to C functions, while 64-bit Windows does not.
 %ifidn __OUTPUT_FORMAT__, win32
+
 %xdefine _ACCESS_DESCRIPTION_free _ %+ BORINGSSL_PREFIX %+ _ACCESS_DESCRIPTION_free
 %xdefine _ACCESS_DESCRIPTION_it _ %+ BORINGSSL_PREFIX %+ _ACCESS_DESCRIPTION_it
 %xdefine _ACCESS_DESCRIPTION_new _ %+ BORINGSSL_PREFIX %+ _ACCESS_DESCRIPTION_new
@@ -7755,4 +7760,6 @@
 %xdefine x509v3_hex_to_bytes BORINGSSL_PREFIX %+ _x509v3_hex_to_bytes
 %xdefine x509v3_looks_like_dns_name BORINGSSL_PREFIX %+ _x509v3_looks_like_dns_name
 %xdefine x86_64_assembly_implementation_FOR_TESTING BORINGSSL_PREFIX %+ _x86_64_assembly_implementation_FOR_TESTING
-%endif
+
+%endif ; __OUTPUT_FORMAT__
+%endif ; BORINGSSL_PREFIX_SYMBOLS_NASM_INC
+69 −0		.github/workflows/aws-lc-rs.yml
+22 −36		crypto/fipsmodule/CMakeLists.txt
+2 −2		crypto/fipsmodule/service_indicator/service_indicator_test.cc
+1 −1		include/openssl/base.h
+47 −36		util/fipstools/delocate/delocate.go
+21 −19		util/fipstools/delocate/delocate_test.go
+15 −18		util/fipstools/delocate/testdata/aarch64-Basic/out.s
+0 −3		util/fipstools/delocate/testdata/generic-FileDirectives/out.s
+6 −0		util/fipstools/delocate/testdata/generic-Includes/in.s
+56 −0		util/fipstools/delocate/testdata/generic-Includes/out.s
+0 −3		util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
+0 −3		util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
+8 −11		util/fipstools/delocate/testdata/ppc64le-Sample/out.s
+14 −17		util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
+0 −3		util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
+0 −3		util/fipstools/delocate/testdata/x86_64-BSS/out.s
+0 −3		util/fipstools/delocate/testdata/x86_64-Basic/out.s
+0 −3		util/fipstools/delocate/testdata/x86_64-GOTRewrite/out.s
+5 −8		util/fipstools/delocate/testdata/x86_64-LabelRewrite/out.s
+0 −3		util/fipstools/delocate/testdata/x86_64-LargeMemory/out.s
+0 −3		util/fipstools/delocate/testdata/x86_64-Sections/out.s
+0 −3		util/fipstools/delocate/testdata/x86_64-ThreeArg/out.s
+36 −13		util/make_prefix_headers.go