Rename bcm.c fragments to foo.c.inc Having the files named .c but included causes a ton of problems with build systems. Many of our build systems care about three categories of files: - public headers, available to downstream targets - source files, each of which is compiled as a compilation unit - internal headers, not available to downstream targets There is usually a check, in Bazel called layering_check that enforces source files only include headers that are declared somewhere appropriate. The bcm.c fragments, under this classification, are internal headers. However, in both GN and Bazel, internal headers and sources both go in the source list. They are distinguished only by file extension. When FIPS fragments have a .c file extension, they are misinterpreted as source files, and many things break. Rename them. Either .h and .inc would be sufficient. Because we had to disable Bazel's parse_headers feature, there is no difference (AFAICT) in their handling. Also, these files actually pass the parse_headers feature, even though they don't have an include guard. Still, the tech of the style guide suggests that .inc is probably the better file extension. https://google.github.io/styleguide/cppguide.html#Self_contained_Headers I used .c.inc rather than plain .inc so that we can easily rename them back to .c when we solve https://crbug.com/362530616. Note that, as .inc is not as common of a file extension, people working on BoringSSL may need to reconfigure their editors to map .inc to C/C++. Update-Note: Some downstream builds have been working around this by building the fragments individually and excluding bcm.c. This change will break those workarounds but also remove the need for it. It should now be consistently possible to build BoringSSL without modifying the file list. Bug: 362664827 Change-Id: I933115c37843317a066e24a1092728c9afce35f5 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/70689 Reviewed-by: Bob Beck <bbe@google.com> Commit-Queue: Bob Beck <bbe@google.com>
diff --git a/build.json b/build.json index 4b80dfd..9ea699e 100644 --- a/build.json +++ b/build.json
@@ -16,80 +16,80 @@ "crypto/fipsmodule/bcm.c" ], "internal_hdrs": [ - "crypto/fipsmodule/aes/aes.c", - "crypto/fipsmodule/aes/aes_nohw.c", - "crypto/fipsmodule/aes/key_wrap.c", - "crypto/fipsmodule/aes/mode_wrappers.c", - "crypto/fipsmodule/bn/add.c", - "crypto/fipsmodule/bn/asm/x86_64-gcc.c", - "crypto/fipsmodule/bn/bn.c", - "crypto/fipsmodule/bn/bytes.c", - "crypto/fipsmodule/bn/cmp.c", - "crypto/fipsmodule/bn/ctx.c", - "crypto/fipsmodule/bn/div.c", - "crypto/fipsmodule/bn/div_extra.c", - "crypto/fipsmodule/bn/exponentiation.c", - "crypto/fipsmodule/bn/gcd.c", - "crypto/fipsmodule/bn/gcd_extra.c", - "crypto/fipsmodule/bn/generic.c", - "crypto/fipsmodule/bn/jacobi.c", - "crypto/fipsmodule/bn/montgomery.c", - "crypto/fipsmodule/bn/montgomery_inv.c", - "crypto/fipsmodule/bn/mul.c", - "crypto/fipsmodule/bn/prime.c", - "crypto/fipsmodule/bn/random.c", - "crypto/fipsmodule/bn/rsaz_exp.c", - "crypto/fipsmodule/bn/shift.c", - "crypto/fipsmodule/bn/sqrt.c", - "crypto/fipsmodule/cipher/aead.c", - "crypto/fipsmodule/cipher/cipher.c", - "crypto/fipsmodule/cipher/e_aes.c", - "crypto/fipsmodule/cipher/e_aesccm.c", - "crypto/fipsmodule/cmac/cmac.c", - "crypto/fipsmodule/dh/check.c", - "crypto/fipsmodule/dh/dh.c", - "crypto/fipsmodule/digest/digest.c", - "crypto/fipsmodule/digest/digests.c", - "crypto/fipsmodule/digestsign/digestsign.c", - "crypto/fipsmodule/ec/ec.c", - "crypto/fipsmodule/ec/ec_key.c", - "crypto/fipsmodule/ec/ec_montgomery.c", - "crypto/fipsmodule/ec/felem.c", - "crypto/fipsmodule/ec/oct.c", - "crypto/fipsmodule/ec/p224-64.c", - "crypto/fipsmodule/ec/p256-nistz.c", - "crypto/fipsmodule/ec/p256.c", - "crypto/fipsmodule/ec/scalar.c", - "crypto/fipsmodule/ec/simple.c", - "crypto/fipsmodule/ec/simple_mul.c", - "crypto/fipsmodule/ec/util.c", - "crypto/fipsmodule/ec/wnaf.c", - "crypto/fipsmodule/ecdh/ecdh.c", - "crypto/fipsmodule/ecdsa/ecdsa.c", - "crypto/fipsmodule/hkdf/hkdf.c", - "crypto/fipsmodule/hmac/hmac.c", - "crypto/fipsmodule/md4/md4.c", - "crypto/fipsmodule/md5/md5.c", - "crypto/fipsmodule/modes/cbc.c", - "crypto/fipsmodule/modes/cfb.c", - "crypto/fipsmodule/modes/ctr.c", - "crypto/fipsmodule/modes/gcm.c", - "crypto/fipsmodule/modes/gcm_nohw.c", - "crypto/fipsmodule/modes/ofb.c", - "crypto/fipsmodule/modes/polyval.c", - "crypto/fipsmodule/rand/ctrdrbg.c", - "crypto/fipsmodule/rand/rand.c", - "crypto/fipsmodule/rsa/blinding.c", - "crypto/fipsmodule/rsa/padding.c", - "crypto/fipsmodule/rsa/rsa.c", - "crypto/fipsmodule/rsa/rsa_impl.c", - "crypto/fipsmodule/self_check/fips.c", - "crypto/fipsmodule/self_check/self_check.c", - "crypto/fipsmodule/service_indicator/service_indicator.c", - "crypto/fipsmodule/sha/sha1.c", - "crypto/fipsmodule/sha/sha256.c", - "crypto/fipsmodule/sha/sha512.c", - "crypto/fipsmodule/tls/kdf.c" + "crypto/fipsmodule/aes/aes.c.inc", + "crypto/fipsmodule/aes/aes_nohw.c.inc", + "crypto/fipsmodule/aes/key_wrap.c.inc", + "crypto/fipsmodule/aes/mode_wrappers.c.inc", + "crypto/fipsmodule/bn/add.c.inc", + "crypto/fipsmodule/bn/asm/x86_64-gcc.c.inc", + "crypto/fipsmodule/bn/bn.c.inc", + "crypto/fipsmodule/bn/bytes.c.inc", + "crypto/fipsmodule/bn/cmp.c.inc", + "crypto/fipsmodule/bn/ctx.c.inc", + "crypto/fipsmodule/bn/div.c.inc", + "crypto/fipsmodule/bn/div_extra.c.inc", + "crypto/fipsmodule/bn/exponentiation.c.inc", + "crypto/fipsmodule/bn/gcd.c.inc", + "crypto/fipsmodule/bn/gcd_extra.c.inc", + "crypto/fipsmodule/bn/generic.c.inc", + "crypto/fipsmodule/bn/jacobi.c.inc", + "crypto/fipsmodule/bn/montgomery.c.inc", + "crypto/fipsmodule/bn/montgomery_inv.c.inc", + "crypto/fipsmodule/bn/mul.c.inc", + "crypto/fipsmodule/bn/prime.c.inc", + "crypto/fipsmodule/bn/random.c.inc", + "crypto/fipsmodule/bn/rsaz_exp.c.inc", + "crypto/fipsmodule/bn/shift.c.inc", + "crypto/fipsmodule/bn/sqrt.c.inc", + "crypto/fipsmodule/cipher/aead.c.inc", + "crypto/fipsmodule/cipher/cipher.c.inc", + "crypto/fipsmodule/cipher/e_aes.c.inc", + "crypto/fipsmodule/cipher/e_aesccm.c.inc", + "crypto/fipsmodule/cmac/cmac.c.inc", + "crypto/fipsmodule/dh/check.c.inc", + "crypto/fipsmodule/dh/dh.c.inc", + "crypto/fipsmodule/digest/digest.c.inc", + "crypto/fipsmodule/digest/digests.c.inc", + "crypto/fipsmodule/digestsign/digestsign.c.inc", + "crypto/fipsmodule/ec/ec.c.inc", + "crypto/fipsmodule/ec/ec_key.c.inc", + "crypto/fipsmodule/ec/ec_montgomery.c.inc", + "crypto/fipsmodule/ec/felem.c.inc", + "crypto/fipsmodule/ec/oct.c.inc", + "crypto/fipsmodule/ec/p224-64.c.inc", + "crypto/fipsmodule/ec/p256-nistz.c.inc", + "crypto/fipsmodule/ec/p256.c.inc", + "crypto/fipsmodule/ec/scalar.c.inc", + "crypto/fipsmodule/ec/simple.c.inc", + "crypto/fipsmodule/ec/simple_mul.c.inc", + "crypto/fipsmodule/ec/util.c.inc", + "crypto/fipsmodule/ec/wnaf.c.inc", + "crypto/fipsmodule/ecdh/ecdh.c.inc", + "crypto/fipsmodule/ecdsa/ecdsa.c.inc", + "crypto/fipsmodule/hkdf/hkdf.c.inc", + "crypto/fipsmodule/hmac/hmac.c.inc", + "crypto/fipsmodule/md4/md4.c.inc", + "crypto/fipsmodule/md5/md5.c.inc", + "crypto/fipsmodule/modes/cbc.c.inc", + "crypto/fipsmodule/modes/cfb.c.inc", + "crypto/fipsmodule/modes/ctr.c.inc", + "crypto/fipsmodule/modes/gcm.c.inc", + "crypto/fipsmodule/modes/gcm_nohw.c.inc", + "crypto/fipsmodule/modes/ofb.c.inc", + "crypto/fipsmodule/modes/polyval.c.inc", + "crypto/fipsmodule/rand/ctrdrbg.c.inc", + "crypto/fipsmodule/rand/rand.c.inc", + "crypto/fipsmodule/rsa/blinding.c.inc", + "crypto/fipsmodule/rsa/padding.c.inc", + "crypto/fipsmodule/rsa/rsa.c.inc", + "crypto/fipsmodule/rsa/rsa_impl.c.inc", + "crypto/fipsmodule/self_check/fips.c.inc", + "crypto/fipsmodule/self_check/self_check.c.inc", + "crypto/fipsmodule/service_indicator/service_indicator.c.inc", + "crypto/fipsmodule/sha/sha1.c.inc", + "crypto/fipsmodule/sha/sha256.c.inc", + "crypto/fipsmodule/sha/sha512.c.inc", + "crypto/fipsmodule/tls/kdf.c.inc" ], "asm": [ "third_party/fiat/asm/fiat_p256_adx_mul.S",
diff --git a/crypto/fipsmodule/aes/aes.c b/crypto/fipsmodule/aes/aes.c.inc similarity index 100% rename from crypto/fipsmodule/aes/aes.c rename to crypto/fipsmodule/aes/aes.c.inc
diff --git a/crypto/fipsmodule/aes/aes_nohw.c b/crypto/fipsmodule/aes/aes_nohw.c.inc similarity index 100% rename from crypto/fipsmodule/aes/aes_nohw.c rename to crypto/fipsmodule/aes/aes_nohw.c.inc
diff --git a/crypto/fipsmodule/aes/key_wrap.c b/crypto/fipsmodule/aes/key_wrap.c.inc similarity index 100% rename from crypto/fipsmodule/aes/key_wrap.c rename to crypto/fipsmodule/aes/key_wrap.c.inc
diff --git a/crypto/fipsmodule/aes/mode_wrappers.c b/crypto/fipsmodule/aes/mode_wrappers.c.inc similarity index 100% rename from crypto/fipsmodule/aes/mode_wrappers.c rename to crypto/fipsmodule/aes/mode_wrappers.c.inc
diff --git a/crypto/fipsmodule/bcm.c b/crypto/fipsmodule/bcm.c index 4ec382b..fd67825 100644 --- a/crypto/fipsmodule/bcm.c +++ b/crypto/fipsmodule/bcm.c
@@ -31,80 +31,82 @@ #include "bcm_interface.h" #include "../internal.h" -#include "aes/aes.c" -#include "aes/aes_nohw.c" -#include "aes/key_wrap.c" -#include "aes/mode_wrappers.c" -#include "bn/add.c" -#include "bn/asm/x86_64-gcc.c" -#include "bn/bn.c" -#include "bn/bytes.c" -#include "bn/cmp.c" -#include "bn/ctx.c" -#include "bn/div.c" -#include "bn/div_extra.c" -#include "bn/exponentiation.c" -#include "bn/gcd.c" -#include "bn/gcd_extra.c" -#include "bn/generic.c" -#include "bn/jacobi.c" -#include "bn/montgomery.c" -#include "bn/montgomery_inv.c" -#include "bn/mul.c" -#include "bn/prime.c" -#include "bn/random.c" -#include "bn/rsaz_exp.c" -#include "bn/shift.c" -#include "bn/sqrt.c" -#include "cipher/aead.c" -#include "cipher/cipher.c" -#include "cipher/e_aes.c" -#include "cipher/e_aesccm.c" -#include "cmac/cmac.c" -#include "dh/check.c" -#include "dh/dh.c" -#include "digest/digest.c" -#include "digest/digests.c" -#include "digestsign/digestsign.c" -#include "ecdh/ecdh.c" -#include "ecdsa/ecdsa.c" -#include "ec/ec.c" -#include "ec/ec_key.c" -#include "ec/ec_montgomery.c" -#include "ec/felem.c" -#include "ec/oct.c" -#include "ec/p224-64.c" -#include "ec/p256.c" -#include "ec/p256-nistz.c" -#include "ec/scalar.c" -#include "ec/simple.c" -#include "ec/simple_mul.c" -#include "ec/util.c" -#include "ec/wnaf.c" -#include "hkdf/hkdf.c" -#include "hmac/hmac.c" -#include "md4/md4.c" -#include "md5/md5.c" -#include "modes/cbc.c" -#include "modes/cfb.c" -#include "modes/ctr.c" -#include "modes/gcm.c" -#include "modes/gcm_nohw.c" -#include "modes/ofb.c" -#include "modes/polyval.c" -#include "rand/ctrdrbg.c" -#include "rand/rand.c" -#include "rsa/blinding.c" -#include "rsa/padding.c" -#include "rsa/rsa.c" -#include "rsa/rsa_impl.c" -#include "self_check/fips.c" -#include "self_check/self_check.c" -#include "service_indicator/service_indicator.c" -#include "sha/sha1.c" -#include "sha/sha256.c" -#include "sha/sha512.c" -#include "tls/kdf.c" +// TODO(crbug.com/362530616): When delocate is removed, build these files as +// separate compilation units again. +#include "aes/aes.c.inc" +#include "aes/aes_nohw.c.inc" +#include "aes/key_wrap.c.inc" +#include "aes/mode_wrappers.c.inc" +#include "bn/add.c.inc" +#include "bn/asm/x86_64-gcc.c.inc" +#include "bn/bn.c.inc" +#include "bn/bytes.c.inc" +#include "bn/cmp.c.inc" +#include "bn/ctx.c.inc" +#include "bn/div.c.inc" +#include "bn/div_extra.c.inc" +#include "bn/exponentiation.c.inc" +#include "bn/gcd.c.inc" +#include "bn/gcd_extra.c.inc" +#include "bn/generic.c.inc" +#include "bn/jacobi.c.inc" +#include "bn/montgomery.c.inc" +#include "bn/montgomery_inv.c.inc" +#include "bn/mul.c.inc" +#include "bn/prime.c.inc" +#include "bn/random.c.inc" +#include "bn/rsaz_exp.c.inc" +#include "bn/shift.c.inc" +#include "bn/sqrt.c.inc" +#include "cipher/aead.c.inc" +#include "cipher/cipher.c.inc" +#include "cipher/e_aes.c.inc" +#include "cipher/e_aesccm.c.inc" +#include "cmac/cmac.c.inc" +#include "dh/check.c.inc" +#include "dh/dh.c.inc" +#include "digest/digest.c.inc" +#include "digest/digests.c.inc" +#include "digestsign/digestsign.c.inc" +#include "ecdh/ecdh.c.inc" +#include "ecdsa/ecdsa.c.inc" +#include "ec/ec.c.inc" +#include "ec/ec_key.c.inc" +#include "ec/ec_montgomery.c.inc" +#include "ec/felem.c.inc" +#include "ec/oct.c.inc" +#include "ec/p224-64.c.inc" +#include "ec/p256.c.inc" +#include "ec/p256-nistz.c.inc" +#include "ec/scalar.c.inc" +#include "ec/simple.c.inc" +#include "ec/simple_mul.c.inc" +#include "ec/util.c.inc" +#include "ec/wnaf.c.inc" +#include "hkdf/hkdf.c.inc" +#include "hmac/hmac.c.inc" +#include "md4/md4.c.inc" +#include "md5/md5.c.inc" +#include "modes/cbc.c.inc" +#include "modes/cfb.c.inc" +#include "modes/ctr.c.inc" +#include "modes/gcm.c.inc" +#include "modes/gcm_nohw.c.inc" +#include "modes/ofb.c.inc" +#include "modes/polyval.c.inc" +#include "rand/ctrdrbg.c.inc" +#include "rand/rand.c.inc" +#include "rsa/blinding.c.inc" +#include "rsa/padding.c.inc" +#include "rsa/rsa.c.inc" +#include "rsa/rsa_impl.c.inc" +#include "self_check/fips.c.inc" +#include "self_check/self_check.c.inc" +#include "service_indicator/service_indicator.c.inc" +#include "sha/sha1.c.inc" +#include "sha/sha256.c.inc" +#include "sha/sha512.c.inc" +#include "tls/kdf.c.inc" #if defined(BORINGSSL_FIPS)
diff --git a/crypto/fipsmodule/bn/add.c b/crypto/fipsmodule/bn/add.c.inc similarity index 100% rename from crypto/fipsmodule/bn/add.c rename to crypto/fipsmodule/bn/add.c.inc
diff --git a/crypto/fipsmodule/bn/asm/x86_64-gcc.c b/crypto/fipsmodule/bn/asm/x86_64-gcc.c.inc similarity index 100% rename from crypto/fipsmodule/bn/asm/x86_64-gcc.c rename to crypto/fipsmodule/bn/asm/x86_64-gcc.c.inc
diff --git a/crypto/fipsmodule/bn/bn.c b/crypto/fipsmodule/bn/bn.c.inc similarity index 100% rename from crypto/fipsmodule/bn/bn.c rename to crypto/fipsmodule/bn/bn.c.inc
diff --git a/crypto/fipsmodule/bn/bytes.c b/crypto/fipsmodule/bn/bytes.c.inc similarity index 100% rename from crypto/fipsmodule/bn/bytes.c rename to crypto/fipsmodule/bn/bytes.c.inc
diff --git a/crypto/fipsmodule/bn/cmp.c b/crypto/fipsmodule/bn/cmp.c.inc similarity index 100% rename from crypto/fipsmodule/bn/cmp.c rename to crypto/fipsmodule/bn/cmp.c.inc
diff --git a/crypto/fipsmodule/bn/ctx.c b/crypto/fipsmodule/bn/ctx.c.inc similarity index 100% rename from crypto/fipsmodule/bn/ctx.c rename to crypto/fipsmodule/bn/ctx.c.inc
diff --git a/crypto/fipsmodule/bn/div.c b/crypto/fipsmodule/bn/div.c.inc similarity index 100% rename from crypto/fipsmodule/bn/div.c rename to crypto/fipsmodule/bn/div.c.inc
diff --git a/crypto/fipsmodule/bn/div_extra.c b/crypto/fipsmodule/bn/div_extra.c.inc similarity index 100% rename from crypto/fipsmodule/bn/div_extra.c rename to crypto/fipsmodule/bn/div_extra.c.inc
diff --git a/crypto/fipsmodule/bn/exponentiation.c b/crypto/fipsmodule/bn/exponentiation.c.inc similarity index 100% rename from crypto/fipsmodule/bn/exponentiation.c rename to crypto/fipsmodule/bn/exponentiation.c.inc
diff --git a/crypto/fipsmodule/bn/gcd.c b/crypto/fipsmodule/bn/gcd.c.inc similarity index 100% rename from crypto/fipsmodule/bn/gcd.c rename to crypto/fipsmodule/bn/gcd.c.inc
diff --git a/crypto/fipsmodule/bn/gcd_extra.c b/crypto/fipsmodule/bn/gcd_extra.c.inc similarity index 100% rename from crypto/fipsmodule/bn/gcd_extra.c rename to crypto/fipsmodule/bn/gcd_extra.c.inc
diff --git a/crypto/fipsmodule/bn/generic.c b/crypto/fipsmodule/bn/generic.c.inc similarity index 100% rename from crypto/fipsmodule/bn/generic.c rename to crypto/fipsmodule/bn/generic.c.inc
diff --git a/crypto/fipsmodule/bn/jacobi.c b/crypto/fipsmodule/bn/jacobi.c.inc similarity index 100% rename from crypto/fipsmodule/bn/jacobi.c rename to crypto/fipsmodule/bn/jacobi.c.inc
diff --git a/crypto/fipsmodule/bn/montgomery.c b/crypto/fipsmodule/bn/montgomery.c.inc similarity index 100% rename from crypto/fipsmodule/bn/montgomery.c rename to crypto/fipsmodule/bn/montgomery.c.inc
diff --git a/crypto/fipsmodule/bn/montgomery_inv.c b/crypto/fipsmodule/bn/montgomery_inv.c.inc similarity index 100% rename from crypto/fipsmodule/bn/montgomery_inv.c rename to crypto/fipsmodule/bn/montgomery_inv.c.inc
diff --git a/crypto/fipsmodule/bn/mul.c b/crypto/fipsmodule/bn/mul.c.inc similarity index 100% rename from crypto/fipsmodule/bn/mul.c rename to crypto/fipsmodule/bn/mul.c.inc
diff --git a/crypto/fipsmodule/bn/prime.c b/crypto/fipsmodule/bn/prime.c.inc similarity index 100% rename from crypto/fipsmodule/bn/prime.c rename to crypto/fipsmodule/bn/prime.c.inc
diff --git a/crypto/fipsmodule/bn/random.c b/crypto/fipsmodule/bn/random.c.inc similarity index 100% rename from crypto/fipsmodule/bn/random.c rename to crypto/fipsmodule/bn/random.c.inc
diff --git a/crypto/fipsmodule/bn/rsaz_exp.c b/crypto/fipsmodule/bn/rsaz_exp.c.inc similarity index 100% rename from crypto/fipsmodule/bn/rsaz_exp.c rename to crypto/fipsmodule/bn/rsaz_exp.c.inc
diff --git a/crypto/fipsmodule/bn/shift.c b/crypto/fipsmodule/bn/shift.c.inc similarity index 100% rename from crypto/fipsmodule/bn/shift.c rename to crypto/fipsmodule/bn/shift.c.inc
diff --git a/crypto/fipsmodule/bn/sqrt.c b/crypto/fipsmodule/bn/sqrt.c.inc similarity index 100% rename from crypto/fipsmodule/bn/sqrt.c rename to crypto/fipsmodule/bn/sqrt.c.inc
diff --git a/crypto/fipsmodule/cipher/aead.c b/crypto/fipsmodule/cipher/aead.c.inc similarity index 100% rename from crypto/fipsmodule/cipher/aead.c rename to crypto/fipsmodule/cipher/aead.c.inc
diff --git a/crypto/fipsmodule/cipher/cipher.c b/crypto/fipsmodule/cipher/cipher.c.inc similarity index 100% rename from crypto/fipsmodule/cipher/cipher.c rename to crypto/fipsmodule/cipher/cipher.c.inc
diff --git a/crypto/fipsmodule/cipher/e_aes.c b/crypto/fipsmodule/cipher/e_aes.c.inc similarity index 100% rename from crypto/fipsmodule/cipher/e_aes.c rename to crypto/fipsmodule/cipher/e_aes.c.inc
diff --git a/crypto/fipsmodule/cipher/e_aesccm.c b/crypto/fipsmodule/cipher/e_aesccm.c.inc similarity index 100% rename from crypto/fipsmodule/cipher/e_aesccm.c rename to crypto/fipsmodule/cipher/e_aesccm.c.inc
diff --git a/crypto/fipsmodule/cmac/cmac.c b/crypto/fipsmodule/cmac/cmac.c.inc similarity index 100% rename from crypto/fipsmodule/cmac/cmac.c rename to crypto/fipsmodule/cmac/cmac.c.inc
diff --git a/crypto/fipsmodule/dh/check.c b/crypto/fipsmodule/dh/check.c.inc similarity index 100% rename from crypto/fipsmodule/dh/check.c rename to crypto/fipsmodule/dh/check.c.inc
diff --git a/crypto/fipsmodule/dh/dh.c b/crypto/fipsmodule/dh/dh.c.inc similarity index 100% rename from crypto/fipsmodule/dh/dh.c rename to crypto/fipsmodule/dh/dh.c.inc
diff --git a/crypto/fipsmodule/digest/digest.c b/crypto/fipsmodule/digest/digest.c.inc similarity index 100% rename from crypto/fipsmodule/digest/digest.c rename to crypto/fipsmodule/digest/digest.c.inc
diff --git a/crypto/fipsmodule/digest/digests.c b/crypto/fipsmodule/digest/digests.c.inc similarity index 100% rename from crypto/fipsmodule/digest/digests.c rename to crypto/fipsmodule/digest/digests.c.inc
diff --git a/crypto/fipsmodule/digestsign/digestsign.c b/crypto/fipsmodule/digestsign/digestsign.c.inc similarity index 100% rename from crypto/fipsmodule/digestsign/digestsign.c rename to crypto/fipsmodule/digestsign/digestsign.c.inc
diff --git a/crypto/fipsmodule/ec/ec.c b/crypto/fipsmodule/ec/ec.c.inc similarity index 100% rename from crypto/fipsmodule/ec/ec.c rename to crypto/fipsmodule/ec/ec.c.inc
diff --git a/crypto/fipsmodule/ec/ec_key.c b/crypto/fipsmodule/ec/ec_key.c.inc similarity index 100% rename from crypto/fipsmodule/ec/ec_key.c rename to crypto/fipsmodule/ec/ec_key.c.inc
diff --git a/crypto/fipsmodule/ec/ec_montgomery.c b/crypto/fipsmodule/ec/ec_montgomery.c.inc similarity index 100% rename from crypto/fipsmodule/ec/ec_montgomery.c rename to crypto/fipsmodule/ec/ec_montgomery.c.inc
diff --git a/crypto/fipsmodule/ec/felem.c b/crypto/fipsmodule/ec/felem.c.inc similarity index 100% rename from crypto/fipsmodule/ec/felem.c rename to crypto/fipsmodule/ec/felem.c.inc
diff --git a/crypto/fipsmodule/ec/oct.c b/crypto/fipsmodule/ec/oct.c.inc similarity index 100% rename from crypto/fipsmodule/ec/oct.c rename to crypto/fipsmodule/ec/oct.c.inc
diff --git a/crypto/fipsmodule/ec/p224-64.c b/crypto/fipsmodule/ec/p224-64.c.inc similarity index 100% rename from crypto/fipsmodule/ec/p224-64.c rename to crypto/fipsmodule/ec/p224-64.c.inc
diff --git a/crypto/fipsmodule/ec/p256-nistz.c b/crypto/fipsmodule/ec/p256-nistz.c.inc similarity index 100% rename from crypto/fipsmodule/ec/p256-nistz.c rename to crypto/fipsmodule/ec/p256-nistz.c.inc
diff --git a/crypto/fipsmodule/ec/p256.c b/crypto/fipsmodule/ec/p256.c.inc similarity index 100% rename from crypto/fipsmodule/ec/p256.c rename to crypto/fipsmodule/ec/p256.c.inc
diff --git a/crypto/fipsmodule/ec/scalar.c b/crypto/fipsmodule/ec/scalar.c.inc similarity index 100% rename from crypto/fipsmodule/ec/scalar.c rename to crypto/fipsmodule/ec/scalar.c.inc
diff --git a/crypto/fipsmodule/ec/simple.c b/crypto/fipsmodule/ec/simple.c.inc similarity index 100% rename from crypto/fipsmodule/ec/simple.c rename to crypto/fipsmodule/ec/simple.c.inc
diff --git a/crypto/fipsmodule/ec/simple_mul.c b/crypto/fipsmodule/ec/simple_mul.c.inc similarity index 100% rename from crypto/fipsmodule/ec/simple_mul.c rename to crypto/fipsmodule/ec/simple_mul.c.inc
diff --git a/crypto/fipsmodule/ec/util.c b/crypto/fipsmodule/ec/util.c.inc similarity index 100% rename from crypto/fipsmodule/ec/util.c rename to crypto/fipsmodule/ec/util.c.inc
diff --git a/crypto/fipsmodule/ec/wnaf.c b/crypto/fipsmodule/ec/wnaf.c.inc similarity index 100% rename from crypto/fipsmodule/ec/wnaf.c rename to crypto/fipsmodule/ec/wnaf.c.inc
diff --git a/crypto/fipsmodule/ecdh/ecdh.c b/crypto/fipsmodule/ecdh/ecdh.c.inc similarity index 100% rename from crypto/fipsmodule/ecdh/ecdh.c rename to crypto/fipsmodule/ecdh/ecdh.c.inc
diff --git a/crypto/fipsmodule/ecdsa/ecdsa.c b/crypto/fipsmodule/ecdsa/ecdsa.c.inc similarity index 100% rename from crypto/fipsmodule/ecdsa/ecdsa.c rename to crypto/fipsmodule/ecdsa/ecdsa.c.inc
diff --git a/crypto/fipsmodule/hkdf/hkdf.c b/crypto/fipsmodule/hkdf/hkdf.c.inc similarity index 100% rename from crypto/fipsmodule/hkdf/hkdf.c rename to crypto/fipsmodule/hkdf/hkdf.c.inc
diff --git a/crypto/fipsmodule/hmac/hmac.c b/crypto/fipsmodule/hmac/hmac.c.inc similarity index 100% rename from crypto/fipsmodule/hmac/hmac.c rename to crypto/fipsmodule/hmac/hmac.c.inc
diff --git a/crypto/fipsmodule/md4/md4.c b/crypto/fipsmodule/md4/md4.c.inc similarity index 100% rename from crypto/fipsmodule/md4/md4.c rename to crypto/fipsmodule/md4/md4.c.inc
diff --git a/crypto/fipsmodule/md5/md5.c b/crypto/fipsmodule/md5/md5.c.inc similarity index 100% rename from crypto/fipsmodule/md5/md5.c rename to crypto/fipsmodule/md5/md5.c.inc
diff --git a/crypto/fipsmodule/modes/cbc.c b/crypto/fipsmodule/modes/cbc.c.inc similarity index 100% rename from crypto/fipsmodule/modes/cbc.c rename to crypto/fipsmodule/modes/cbc.c.inc
diff --git a/crypto/fipsmodule/modes/cfb.c b/crypto/fipsmodule/modes/cfb.c.inc similarity index 100% rename from crypto/fipsmodule/modes/cfb.c rename to crypto/fipsmodule/modes/cfb.c.inc
diff --git a/crypto/fipsmodule/modes/ctr.c b/crypto/fipsmodule/modes/ctr.c.inc similarity index 100% rename from crypto/fipsmodule/modes/ctr.c rename to crypto/fipsmodule/modes/ctr.c.inc
diff --git a/crypto/fipsmodule/modes/gcm.c b/crypto/fipsmodule/modes/gcm.c.inc similarity index 100% rename from crypto/fipsmodule/modes/gcm.c rename to crypto/fipsmodule/modes/gcm.c.inc
diff --git a/crypto/fipsmodule/modes/gcm_nohw.c b/crypto/fipsmodule/modes/gcm_nohw.c.inc similarity index 100% rename from crypto/fipsmodule/modes/gcm_nohw.c rename to crypto/fipsmodule/modes/gcm_nohw.c.inc
diff --git a/crypto/fipsmodule/modes/ofb.c b/crypto/fipsmodule/modes/ofb.c.inc similarity index 100% rename from crypto/fipsmodule/modes/ofb.c rename to crypto/fipsmodule/modes/ofb.c.inc
diff --git a/crypto/fipsmodule/modes/polyval.c b/crypto/fipsmodule/modes/polyval.c.inc similarity index 100% rename from crypto/fipsmodule/modes/polyval.c rename to crypto/fipsmodule/modes/polyval.c.inc
diff --git a/crypto/fipsmodule/rand/ctrdrbg.c b/crypto/fipsmodule/rand/ctrdrbg.c.inc similarity index 100% rename from crypto/fipsmodule/rand/ctrdrbg.c rename to crypto/fipsmodule/rand/ctrdrbg.c.inc
diff --git a/crypto/fipsmodule/rand/rand.c b/crypto/fipsmodule/rand/rand.c.inc similarity index 100% rename from crypto/fipsmodule/rand/rand.c rename to crypto/fipsmodule/rand/rand.c.inc
diff --git a/crypto/fipsmodule/rsa/blinding.c b/crypto/fipsmodule/rsa/blinding.c.inc similarity index 100% rename from crypto/fipsmodule/rsa/blinding.c rename to crypto/fipsmodule/rsa/blinding.c.inc
diff --git a/crypto/fipsmodule/rsa/padding.c b/crypto/fipsmodule/rsa/padding.c.inc similarity index 100% rename from crypto/fipsmodule/rsa/padding.c rename to crypto/fipsmodule/rsa/padding.c.inc
diff --git a/crypto/fipsmodule/rsa/rsa.c b/crypto/fipsmodule/rsa/rsa.c.inc similarity index 100% rename from crypto/fipsmodule/rsa/rsa.c rename to crypto/fipsmodule/rsa/rsa.c.inc
diff --git a/crypto/fipsmodule/rsa/rsa_impl.c b/crypto/fipsmodule/rsa/rsa_impl.c.inc similarity index 100% rename from crypto/fipsmodule/rsa/rsa_impl.c rename to crypto/fipsmodule/rsa/rsa_impl.c.inc
diff --git a/crypto/fipsmodule/self_check/fips.c b/crypto/fipsmodule/self_check/fips.c.inc similarity index 100% rename from crypto/fipsmodule/self_check/fips.c rename to crypto/fipsmodule/self_check/fips.c.inc
diff --git a/crypto/fipsmodule/self_check/self_check.c b/crypto/fipsmodule/self_check/self_check.c.inc similarity index 100% rename from crypto/fipsmodule/self_check/self_check.c rename to crypto/fipsmodule/self_check/self_check.c.inc
diff --git a/crypto/fipsmodule/service_indicator/service_indicator.c b/crypto/fipsmodule/service_indicator/service_indicator.c.inc similarity index 100% rename from crypto/fipsmodule/service_indicator/service_indicator.c rename to crypto/fipsmodule/service_indicator/service_indicator.c.inc
diff --git a/crypto/fipsmodule/sha/sha1.c b/crypto/fipsmodule/sha/sha1.c.inc similarity index 100% rename from crypto/fipsmodule/sha/sha1.c rename to crypto/fipsmodule/sha/sha1.c.inc
diff --git a/crypto/fipsmodule/sha/sha256.c b/crypto/fipsmodule/sha/sha256.c.inc similarity index 100% rename from crypto/fipsmodule/sha/sha256.c rename to crypto/fipsmodule/sha/sha256.c.inc
diff --git a/crypto/fipsmodule/sha/sha512.c b/crypto/fipsmodule/sha/sha512.c.inc similarity index 100% rename from crypto/fipsmodule/sha/sha512.c rename to crypto/fipsmodule/sha/sha512.c.inc
diff --git a/crypto/fipsmodule/tls/kdf.c b/crypto/fipsmodule/tls/kdf.c.inc similarity index 100% rename from crypto/fipsmodule/tls/kdf.c rename to crypto/fipsmodule/tls/kdf.c.inc
diff --git a/gen/sources.bzl b/gen/sources.bzl index e1b2360..8ea8f74 100644 --- a/gen/sources.bzl +++ b/gen/sources.bzl
@@ -19,80 +19,80 @@ ] bcm_internal_headers = [ - "crypto/fipsmodule/aes/aes.c", - "crypto/fipsmodule/aes/aes_nohw.c", - "crypto/fipsmodule/aes/key_wrap.c", - "crypto/fipsmodule/aes/mode_wrappers.c", - "crypto/fipsmodule/bn/add.c", - "crypto/fipsmodule/bn/asm/x86_64-gcc.c", - "crypto/fipsmodule/bn/bn.c", - "crypto/fipsmodule/bn/bytes.c", - "crypto/fipsmodule/bn/cmp.c", - "crypto/fipsmodule/bn/ctx.c", - "crypto/fipsmodule/bn/div.c", - "crypto/fipsmodule/bn/div_extra.c", - "crypto/fipsmodule/bn/exponentiation.c", - "crypto/fipsmodule/bn/gcd.c", - "crypto/fipsmodule/bn/gcd_extra.c", - "crypto/fipsmodule/bn/generic.c", - "crypto/fipsmodule/bn/jacobi.c", - "crypto/fipsmodule/bn/montgomery.c", - "crypto/fipsmodule/bn/montgomery_inv.c", - "crypto/fipsmodule/bn/mul.c", - "crypto/fipsmodule/bn/prime.c", - "crypto/fipsmodule/bn/random.c", - "crypto/fipsmodule/bn/rsaz_exp.c", - "crypto/fipsmodule/bn/shift.c", - "crypto/fipsmodule/bn/sqrt.c", - "crypto/fipsmodule/cipher/aead.c", - "crypto/fipsmodule/cipher/cipher.c", - "crypto/fipsmodule/cipher/e_aes.c", - "crypto/fipsmodule/cipher/e_aesccm.c", - "crypto/fipsmodule/cmac/cmac.c", - "crypto/fipsmodule/dh/check.c", - "crypto/fipsmodule/dh/dh.c", - "crypto/fipsmodule/digest/digest.c", - "crypto/fipsmodule/digest/digests.c", - "crypto/fipsmodule/digestsign/digestsign.c", - "crypto/fipsmodule/ec/ec.c", - "crypto/fipsmodule/ec/ec_key.c", - "crypto/fipsmodule/ec/ec_montgomery.c", - "crypto/fipsmodule/ec/felem.c", - "crypto/fipsmodule/ec/oct.c", - "crypto/fipsmodule/ec/p224-64.c", - "crypto/fipsmodule/ec/p256-nistz.c", - "crypto/fipsmodule/ec/p256.c", - "crypto/fipsmodule/ec/scalar.c", - "crypto/fipsmodule/ec/simple.c", - "crypto/fipsmodule/ec/simple_mul.c", - "crypto/fipsmodule/ec/util.c", - "crypto/fipsmodule/ec/wnaf.c", - "crypto/fipsmodule/ecdh/ecdh.c", - "crypto/fipsmodule/ecdsa/ecdsa.c", - "crypto/fipsmodule/hkdf/hkdf.c", - "crypto/fipsmodule/hmac/hmac.c", - "crypto/fipsmodule/md4/md4.c", - "crypto/fipsmodule/md5/md5.c", - "crypto/fipsmodule/modes/cbc.c", - "crypto/fipsmodule/modes/cfb.c", - "crypto/fipsmodule/modes/ctr.c", - "crypto/fipsmodule/modes/gcm.c", - "crypto/fipsmodule/modes/gcm_nohw.c", - "crypto/fipsmodule/modes/ofb.c", - "crypto/fipsmodule/modes/polyval.c", - "crypto/fipsmodule/rand/ctrdrbg.c", - "crypto/fipsmodule/rand/rand.c", - "crypto/fipsmodule/rsa/blinding.c", - "crypto/fipsmodule/rsa/padding.c", - "crypto/fipsmodule/rsa/rsa.c", - "crypto/fipsmodule/rsa/rsa_impl.c", - "crypto/fipsmodule/self_check/fips.c", - "crypto/fipsmodule/self_check/self_check.c", - "crypto/fipsmodule/service_indicator/service_indicator.c", - "crypto/fipsmodule/sha/sha1.c", - "crypto/fipsmodule/sha/sha256.c", - "crypto/fipsmodule/sha/sha512.c", - "crypto/fipsmodule/tls/kdf.c", + "crypto/fipsmodule/aes/aes.c.inc", + "crypto/fipsmodule/aes/aes_nohw.c.inc", + "crypto/fipsmodule/aes/key_wrap.c.inc", + "crypto/fipsmodule/aes/mode_wrappers.c.inc", + "crypto/fipsmodule/bn/add.c.inc", + "crypto/fipsmodule/bn/asm/x86_64-gcc.c.inc", + "crypto/fipsmodule/bn/bn.c.inc", + "crypto/fipsmodule/bn/bytes.c.inc", + "crypto/fipsmodule/bn/cmp.c.inc", + "crypto/fipsmodule/bn/ctx.c.inc", + "crypto/fipsmodule/bn/div.c.inc", + "crypto/fipsmodule/bn/div_extra.c.inc", + "crypto/fipsmodule/bn/exponentiation.c.inc", + "crypto/fipsmodule/bn/gcd.c.inc", + "crypto/fipsmodule/bn/gcd_extra.c.inc", + "crypto/fipsmodule/bn/generic.c.inc", + "crypto/fipsmodule/bn/jacobi.c.inc", + "crypto/fipsmodule/bn/montgomery.c.inc", + "crypto/fipsmodule/bn/montgomery_inv.c.inc", + "crypto/fipsmodule/bn/mul.c.inc", + "crypto/fipsmodule/bn/prime.c.inc", + "crypto/fipsmodule/bn/random.c.inc", + "crypto/fipsmodule/bn/rsaz_exp.c.inc", + "crypto/fipsmodule/bn/shift.c.inc", + "crypto/fipsmodule/bn/sqrt.c.inc", + "crypto/fipsmodule/cipher/aead.c.inc", + "crypto/fipsmodule/cipher/cipher.c.inc", + "crypto/fipsmodule/cipher/e_aes.c.inc", + "crypto/fipsmodule/cipher/e_aesccm.c.inc", + "crypto/fipsmodule/cmac/cmac.c.inc", + "crypto/fipsmodule/dh/check.c.inc", + "crypto/fipsmodule/dh/dh.c.inc", + "crypto/fipsmodule/digest/digest.c.inc", + "crypto/fipsmodule/digest/digests.c.inc", + "crypto/fipsmodule/digestsign/digestsign.c.inc", + "crypto/fipsmodule/ec/ec.c.inc", + "crypto/fipsmodule/ec/ec_key.c.inc", + "crypto/fipsmodule/ec/ec_montgomery.c.inc", + "crypto/fipsmodule/ec/felem.c.inc", + "crypto/fipsmodule/ec/oct.c.inc", + "crypto/fipsmodule/ec/p224-64.c.inc", + "crypto/fipsmodule/ec/p256-nistz.c.inc", + "crypto/fipsmodule/ec/p256.c.inc", + "crypto/fipsmodule/ec/scalar.c.inc", + "crypto/fipsmodule/ec/simple.c.inc", + "crypto/fipsmodule/ec/simple_mul.c.inc", + "crypto/fipsmodule/ec/util.c.inc", + "crypto/fipsmodule/ec/wnaf.c.inc", + "crypto/fipsmodule/ecdh/ecdh.c.inc", + "crypto/fipsmodule/ecdsa/ecdsa.c.inc", + "crypto/fipsmodule/hkdf/hkdf.c.inc", + "crypto/fipsmodule/hmac/hmac.c.inc", + "crypto/fipsmodule/md4/md4.c.inc", + "crypto/fipsmodule/md5/md5.c.inc", + "crypto/fipsmodule/modes/cbc.c.inc", + "crypto/fipsmodule/modes/cfb.c.inc", + "crypto/fipsmodule/modes/ctr.c.inc", + "crypto/fipsmodule/modes/gcm.c.inc", + "crypto/fipsmodule/modes/gcm_nohw.c.inc", + "crypto/fipsmodule/modes/ofb.c.inc", + "crypto/fipsmodule/modes/polyval.c.inc", + "crypto/fipsmodule/rand/ctrdrbg.c.inc", + "crypto/fipsmodule/rand/rand.c.inc", + "crypto/fipsmodule/rsa/blinding.c.inc", + "crypto/fipsmodule/rsa/padding.c.inc", + "crypto/fipsmodule/rsa/rsa.c.inc", + "crypto/fipsmodule/rsa/rsa_impl.c.inc", + "crypto/fipsmodule/self_check/fips.c.inc", + "crypto/fipsmodule/self_check/self_check.c.inc", + "crypto/fipsmodule/service_indicator/service_indicator.c.inc", + "crypto/fipsmodule/sha/sha1.c.inc", + "crypto/fipsmodule/sha/sha256.c.inc", + "crypto/fipsmodule/sha/sha512.c.inc", + "crypto/fipsmodule/tls/kdf.c.inc", ] bcm_sources_asm = [
diff --git a/gen/sources.cmake b/gen/sources.cmake index eb22684..e3245c1 100644 --- a/gen/sources.cmake +++ b/gen/sources.cmake
@@ -23,80 +23,80 @@ set( BCM_INTERNAL_HEADERS - crypto/fipsmodule/aes/aes.c - crypto/fipsmodule/aes/aes_nohw.c - crypto/fipsmodule/aes/key_wrap.c - crypto/fipsmodule/aes/mode_wrappers.c - crypto/fipsmodule/bn/add.c - crypto/fipsmodule/bn/asm/x86_64-gcc.c - crypto/fipsmodule/bn/bn.c - crypto/fipsmodule/bn/bytes.c - crypto/fipsmodule/bn/cmp.c - crypto/fipsmodule/bn/ctx.c - crypto/fipsmodule/bn/div.c - crypto/fipsmodule/bn/div_extra.c - crypto/fipsmodule/bn/exponentiation.c - crypto/fipsmodule/bn/gcd.c - crypto/fipsmodule/bn/gcd_extra.c - crypto/fipsmodule/bn/generic.c - crypto/fipsmodule/bn/jacobi.c - crypto/fipsmodule/bn/montgomery.c - crypto/fipsmodule/bn/montgomery_inv.c - crypto/fipsmodule/bn/mul.c - crypto/fipsmodule/bn/prime.c - crypto/fipsmodule/bn/random.c - crypto/fipsmodule/bn/rsaz_exp.c - crypto/fipsmodule/bn/shift.c - crypto/fipsmodule/bn/sqrt.c - crypto/fipsmodule/cipher/aead.c - crypto/fipsmodule/cipher/cipher.c - crypto/fipsmodule/cipher/e_aes.c - crypto/fipsmodule/cipher/e_aesccm.c - crypto/fipsmodule/cmac/cmac.c - crypto/fipsmodule/dh/check.c - crypto/fipsmodule/dh/dh.c - crypto/fipsmodule/digest/digest.c - crypto/fipsmodule/digest/digests.c - crypto/fipsmodule/digestsign/digestsign.c - crypto/fipsmodule/ec/ec.c - crypto/fipsmodule/ec/ec_key.c - crypto/fipsmodule/ec/ec_montgomery.c - crypto/fipsmodule/ec/felem.c - crypto/fipsmodule/ec/oct.c - crypto/fipsmodule/ec/p224-64.c - crypto/fipsmodule/ec/p256-nistz.c - crypto/fipsmodule/ec/p256.c - crypto/fipsmodule/ec/scalar.c - crypto/fipsmodule/ec/simple.c - crypto/fipsmodule/ec/simple_mul.c - crypto/fipsmodule/ec/util.c - crypto/fipsmodule/ec/wnaf.c - crypto/fipsmodule/ecdh/ecdh.c - crypto/fipsmodule/ecdsa/ecdsa.c - crypto/fipsmodule/hkdf/hkdf.c - crypto/fipsmodule/hmac/hmac.c - crypto/fipsmodule/md4/md4.c - crypto/fipsmodule/md5/md5.c - crypto/fipsmodule/modes/cbc.c - crypto/fipsmodule/modes/cfb.c - crypto/fipsmodule/modes/ctr.c - crypto/fipsmodule/modes/gcm.c - crypto/fipsmodule/modes/gcm_nohw.c - crypto/fipsmodule/modes/ofb.c - crypto/fipsmodule/modes/polyval.c - crypto/fipsmodule/rand/ctrdrbg.c - crypto/fipsmodule/rand/rand.c - crypto/fipsmodule/rsa/blinding.c - crypto/fipsmodule/rsa/padding.c - crypto/fipsmodule/rsa/rsa.c - crypto/fipsmodule/rsa/rsa_impl.c - crypto/fipsmodule/self_check/fips.c - crypto/fipsmodule/self_check/self_check.c - crypto/fipsmodule/service_indicator/service_indicator.c - crypto/fipsmodule/sha/sha1.c - crypto/fipsmodule/sha/sha256.c - crypto/fipsmodule/sha/sha512.c - crypto/fipsmodule/tls/kdf.c + crypto/fipsmodule/aes/aes.c.inc + crypto/fipsmodule/aes/aes_nohw.c.inc + crypto/fipsmodule/aes/key_wrap.c.inc + crypto/fipsmodule/aes/mode_wrappers.c.inc + crypto/fipsmodule/bn/add.c.inc + crypto/fipsmodule/bn/asm/x86_64-gcc.c.inc + crypto/fipsmodule/bn/bn.c.inc + crypto/fipsmodule/bn/bytes.c.inc + crypto/fipsmodule/bn/cmp.c.inc + crypto/fipsmodule/bn/ctx.c.inc + crypto/fipsmodule/bn/div.c.inc + crypto/fipsmodule/bn/div_extra.c.inc + crypto/fipsmodule/bn/exponentiation.c.inc + crypto/fipsmodule/bn/gcd.c.inc + crypto/fipsmodule/bn/gcd_extra.c.inc + crypto/fipsmodule/bn/generic.c.inc + crypto/fipsmodule/bn/jacobi.c.inc + crypto/fipsmodule/bn/montgomery.c.inc + crypto/fipsmodule/bn/montgomery_inv.c.inc + crypto/fipsmodule/bn/mul.c.inc + crypto/fipsmodule/bn/prime.c.inc + crypto/fipsmodule/bn/random.c.inc + crypto/fipsmodule/bn/rsaz_exp.c.inc + crypto/fipsmodule/bn/shift.c.inc + crypto/fipsmodule/bn/sqrt.c.inc + crypto/fipsmodule/cipher/aead.c.inc + crypto/fipsmodule/cipher/cipher.c.inc + crypto/fipsmodule/cipher/e_aes.c.inc + crypto/fipsmodule/cipher/e_aesccm.c.inc + crypto/fipsmodule/cmac/cmac.c.inc + crypto/fipsmodule/dh/check.c.inc + crypto/fipsmodule/dh/dh.c.inc + crypto/fipsmodule/digest/digest.c.inc + crypto/fipsmodule/digest/digests.c.inc + crypto/fipsmodule/digestsign/digestsign.c.inc + crypto/fipsmodule/ec/ec.c.inc + crypto/fipsmodule/ec/ec_key.c.inc + crypto/fipsmodule/ec/ec_montgomery.c.inc + crypto/fipsmodule/ec/felem.c.inc + crypto/fipsmodule/ec/oct.c.inc + crypto/fipsmodule/ec/p224-64.c.inc + crypto/fipsmodule/ec/p256-nistz.c.inc + crypto/fipsmodule/ec/p256.c.inc + crypto/fipsmodule/ec/scalar.c.inc + crypto/fipsmodule/ec/simple.c.inc + crypto/fipsmodule/ec/simple_mul.c.inc + crypto/fipsmodule/ec/util.c.inc + crypto/fipsmodule/ec/wnaf.c.inc + crypto/fipsmodule/ecdh/ecdh.c.inc + crypto/fipsmodule/ecdsa/ecdsa.c.inc + crypto/fipsmodule/hkdf/hkdf.c.inc + crypto/fipsmodule/hmac/hmac.c.inc + crypto/fipsmodule/md4/md4.c.inc + crypto/fipsmodule/md5/md5.c.inc + crypto/fipsmodule/modes/cbc.c.inc + crypto/fipsmodule/modes/cfb.c.inc + crypto/fipsmodule/modes/ctr.c.inc + crypto/fipsmodule/modes/gcm.c.inc + crypto/fipsmodule/modes/gcm_nohw.c.inc + crypto/fipsmodule/modes/ofb.c.inc + crypto/fipsmodule/modes/polyval.c.inc + crypto/fipsmodule/rand/ctrdrbg.c.inc + crypto/fipsmodule/rand/rand.c.inc + crypto/fipsmodule/rsa/blinding.c.inc + crypto/fipsmodule/rsa/padding.c.inc + crypto/fipsmodule/rsa/rsa.c.inc + crypto/fipsmodule/rsa/rsa_impl.c.inc + crypto/fipsmodule/self_check/fips.c.inc + crypto/fipsmodule/self_check/self_check.c.inc + crypto/fipsmodule/service_indicator/service_indicator.c.inc + crypto/fipsmodule/sha/sha1.c.inc + crypto/fipsmodule/sha/sha256.c.inc + crypto/fipsmodule/sha/sha512.c.inc + crypto/fipsmodule/tls/kdf.c.inc ) set(
diff --git a/gen/sources.gni b/gen/sources.gni index 71fdeba..292b2f1 100644 --- a/gen/sources.gni +++ b/gen/sources.gni
@@ -19,80 +19,80 @@ ] bcm_internal_headers = [ - "crypto/fipsmodule/aes/aes.c", - "crypto/fipsmodule/aes/aes_nohw.c", - "crypto/fipsmodule/aes/key_wrap.c", - "crypto/fipsmodule/aes/mode_wrappers.c", - "crypto/fipsmodule/bn/add.c", - "crypto/fipsmodule/bn/asm/x86_64-gcc.c", - "crypto/fipsmodule/bn/bn.c", - "crypto/fipsmodule/bn/bytes.c", - "crypto/fipsmodule/bn/cmp.c", - "crypto/fipsmodule/bn/ctx.c", - "crypto/fipsmodule/bn/div.c", - "crypto/fipsmodule/bn/div_extra.c", - "crypto/fipsmodule/bn/exponentiation.c", - "crypto/fipsmodule/bn/gcd.c", - "crypto/fipsmodule/bn/gcd_extra.c", - "crypto/fipsmodule/bn/generic.c", - "crypto/fipsmodule/bn/jacobi.c", - "crypto/fipsmodule/bn/montgomery.c", - "crypto/fipsmodule/bn/montgomery_inv.c", - "crypto/fipsmodule/bn/mul.c", - "crypto/fipsmodule/bn/prime.c", - "crypto/fipsmodule/bn/random.c", - "crypto/fipsmodule/bn/rsaz_exp.c", - "crypto/fipsmodule/bn/shift.c", - "crypto/fipsmodule/bn/sqrt.c", - "crypto/fipsmodule/cipher/aead.c", - "crypto/fipsmodule/cipher/cipher.c", - "crypto/fipsmodule/cipher/e_aes.c", - "crypto/fipsmodule/cipher/e_aesccm.c", - "crypto/fipsmodule/cmac/cmac.c", - "crypto/fipsmodule/dh/check.c", - "crypto/fipsmodule/dh/dh.c", - "crypto/fipsmodule/digest/digest.c", - "crypto/fipsmodule/digest/digests.c", - "crypto/fipsmodule/digestsign/digestsign.c", - "crypto/fipsmodule/ec/ec.c", - "crypto/fipsmodule/ec/ec_key.c", - "crypto/fipsmodule/ec/ec_montgomery.c", - "crypto/fipsmodule/ec/felem.c", - "crypto/fipsmodule/ec/oct.c", - "crypto/fipsmodule/ec/p224-64.c", - "crypto/fipsmodule/ec/p256-nistz.c", - "crypto/fipsmodule/ec/p256.c", - "crypto/fipsmodule/ec/scalar.c", - "crypto/fipsmodule/ec/simple.c", - "crypto/fipsmodule/ec/simple_mul.c", - "crypto/fipsmodule/ec/util.c", - "crypto/fipsmodule/ec/wnaf.c", - "crypto/fipsmodule/ecdh/ecdh.c", - "crypto/fipsmodule/ecdsa/ecdsa.c", - "crypto/fipsmodule/hkdf/hkdf.c", - "crypto/fipsmodule/hmac/hmac.c", - "crypto/fipsmodule/md4/md4.c", - "crypto/fipsmodule/md5/md5.c", - "crypto/fipsmodule/modes/cbc.c", - "crypto/fipsmodule/modes/cfb.c", - "crypto/fipsmodule/modes/ctr.c", - "crypto/fipsmodule/modes/gcm.c", - "crypto/fipsmodule/modes/gcm_nohw.c", - "crypto/fipsmodule/modes/ofb.c", - "crypto/fipsmodule/modes/polyval.c", - "crypto/fipsmodule/rand/ctrdrbg.c", - "crypto/fipsmodule/rand/rand.c", - "crypto/fipsmodule/rsa/blinding.c", - "crypto/fipsmodule/rsa/padding.c", - "crypto/fipsmodule/rsa/rsa.c", - "crypto/fipsmodule/rsa/rsa_impl.c", - "crypto/fipsmodule/self_check/fips.c", - "crypto/fipsmodule/self_check/self_check.c", - "crypto/fipsmodule/service_indicator/service_indicator.c", - "crypto/fipsmodule/sha/sha1.c", - "crypto/fipsmodule/sha/sha256.c", - "crypto/fipsmodule/sha/sha512.c", - "crypto/fipsmodule/tls/kdf.c", + "crypto/fipsmodule/aes/aes.c.inc", + "crypto/fipsmodule/aes/aes_nohw.c.inc", + "crypto/fipsmodule/aes/key_wrap.c.inc", + "crypto/fipsmodule/aes/mode_wrappers.c.inc", + "crypto/fipsmodule/bn/add.c.inc", + "crypto/fipsmodule/bn/asm/x86_64-gcc.c.inc", + "crypto/fipsmodule/bn/bn.c.inc", + "crypto/fipsmodule/bn/bytes.c.inc", + "crypto/fipsmodule/bn/cmp.c.inc", + "crypto/fipsmodule/bn/ctx.c.inc", + "crypto/fipsmodule/bn/div.c.inc", + "crypto/fipsmodule/bn/div_extra.c.inc", + "crypto/fipsmodule/bn/exponentiation.c.inc", + "crypto/fipsmodule/bn/gcd.c.inc", + "crypto/fipsmodule/bn/gcd_extra.c.inc", + "crypto/fipsmodule/bn/generic.c.inc", + "crypto/fipsmodule/bn/jacobi.c.inc", + "crypto/fipsmodule/bn/montgomery.c.inc", + "crypto/fipsmodule/bn/montgomery_inv.c.inc", + "crypto/fipsmodule/bn/mul.c.inc", + "crypto/fipsmodule/bn/prime.c.inc", + "crypto/fipsmodule/bn/random.c.inc", + "crypto/fipsmodule/bn/rsaz_exp.c.inc", + "crypto/fipsmodule/bn/shift.c.inc", + "crypto/fipsmodule/bn/sqrt.c.inc", + "crypto/fipsmodule/cipher/aead.c.inc", + "crypto/fipsmodule/cipher/cipher.c.inc", + "crypto/fipsmodule/cipher/e_aes.c.inc", + "crypto/fipsmodule/cipher/e_aesccm.c.inc", + "crypto/fipsmodule/cmac/cmac.c.inc", + "crypto/fipsmodule/dh/check.c.inc", + "crypto/fipsmodule/dh/dh.c.inc", + "crypto/fipsmodule/digest/digest.c.inc", + "crypto/fipsmodule/digest/digests.c.inc", + "crypto/fipsmodule/digestsign/digestsign.c.inc", + "crypto/fipsmodule/ec/ec.c.inc", + "crypto/fipsmodule/ec/ec_key.c.inc", + "crypto/fipsmodule/ec/ec_montgomery.c.inc", + "crypto/fipsmodule/ec/felem.c.inc", + "crypto/fipsmodule/ec/oct.c.inc", + "crypto/fipsmodule/ec/p224-64.c.inc", + "crypto/fipsmodule/ec/p256-nistz.c.inc", + "crypto/fipsmodule/ec/p256.c.inc", + "crypto/fipsmodule/ec/scalar.c.inc", + "crypto/fipsmodule/ec/simple.c.inc", + "crypto/fipsmodule/ec/simple_mul.c.inc", + "crypto/fipsmodule/ec/util.c.inc", + "crypto/fipsmodule/ec/wnaf.c.inc", + "crypto/fipsmodule/ecdh/ecdh.c.inc", + "crypto/fipsmodule/ecdsa/ecdsa.c.inc", + "crypto/fipsmodule/hkdf/hkdf.c.inc", + "crypto/fipsmodule/hmac/hmac.c.inc", + "crypto/fipsmodule/md4/md4.c.inc", + "crypto/fipsmodule/md5/md5.c.inc", + "crypto/fipsmodule/modes/cbc.c.inc", + "crypto/fipsmodule/modes/cfb.c.inc", + "crypto/fipsmodule/modes/ctr.c.inc", + "crypto/fipsmodule/modes/gcm.c.inc", + "crypto/fipsmodule/modes/gcm_nohw.c.inc", + "crypto/fipsmodule/modes/ofb.c.inc", + "crypto/fipsmodule/modes/polyval.c.inc", + "crypto/fipsmodule/rand/ctrdrbg.c.inc", + "crypto/fipsmodule/rand/rand.c.inc", + "crypto/fipsmodule/rsa/blinding.c.inc", + "crypto/fipsmodule/rsa/padding.c.inc", + "crypto/fipsmodule/rsa/rsa.c.inc", + "crypto/fipsmodule/rsa/rsa_impl.c.inc", + "crypto/fipsmodule/self_check/fips.c.inc", + "crypto/fipsmodule/self_check/self_check.c.inc", + "crypto/fipsmodule/service_indicator/service_indicator.c.inc", + "crypto/fipsmodule/sha/sha1.c.inc", + "crypto/fipsmodule/sha/sha256.c.inc", + "crypto/fipsmodule/sha/sha512.c.inc", + "crypto/fipsmodule/tls/kdf.c.inc", ] bcm_sources_asm = [
diff --git a/gen/sources.json b/gen/sources.json index 1e17762..d6242bc 100644 --- a/gen/sources.json +++ b/gen/sources.json
@@ -4,80 +4,80 @@ "crypto/fipsmodule/bcm.c" ], "internal_hdrs": [ - "crypto/fipsmodule/aes/aes.c", - "crypto/fipsmodule/aes/aes_nohw.c", - "crypto/fipsmodule/aes/key_wrap.c", - "crypto/fipsmodule/aes/mode_wrappers.c", - "crypto/fipsmodule/bn/add.c", - "crypto/fipsmodule/bn/asm/x86_64-gcc.c", - "crypto/fipsmodule/bn/bn.c", - "crypto/fipsmodule/bn/bytes.c", - "crypto/fipsmodule/bn/cmp.c", - "crypto/fipsmodule/bn/ctx.c", - "crypto/fipsmodule/bn/div.c", - "crypto/fipsmodule/bn/div_extra.c", - "crypto/fipsmodule/bn/exponentiation.c", - "crypto/fipsmodule/bn/gcd.c", - "crypto/fipsmodule/bn/gcd_extra.c", - "crypto/fipsmodule/bn/generic.c", - "crypto/fipsmodule/bn/jacobi.c", - "crypto/fipsmodule/bn/montgomery.c", - "crypto/fipsmodule/bn/montgomery_inv.c", - "crypto/fipsmodule/bn/mul.c", - "crypto/fipsmodule/bn/prime.c", - "crypto/fipsmodule/bn/random.c", - "crypto/fipsmodule/bn/rsaz_exp.c", - "crypto/fipsmodule/bn/shift.c", - "crypto/fipsmodule/bn/sqrt.c", - "crypto/fipsmodule/cipher/aead.c", - "crypto/fipsmodule/cipher/cipher.c", - "crypto/fipsmodule/cipher/e_aes.c", - "crypto/fipsmodule/cipher/e_aesccm.c", - "crypto/fipsmodule/cmac/cmac.c", - "crypto/fipsmodule/dh/check.c", - "crypto/fipsmodule/dh/dh.c", - "crypto/fipsmodule/digest/digest.c", - "crypto/fipsmodule/digest/digests.c", - "crypto/fipsmodule/digestsign/digestsign.c", - "crypto/fipsmodule/ec/ec.c", - "crypto/fipsmodule/ec/ec_key.c", - "crypto/fipsmodule/ec/ec_montgomery.c", - "crypto/fipsmodule/ec/felem.c", - "crypto/fipsmodule/ec/oct.c", - "crypto/fipsmodule/ec/p224-64.c", - "crypto/fipsmodule/ec/p256-nistz.c", - "crypto/fipsmodule/ec/p256.c", - "crypto/fipsmodule/ec/scalar.c", - "crypto/fipsmodule/ec/simple.c", - "crypto/fipsmodule/ec/simple_mul.c", - "crypto/fipsmodule/ec/util.c", - "crypto/fipsmodule/ec/wnaf.c", - "crypto/fipsmodule/ecdh/ecdh.c", - "crypto/fipsmodule/ecdsa/ecdsa.c", - "crypto/fipsmodule/hkdf/hkdf.c", - "crypto/fipsmodule/hmac/hmac.c", - "crypto/fipsmodule/md4/md4.c", - "crypto/fipsmodule/md5/md5.c", - "crypto/fipsmodule/modes/cbc.c", - "crypto/fipsmodule/modes/cfb.c", - "crypto/fipsmodule/modes/ctr.c", - "crypto/fipsmodule/modes/gcm.c", - "crypto/fipsmodule/modes/gcm_nohw.c", - "crypto/fipsmodule/modes/ofb.c", - "crypto/fipsmodule/modes/polyval.c", - "crypto/fipsmodule/rand/ctrdrbg.c", - "crypto/fipsmodule/rand/rand.c", - "crypto/fipsmodule/rsa/blinding.c", - "crypto/fipsmodule/rsa/padding.c", - "crypto/fipsmodule/rsa/rsa.c", - "crypto/fipsmodule/rsa/rsa_impl.c", - "crypto/fipsmodule/self_check/fips.c", - "crypto/fipsmodule/self_check/self_check.c", - "crypto/fipsmodule/service_indicator/service_indicator.c", - "crypto/fipsmodule/sha/sha1.c", - "crypto/fipsmodule/sha/sha256.c", - "crypto/fipsmodule/sha/sha512.c", - "crypto/fipsmodule/tls/kdf.c" + "crypto/fipsmodule/aes/aes.c.inc", + "crypto/fipsmodule/aes/aes_nohw.c.inc", + "crypto/fipsmodule/aes/key_wrap.c.inc", + "crypto/fipsmodule/aes/mode_wrappers.c.inc", + "crypto/fipsmodule/bn/add.c.inc", + "crypto/fipsmodule/bn/asm/x86_64-gcc.c.inc", + "crypto/fipsmodule/bn/bn.c.inc", + "crypto/fipsmodule/bn/bytes.c.inc", + "crypto/fipsmodule/bn/cmp.c.inc", + "crypto/fipsmodule/bn/ctx.c.inc", + "crypto/fipsmodule/bn/div.c.inc", + "crypto/fipsmodule/bn/div_extra.c.inc", + "crypto/fipsmodule/bn/exponentiation.c.inc", + "crypto/fipsmodule/bn/gcd.c.inc", + "crypto/fipsmodule/bn/gcd_extra.c.inc", + "crypto/fipsmodule/bn/generic.c.inc", + "crypto/fipsmodule/bn/jacobi.c.inc", + "crypto/fipsmodule/bn/montgomery.c.inc", + "crypto/fipsmodule/bn/montgomery_inv.c.inc", + "crypto/fipsmodule/bn/mul.c.inc", + "crypto/fipsmodule/bn/prime.c.inc", + "crypto/fipsmodule/bn/random.c.inc", + "crypto/fipsmodule/bn/rsaz_exp.c.inc", + "crypto/fipsmodule/bn/shift.c.inc", + "crypto/fipsmodule/bn/sqrt.c.inc", + "crypto/fipsmodule/cipher/aead.c.inc", + "crypto/fipsmodule/cipher/cipher.c.inc", + "crypto/fipsmodule/cipher/e_aes.c.inc", + "crypto/fipsmodule/cipher/e_aesccm.c.inc", + "crypto/fipsmodule/cmac/cmac.c.inc", + "crypto/fipsmodule/dh/check.c.inc", + "crypto/fipsmodule/dh/dh.c.inc", + "crypto/fipsmodule/digest/digest.c.inc", + "crypto/fipsmodule/digest/digests.c.inc", + "crypto/fipsmodule/digestsign/digestsign.c.inc", + "crypto/fipsmodule/ec/ec.c.inc", + "crypto/fipsmodule/ec/ec_key.c.inc", + "crypto/fipsmodule/ec/ec_montgomery.c.inc", + "crypto/fipsmodule/ec/felem.c.inc", + "crypto/fipsmodule/ec/oct.c.inc", + "crypto/fipsmodule/ec/p224-64.c.inc", + "crypto/fipsmodule/ec/p256-nistz.c.inc", + "crypto/fipsmodule/ec/p256.c.inc", + "crypto/fipsmodule/ec/scalar.c.inc", + "crypto/fipsmodule/ec/simple.c.inc", + "crypto/fipsmodule/ec/simple_mul.c.inc", + "crypto/fipsmodule/ec/util.c.inc", + "crypto/fipsmodule/ec/wnaf.c.inc", + "crypto/fipsmodule/ecdh/ecdh.c.inc", + "crypto/fipsmodule/ecdsa/ecdsa.c.inc", + "crypto/fipsmodule/hkdf/hkdf.c.inc", + "crypto/fipsmodule/hmac/hmac.c.inc", + "crypto/fipsmodule/md4/md4.c.inc", + "crypto/fipsmodule/md5/md5.c.inc", + "crypto/fipsmodule/modes/cbc.c.inc", + "crypto/fipsmodule/modes/cfb.c.inc", + "crypto/fipsmodule/modes/ctr.c.inc", + "crypto/fipsmodule/modes/gcm.c.inc", + "crypto/fipsmodule/modes/gcm_nohw.c.inc", + "crypto/fipsmodule/modes/ofb.c.inc", + "crypto/fipsmodule/modes/polyval.c.inc", + "crypto/fipsmodule/rand/ctrdrbg.c.inc", + "crypto/fipsmodule/rand/rand.c.inc", + "crypto/fipsmodule/rsa/blinding.c.inc", + "crypto/fipsmodule/rsa/padding.c.inc", + "crypto/fipsmodule/rsa/rsa.c.inc", + "crypto/fipsmodule/rsa/rsa_impl.c.inc", + "crypto/fipsmodule/self_check/fips.c.inc", + "crypto/fipsmodule/self_check/self_check.c.inc", + "crypto/fipsmodule/service_indicator/service_indicator.c.inc", + "crypto/fipsmodule/sha/sha1.c.inc", + "crypto/fipsmodule/sha/sha256.c.inc", + "crypto/fipsmodule/sha/sha512.c.inc", + "crypto/fipsmodule/tls/kdf.c.inc" ], "asm": [ "gen/bcm/aesni-gcm-x86_64-apple.S",