cleanup

boring.go

@@ -2,11 +2,4 @@
 
 package nebula
 
-import "crypto/boring"
+var boringEnabled = boring.Enabled
-
-func getFIPS140() string {
-	if boring.Enabled() {
-		return "boringcrypto"
-	}
-	return "off"
-}

interface.go

@@ -2,6 +2,7 @@ package nebula
 
 import (
 	"context"
+	"crypto/fips140"
 	"errors"
 	"fmt"
 	"io"
@@ -234,7 +235,10 @@ func (f *Interface) activate() error {
 		"networks", f.myVpnNetworks,
 		"build", f.version,
 		"udpAddr", addr,
-		"fips140", getFIPS140(),
+		"boringcrypto", boringEnabled(),
+		"fips140Version", fips140.Version(),
+		"fips140Enabled", fips140.Enabled(),
+		"fips140Enforced", fips140.Enforced(),
 	)
 
 	if f.routines > 1 {

notboring.go

@@ -2,33 +2,4 @@
 
 package nebula
 
-import (
+var boringEnabled = func() bool { return false }
-	"crypto/fips140"
-	"runtime/debug"
-)
-
-func getFIPS140() string {
-	switch {
-	case fips140.Enabled():
-		return getFIPS140Version()
-	default:
-		return "off"
-	}
-}
-
-func getFIPS140Version() string {
-	// The docs for fips140.Version mention this is more accurate to
-	// get the exact version
-	// - https://pkg.go.dev/crypto/fips140#Version
-	info, ok := debug.ReadBuildInfo()
-	if ok {
-		for _, s := range info.Settings {
-			if s.Key == "GOFIPS140" {
-				return s.Value
-			}
-		}
-	}
-	// TODO: Add as a backup once we bump to go1.26+
-	// return fips140.Version()
-	return "on"
-}

stats.go

@@ -2,12 +2,14 @@ package nebula
 
 import (
 	"context"
+	"crypto/fips140"
 	"errors"
 	"fmt"
 	"log/slog"
 	"net"
 	"net/http"
 	"runtime"
+	"strconv"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -289,7 +291,10 @@ func (s *statsServer) buildRuntime(cfg statsConfig) ([]func(), *http.Server) {
 			ConstLabels: prometheus.Labels{
 				"version":         s.buildVersion,
 				"goversion":       runtime.Version(),
-				"fips140":   getFIPS140(),
+				"boringcrypto":    strconv.FormatBool(boringEnabled()),
+				"fips140Version":  fips140.Version(),
+				"fips140Enabled":  strconv.FormatBool(fips140.Enabled()),
+				"fips140Enforced": strconv.FormatBool(fips140.Enforced()),
 			},
 		})
 		pr.MustRegister(g)