commit fb855a28fe9689e8e1f76f1fb664228828c882f5
author David Benjamin <davidben@google.com> Wed Mar 17 11:55:14 2021 -0400
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Wed Mar 17 16:40:27 2021 +0000
tree d954e25d96d598b9bceda575187531f1a07d40ea
parent a3437c09c77bab011d0bebb8f61a6df82eb53eec

Move fips.c into a subdirectory.

The build scripts distinguish between normal files and bcm.c fragments
based on whether code is in a subdirectory inside crypto/fipsmodule.

Bug: 401
Change-Id: Ieba88178e4f8e19f020e56e2567d5736a34bb43f
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/46224
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>

crypto/fipsmodule/bcm.c

diff --git a/crypto/fipsmodule/bcm.c b/crypto/fipsmodule/bcm.c
index 61479ed..3a1ad15 100644
--- a/crypto/fipsmodule/bcm.c
+++ b/crypto/fipsmodule/bcm.c
@@ -79,7 +79,6 @@
 #include "ec/simple_mul.c"
 #include "ec/util.c"
 #include "ec/wnaf.c"
-#include "fips.c"
 #include "hmac/hmac.c"
 #include "md4/md4.c"
 #include "md5/md5.c"
@@ -98,6 +97,7 @@
 #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 "sha/sha1-altivec.c"
 #include "sha/sha1.c"

crypto/fipsmodule/self_check/fips.c

diff --git a/crypto/fipsmodule/fips.c b/crypto/fipsmodule/self_check/fips.c
similarity index 97%
rename from crypto/fipsmodule/fips.c
rename to crypto/fipsmodule/self_check/fips.c
index 07554e4..09fffdd 100644
--- a/crypto/fipsmodule/fips.c
+++ b/crypto/fipsmodule/self_check/fips.c
@@ -14,8 +14,8 @@
 
 #include <openssl/crypto.h>
 
-#include "../internal.h"
-#include "delocate.h"
+#include "../../internal.h"
+#include "../delocate.h"
 
 
 int FIPS_mode(void) {