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.

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

Generate/aws lc fips sys v0.12.10 #451

Merged
merged 14 commits into from
Jun 26, 2024
6 changes: 3 additions & 3 deletions aws-lc-fips-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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.9"
links = "aws_lc_fips_0_12_9"
version = "0.12.10"
links = "aws_lc_fips_0_12_10"
authors = ["AWS-LC"]
edition = "2021"
repository = "https://github.com/aws/aws-lc-rs"
Expand Down Expand Up @@ -75,4 +75,4 @@ libc = "0.2.121"
paste = "1.0.11"

[package.metadata.aws-lc-fips-sys]
commit-hash = "93177de1a3994af5f649c77d867542b1520c7fe1"
commit-hash = "c166b19e8778b5efa98b6dce5004bfd194e67ab5"
2 changes: 1 addition & 1 deletion aws-lc-fips-sys/aws-lc
Submodule aws-lc updated 49 files
+25 −0 .github/workflows/integrations.yml
+12 −0 BUILDING.md
+7 −0 CMakeLists.txt
+1 −0 crypto/CMakeLists.txt
+4 −4 crypto/asn1/a_gentm.c
+14 −14 crypto/asn1/a_time.c
+5 −5 crypto/asn1/a_utctm.c
+32 −34 crypto/asn1/asn1_test.cc
+19 −0 crypto/digest_extra/digest_extra.c
+5 −0 crypto/digest_extra/digest_test.cc
+1 −0 crypto/fipsmodule/bcm.c
+18 −5 crypto/fipsmodule/cpucap/cpu_aarch64_linux.c
+ crypto/fipsmodule/policydocs/DRAFT-140-3-AmazonSecurityPolicy-2.0.0-dynamic.pdf
+ crypto/fipsmodule/policydocs/DRAFT-140-3-AmazonSecurityPolicy-2.0.0-static.pdf
+57 −8 crypto/fipsmodule/rand/rand.c
+163 −0 crypto/fipsmodule/rand/snapsafe_detect.c
+59 −0 crypto/fipsmodule/rand/snapsafe_detect.h
+115 −0 crypto/fipsmodule/rand/snapsafe_detect_test.cc
+13 −4 crypto/fipsmodule/rand/urandom_test.cc
+2 −2 crypto/fipsmodule/service_indicator/service_indicator_test.cc
+2 −0 crypto/internal.h
+1 −0 crypto/kyber/README.md
+13 −3 crypto/kyber/pqcrystals_kyber_ref_common/poly.c
+6 −1 crypto/test/gtest_main.cc
+3 −1 crypto/x509/internal.h
+15 −4 crypto/x509/x509_lu.c
+95 −14 crypto/x509/x509_test.cc
+81 −3 crypto/x509/x509_time_test.cc
+56 −27 crypto/x509/x509_vfy.c
+5 −1 crypto/x509/x509_vpm.c
+36 −27 include/openssl/asn1.h
+1 −1 include/openssl/base.h
+4 −0 include/openssl/digest.h
+8 −0 include/openssl/ssl.h
+36 −0 include/openssl/x509.h
+9 −0 ssl/ssl_lib.cc
+14 −1 ssl/ssl_test.cc
+6 −0 ssl/test/bssl_shim.cc
+7 −0 ssl/test/handshaker.cc
+20 −0 tests/ci/openldap_patch/OPENLDAP_REL_ENG_2_5/print-libcrypto-info.patch
+20 −0 tests/ci/openldap_patch/master/print-libcrypto-info.patch
+5 −0 tests/ci/run_fips_tests.sh
+119 −0 tests/ci/run_openldap_integration.sh
+8 −2 tests/ci/run_posix_tests.sh
+6 −0 util/all_tests.json
+45 −1 util/fipstools/delocate/delocate.go
+1 −0 util/fipstools/delocate/delocate_test.go
+13 −0 util/fipstools/delocate/testdata/x86_64-FourArg/in.s
+85 −0 util/fipstools/delocate/testdata/x86_64-FourArg/out.s
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#define BORINGSSL_PREFIX_SYMBOLS_H

