Merge branch 'build-fips' into 'master'

Add FIPS support

See merge request gitlab-org/gitlab-pages!716

2 files changed, 25 insertions, 0 deletions

diff --git a/internal/boring/boring.go b/internal/boring/boring.go
new file mode 100644
index 00000000..0a59ec4a
--- /dev/null
+++ b/internal/boring/boring.go
@@ -0,0 +1,18 @@
+//go:build boringcrypto
+// +build boringcrypto
+
+package boring
+
+import (
+	"crypto/boring"
+
+	"gitlab.com/gitlab-org/labkit/log"
+)
+
+func CheckBoring() {
+	if boring.Enabled() {
+		log.Info("FIPS mode is enabled. Using BoringSSL.")
+		return
+	}
+	log.Info("GitLab Pages was compiled with FIPS mode but BoringSSL is not enabled.")
+}
diff --git a/internal/boring/notboring.go b/internal/boring/notboring.go
new file mode 100644
index 00000000..6dbf3c39
--- /dev/null
+++ b/internal/boring/notboring.go
@@ -0,0 +1,7 @@
+//go:build !boringcrypto
+// +build !boringcrypto
+
+package boring
+
+func CheckBoring() {
+}