wip

hack/Dockerfile_fips

@@ -34,8 +34,8 @@ RUN \
   export GOOS=linux && \
   export GOARCH=amd64 &&  \
   export GOEXPERIMENT=boringcrypto && \
-  go build -v -trimpath -ldflags "$(hack/get-ldflags.sh) -w -s" -o /usr/local/bin/pinniped-concierge-kube-cert-agent ./cmd/pinniped-concierge-kube-cert-agent/... && \
-  go build -v -trimpath -ldflags "$(hack/get-ldflags.sh) -w -s" -o /usr/local/bin/pinniped-server ./cmd/pinniped-server/... && \
+  go build -v -trimpath -ldflags "$(hack/get-ldflags.sh) -w" -o /usr/local/bin/pinniped-concierge-kube-cert-agent ./cmd/pinniped-concierge-kube-cert-agent/... && \
+  go build -v -trimpath -ldflags "$(hack/get-ldflags.sh) -w" -o /usr/local/bin/pinniped-server ./cmd/pinniped-server/... && \
   ln -s /usr/local/bin/pinniped-server /usr/local/bin/pinniped-concierge && \
   ln -s /usr/local/bin/pinniped-server /usr/local/bin/pinniped-supervisor && \
   ln -s /usr/local/bin/pinniped-server /usr/local/bin/local-user-authenticator

internal/crypto/fips/fips_strict.go

@@ -1,8 +1,8 @@
 // Copyright 2023 the Pinniped contributors. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:build boringcrypto
-// +build boringcrypto
+//go:build goexperiment.boringcrypto
+// +build goexperiment.boringcrypto
 
 package fips
 

internal/crypto/ptls/fips_strict.go

@@ -4,8 +4,8 @@
 // The configurations here override the usual ptls.Secure, ptls.Default, and ptls.DefaultLDAP
 // configs when Pinniped is built in fips-only mode.
 // All of these are the same because FIPs is already so limited.
-//go:build boringcrypto
-// +build boringcrypto
+//go:build goexperiment.boringcrypto
+// +build goexperiment.boringcrypto
 
 package ptls
 

test/integration/securetls_fips_test.go

@@ -1,8 +1,8 @@
 // Copyright 2021-2023 the Pinniped contributors. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:build boringcrypto
-// +build boringcrypto
+//go:build goexperiment.boringcrypto
+// +build goexperiment.boringcrypto
 
 package integration
 

test/testlib/securetls_preference_fips.go

@@ -1,8 +1,8 @@
 // Copyright 2022-2023 the Pinniped contributors. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-//go:build boringcrypto
-// +build boringcrypto
+//go:build goexperiment.boringcrypto
+// +build goexperiment.boringcrypto
 
 package testlib