#ifndef BORINGSSL_PREFIX
#define BORINGSSL_PREFIX aws_lc_fips_0_12_9
#define BORINGSSL_PREFIX aws_lc_fips_0_12_10
#endif // BORINGSSL_PREFIX


Expand Down Expand Up @@ -674,6 +674,10 @@
#define CRYPTO_get_lock_name BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CRYPTO_get_lock_name)
#define CRYPTO_get_locking_callback BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CRYPTO_get_locking_callback)
#define CRYPTO_get_seed_entropy BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CRYPTO_get_seed_entropy)
#define CRYPTO_get_snapsafe_active BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CRYPTO_get_snapsafe_active)
#define CRYPTO_get_snapsafe_generation BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CRYPTO_get_snapsafe_generation)
#define CRYPTO_get_snapsafe_supported BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CRYPTO_get_snapsafe_supported)
#define CRYPTO_get_sysgenid_path BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CRYPTO_get_sysgenid_path)
#define CRYPTO_get_thread_local BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CRYPTO_get_thread_local)
#define CRYPTO_ghash_init BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CRYPTO_ghash_init)
#define CRYPTO_has_asm BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, CRYPTO_has_asm)
Expand Down Expand Up @@ -1341,6 +1345,7 @@
#define EVP_md4 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_md4)
#define EVP_md5 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_md5)
#define EVP_md5_sha1 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_md5_sha1)
#define EVP_md_null BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_md_null)
#define EVP_parse_digest_algorithm BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_parse_digest_algorithm)
#define EVP_parse_private_key BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_parse_private_key)
#define EVP_parse_public_key BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_parse_public_key)
Expand Down Expand Up @@ -2322,6 +2327,7 @@
#define SSL_set_cert_cb BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_cert_cb)
#define SSL_set_chain_and_key BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_chain_and_key)
#define SSL_set_cipher_list BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_cipher_list)
#define SSL_set_ciphersuites BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_ciphersuites)
#define SSL_set_client_CA_list BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_client_CA_list)
#define SSL_set_connect_state BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_connect_state)
#define SSL_set_custom_verify BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_custom_verify)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#define BORINGSSL_PREFIX_SYMBOLS_ASM_H

#ifndef BORINGSSL_PREFIX
#define BORINGSSL_PREFIX aws_lc_fips_0_12_9
#define BORINGSSL_PREFIX aws_lc_fips_0_12_10
#endif // BORINGSSL_PREFIX

// On iOS and macOS, we need to treat assembly symbols differently from other
Expand Down Expand Up @@ -678,6 +678,10 @@
#define _CRYPTO_get_lock_name BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, CRYPTO_get_lock_name)
#define _CRYPTO_get_locking_callback BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, CRYPTO_get_locking_callback)
#define _CRYPTO_get_seed_entropy BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, CRYPTO_get_seed_entropy)
#define _CRYPTO_get_snapsafe_active BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, CRYPTO_get_snapsafe_active)
#define _CRYPTO_get_snapsafe_generation BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, CRYPTO_get_snapsafe_generation)
#define _CRYPTO_get_snapsafe_supported BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, CRYPTO_get_snapsafe_supported)
#define _CRYPTO_get_sysgenid_path BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, CRYPTO_get_sysgenid_path)
#define _CRYPTO_get_thread_local BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, CRYPTO_get_thread_local)
#define _CRYPTO_ghash_init BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, CRYPTO_ghash_init)
#define _CRYPTO_has_asm BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, CRYPTO_has_asm)
Expand Down Expand Up @@ -1345,6 +1349,7 @@
#define _EVP_md4 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, EVP_md4)
#define _EVP_md5 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, EVP_md5)
#define _EVP_md5_sha1 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, EVP_md5_sha1)
#define _EVP_md_null BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, EVP_md_null)
#define _EVP_parse_digest_algorithm BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, EVP_parse_digest_algorithm)
#define _EVP_parse_private_key BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, EVP_parse_private_key)
#define _EVP_parse_public_key BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, EVP_parse_public_key)
Expand Down Expand Up @@ -2326,6 +2331,7 @@
#define _SSL_set_cert_cb BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_set_cert_cb)
#define _SSL_set_chain_and_key BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_set_chain_and_key)
#define _SSL_set_cipher_list BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_set_cipher_list)
#define _SSL_set_ciphersuites BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_set_ciphersuites)
#define _SSL_set_client_CA_list BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_set_client_CA_list)
#define _SSL_set_connect_state BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_set_connect_state)
#define _SSL_set_custom_verify BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_set_custom_verify)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
%define BORINGSSL_PREFIX_SYMBOLS_NASM_INC

%ifndef BORINGSSL_PREFIX
%define BORINGSSL_PREFIX aws_lc_fips_0_12_9
%define BORINGSSL_PREFIX aws_lc_fips_0_12_10
%endif ; BORINGSSL_PREFIX

; 32-bit Windows adds underscores to C functions, while 64-bit Windows does not.
Expand Down Expand Up @@ -671,6 +671,10 @@
%xdefine _CRYPTO_get_lock_name _ %+ BORINGSSL_PREFIX %+ _CRYPTO_get_lock_name
%xdefine _CRYPTO_get_locking_callback _ %+ BORINGSSL_PREFIX %+ _CRYPTO_get_locking_callback
%xdefine _CRYPTO_get_seed_entropy _ %+ BORINGSSL_PREFIX %+ _CRYPTO_get_seed_entropy
%xdefine _CRYPTO_get_snapsafe_active _ %+ BORINGSSL_PREFIX %+ _CRYPTO_get_snapsafe_active
%xdefine _CRYPTO_get_snapsafe_generation _ %+ BORINGSSL_PREFIX %+ _CRYPTO_get_snapsafe_generation
%xdefine _CRYPTO_get_snapsafe_supported _ %+ BORINGSSL_PREFIX %+ _CRYPTO_get_snapsafe_supported
%xdefine _CRYPTO_get_sysgenid_path _ %+ BORINGSSL_PREFIX %+ _CRYPTO_get_sysgenid_path
%xdefine _CRYPTO_get_thread_local _ %+ BORINGSSL_PREFIX %+ _CRYPTO_get_thread_local
%xdefine _CRYPTO_ghash_init _ %+ BORINGSSL_PREFIX %+ _CRYPTO_ghash_init
%xdefine _CRYPTO_has_asm _ %+ BORINGSSL_PREFIX %+ _CRYPTO_has_asm
Expand Down Expand Up @@ -1338,6 +1342,7 @@
%xdefine _EVP_md4 _ %+ BORINGSSL_PREFIX %+ _EVP_md4
%xdefine _EVP_md5 _ %+ BORINGSSL_PREFIX %+ _EVP_md5
%xdefine _EVP_md5_sha1 _ %+ BORINGSSL_PREFIX %+ _EVP_md5_sha1
%xdefine _EVP_md_null _ %+ BORINGSSL_PREFIX %+ _EVP_md_null
%xdefine _EVP_parse_digest_algorithm _ %+ BORINGSSL_PREFIX %+ _EVP_parse_digest_algorithm
%xdefine _EVP_parse_private_key _ %+ BORINGSSL_PREFIX %+ _EVP_parse_private_key
%xdefine _EVP_parse_public_key _ %+ BORINGSSL_PREFIX %+ _EVP_parse_public_key
Expand Down Expand Up @@ -2319,6 +2324,7 @@
%xdefine _SSL_set_cert_cb _ %+ BORINGSSL_PREFIX %+ _SSL_set_cert_cb
%xdefine _SSL_set_chain_and_key _ %+ BORINGSSL_PREFIX %+ _SSL_set_chain_and_key
%xdefine _SSL_set_cipher_list _ %+ BORINGSSL_PREFIX %+ _SSL_set_cipher_list
%xdefine _SSL_set_ciphersuites _ %+ BORINGSSL_PREFIX %+ _SSL_set_ciphersuites
%xdefine _SSL_set_client_CA_list _ %+ BORINGSSL_PREFIX %+ _SSL_set_client_CA_list
%xdefine _SSL_set_connect_state _ %+ BORINGSSL_PREFIX %+ _SSL_set_connect_state
%xdefine _SSL_set_custom_verify _ %+ BORINGSSL_PREFIX %+ _SSL_set_custom_verify
Expand Down Expand Up @@ -4691,6 +4697,10 @@
%xdefine CRYPTO_get_lock_name BORINGSSL_PREFIX %+ _CRYPTO_get_lock_name
%xdefine CRYPTO_get_locking_callback BORINGSSL_PREFIX %+ _CRYPTO_get_locking_callback
%xdefine CRYPTO_get_seed_entropy BORINGSSL_PREFIX %+ _CRYPTO_get_seed_entropy
%xdefine CRYPTO_get_snapsafe_active BORINGSSL_PREFIX %+ _CRYPTO_get_snapsafe_active
%xdefine CRYPTO_get_snapsafe_generation BORINGSSL_PREFIX %+ _CRYPTO_get_snapsafe_generation
%xdefine CRYPTO_get_snapsafe_supported BORINGSSL_PREFIX %+ _CRYPTO_get_snapsafe_supported
%xdefine CRYPTO_get_sysgenid_path BORINGSSL_PREFIX %+ _CRYPTO_get_sysgenid_path
%xdefine CRYPTO_get_thread_local BORINGSSL_PREFIX %+ _CRYPTO_get_thread_local
%xdefine CRYPTO_ghash_init BORINGSSL_PREFIX %+ _CRYPTO_ghash_init
%xdefine CRYPTO_has_asm BORINGSSL_PREFIX %+ _CRYPTO_has_asm
Expand Down Expand Up @@ -5358,6 +5368,7 @@
%xdefine EVP_md4 BORINGSSL_PREFIX %+ _EVP_md4
%xdefine EVP_md5 BORINGSSL_PREFIX %+ _EVP_md5
%xdefine EVP_md5_sha1 BORINGSSL_PREFIX %+ _EVP_md5_sha1
%xdefine EVP_md_null BORINGSSL_PREFIX %+ _EVP_md_null
%xdefine EVP_parse_digest_algorithm BORINGSSL_PREFIX %+ _EVP_parse_digest_algorithm
%xdefine EVP_parse_private_key BORINGSSL_PREFIX %+ _EVP_parse_private_key
%xdefine EVP_parse_public_key BORINGSSL_PREFIX %+ _EVP_parse_public_key
Expand Down Expand Up @@ -6339,6 +6350,7 @@
%xdefine SSL_set_cert_cb BORINGSSL_PREFIX %+ _SSL_set_cert_cb
%xdefine SSL_set_chain_and_key BORINGSSL_PREFIX %+ _SSL_set_chain_and_key
%xdefine SSL_set_cipher_list BORINGSSL_PREFIX %+ _SSL_set_cipher_list
%xdefine SSL_set_ciphersuites BORINGSSL_PREFIX %+ _SSL_set_ciphersuites
%xdefine SSL_set_client_CA_list BORINGSSL_PREFIX %+ _SSL_set_client_CA_list
%xdefine SSL_set_connect_state BORINGSSL_PREFIX %+ _SSL_set_connect_state
%xdefine SSL_set_custom_verify BORINGSSL_PREFIX %+ _SSL_set_custom_verify
Expand Down
Loading
Loading