wip

Dockerfile

@@ -16,7 +16,12 @@ RUN \
   --mount=type=cache,target=/cache/gocache \
   --mount=type=cache,target=/cache/gomodcache \
   mkdir out && \
-  export GOCACHE=/cache/gocache GOMODCACHE=/cache/gomodcache CGO_ENABLED=0 GOOS=linux GOARCH=amd64 && \
+  export GOCACHE=/cache/gocache && \
+  export GOMODCACHE=/cache/gomodcache && \
+  export CGO_ENABLED=0 && \
+  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/... && \
   ln -s /usr/local/bin/pinniped-server /usr/local/bin/pinniped-concierge && \

ciphers.txt

@@ -0,0 +1,73 @@
+Obtaining cipher list from LibreSSL 3.3.6.
+Testing AEAD-AES256-GCM-SHA384...YES
+Testing AEAD-CHACHA20-POLY1305-SHA256...YES
+Testing AEAD-AES128-GCM-SHA256...YES
+Testing ECDHE-RSA-AES256-GCM-SHA384...YES
+Testing ECDHE-ECDSA-AES256-GCM-SHA384...YES
+Testing ECDHE-RSA-AES256-SHA384...YES
+Testing ECDHE-ECDSA-AES256-SHA384...YES
+Testing ECDHE-RSA-AES256-SHA...YES
+Testing ECDHE-ECDSA-AES256-SHA...YES
+Testing DHE-RSA-AES256-GCM-SHA384...YES
+Testing DHE-RSA-AES256-SHA256...YES
+Testing DHE-RSA-AES256-SHA...YES
+Testing ECDHE-ECDSA-CHACHA20-POLY1305...YES
+Testing ECDHE-RSA-CHACHA20-POLY1305...YES
+Testing DHE-RSA-CHACHA20-POLY1305...YES
+Testing GOST2012256-GOST89-GOST89...YES
+Testing DHE-RSA-CAMELLIA256-SHA256...YES
+Testing DHE-RSA-CAMELLIA256-SHA...YES
+Testing GOST2001-GOST89-GOST89...YES
+Testing AECDH-AES256-SHA...YES
+Testing ADH-AES256-GCM-SHA384...YES
+Testing ADH-AES256-SHA256...YES
+Testing ADH-AES256-SHA...YES
+Testing ADH-CAMELLIA256-SHA256...YES
+Testing ADH-CAMELLIA256-SHA...YES
+Testing AES256-GCM-SHA384...YES
+Testing AES256-SHA256...YES
+Testing AES256-SHA...YES
+Testing CAMELLIA256-SHA256...YES
+Testing CAMELLIA256-SHA...YES
+Testing ECDHE-RSA-AES128-GCM-SHA256...YES
+Testing ECDHE-ECDSA-AES128-GCM-SHA256...YES
+Testing ECDHE-RSA-AES128-SHA256...YES
+Testing ECDHE-ECDSA-AES128-SHA256...YES
+Testing ECDHE-RSA-AES128-SHA...YES
+Testing ECDHE-ECDSA-AES128-SHA...YES
+Testing DHE-RSA-AES128-GCM-SHA256...YES
+Testing DHE-RSA-AES128-SHA256...YES
+Testing DHE-RSA-AES128-SHA...YES
+Testing DHE-RSA-CAMELLIA128-SHA256...YES
+Testing DHE-RSA-CAMELLIA128-SHA...YES
+Testing AECDH-AES128-SHA...YES
+Testing ADH-AES128-GCM-SHA256...YES
+Testing ADH-AES128-SHA256...YES
+Testing ADH-AES128-SHA...YES
+Testing ADH-CAMELLIA128-SHA256...YES
+Testing ADH-CAMELLIA128-SHA...YES
+Testing AES128-GCM-SHA256...YES
+Testing AES128-SHA256...YES
+Testing AES128-SHA...YES
+Testing CAMELLIA128-SHA256...YES
+Testing CAMELLIA128-SHA...YES
+Testing ECDHE-RSA-RC4-SHA...YES
+Testing ECDHE-ECDSA-RC4-SHA...YES
+Testing AECDH-RC4-SHA...YES
+Testing ADH-RC4-MD5...YES
+Testing RC4-SHA...YES
+Testing RC4-MD5...YES
+Testing ECDHE-RSA-DES-CBC3-SHA...YES
+Testing ECDHE-ECDSA-DES-CBC3-SHA...YES
+Testing EDH-RSA-DES-CBC3-SHA...YES
+Testing AECDH-DES-CBC3-SHA...YES
+Testing ADH-DES-CBC3-SHA...YES
+Testing DES-CBC3-SHA...YES
+Testing ECDHE-RSA-NULL-SHA...YES
+Testing ECDHE-ECDSA-NULL-SHA...YES
+Testing GOST2012256-NULL-STREEBOG256...YES
+Testing GOST2001-NULL-GOST94...YES
+Testing AECDH-NULL-SHA...YES
+Testing NULL-SHA256...YES
+Testing NULL-SHA...YES
+Testing NULL-MD5...YES

cmd/pinniped-concierge-kube-cert-agent/main.go

@@ -13,7 +13,7 @@ import (
 	"os"
 	"time"
 
-	// This side effect import ensures that we use fipsonly crypto during TLS in fips_strict mode.
+	// This side effect import ensures that we use fipsonly crypto during TLS in boringcrypto mode.
 	//
 	// Commenting this out because it causes the runtime memory consumption of this binary to increase
 	// from ~1 MB to ~8 MB (as measured when running the sleep subcommand). This binary does not use TLS,
@@ -25,8 +25,8 @@ import (
 	//nolint:godot // This is not sentence, it is a commented out line of import code.
 	// _ "go.pinniped.dev/internal/crypto/ptls"
 
-	// This side effect imports cgo so that runtime/cgo gets linked, when in fips_strict mode.
+	// This side effect imports cgo so that runtime/cgo gets linked, when in boringcrypto mode.
-	// Without this line, the binary will exit 133 upon startup in fips_strict mode.
+	// Without this line, the binary will exit 133 upon startup in boringcrypto mode.
 	// It also enables fipsonly tls mode, just to be absolutely sure that the fips code is enabled,
 	// even though it shouldn't be used currently by this binary.
 	_ "go.pinniped.dev/internal/crypto/fips"

cmd/pinniped-server/main.go

@@ -15,7 +15,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	concierge "go.pinniped.dev/internal/concierge/server"
-	// this side effect import ensures that we use fipsonly crypto in fips_strict mode.
+	// this side effect import ensures that we use fipsonly crypto in boringcrypto mode.
 	_ "go.pinniped.dev/internal/crypto/ptls"
 	lua "go.pinniped.dev/internal/localuserauthenticator"
 	"go.pinniped.dev/internal/plog"

cmd/pinniped/main.go

@@ -1,4 +1,4 @@
-// Copyright 2020-2022 the Pinniped contributors. All Rights Reserved.
+// Copyright 2020-2023 the Pinniped contributors. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package main
@@ -9,7 +9,7 @@ import (
 	"github.com/pkg/browser"
 
 	"go.pinniped.dev/cmd/pinniped/cmd"
-	// this side effect import ensures that we use fipsonly crypto in fips_strict mode.
+	// this side effect import ensures that we use fipsonly crypto in boringcrypto mode.
 	_ "go.pinniped.dev/internal/crypto/ptls"
 )
 

fips-ciphers.txt

@@ -0,0 +1,73 @@
+Obtaining cipher list from LibreSSL 3.3.6.
+Testing AEAD-AES256-GCM-SHA384...NO (sslv3 alert handshake failure)
+Testing AEAD-CHACHA20-POLY1305-SHA256...NO (sslv3 alert handshake failure)
+Testing AEAD-AES128-GCM-SHA256...NO (sslv3 alert handshake failure)
+Testing ECDHE-RSA-AES256-GCM-SHA384...NO (sslv3 alert handshake failure)
+Testing ECDHE-ECDSA-AES256-GCM-SHA384...YES
+Testing ECDHE-RSA-AES256-SHA384...NO (sslv3 alert handshake failure)
+Testing ECDHE-ECDSA-AES256-SHA384...NO (sslv3 alert handshake failure)
+Testing ECDHE-RSA-AES256-SHA...NO (sslv3 alert handshake failure)
+Testing ECDHE-ECDSA-AES256-SHA...NO (sslv3 alert handshake failure)
+Testing DHE-RSA-AES256-GCM-SHA384...NO (sslv3 alert handshake failure)
+Testing DHE-RSA-AES256-SHA256...NO (sslv3 alert handshake failure)
+Testing DHE-RSA-AES256-SHA...NO (sslv3 alert handshake failure)
+Testing ECDHE-ECDSA-CHACHA20-POLY1305...NO (sslv3 alert handshake failure)
+Testing ECDHE-RSA-CHACHA20-POLY1305...NO (sslv3 alert handshake failure)
+Testing DHE-RSA-CHACHA20-POLY1305...NO (sslv3 alert handshake failure)
+Testing GOST2012256-GOST89-GOST89...NO (sslv3 alert handshake failure)
+Testing DHE-RSA-CAMELLIA256-SHA256...NO (sslv3 alert handshake failure)
+Testing DHE-RSA-CAMELLIA256-SHA...NO (sslv3 alert handshake failure)
+Testing GOST2001-GOST89-GOST89...NO (sslv3 alert handshake failure)
+Testing AECDH-AES256-SHA...NO (sslv3 alert handshake failure)
+Testing ADH-AES256-GCM-SHA384...NO (sslv3 alert handshake failure)
+Testing ADH-AES256-SHA256...NO (sslv3 alert handshake failure)
+Testing ADH-AES256-SHA...NO (sslv3 alert handshake failure)
+Testing ADH-CAMELLIA256-SHA256...NO (sslv3 alert handshake failure)
+Testing ADH-CAMELLIA256-SHA...NO (sslv3 alert handshake failure)
+Testing AES256-GCM-SHA384...NO (sslv3 alert handshake failure)
+Testing AES256-SHA256...NO (sslv3 alert handshake failure)
+Testing AES256-SHA...NO (sslv3 alert handshake failure)
+Testing CAMELLIA256-SHA256...NO (sslv3 alert handshake failure)
+Testing CAMELLIA256-SHA...NO (sslv3 alert handshake failure)
+Testing ECDHE-RSA-AES128-GCM-SHA256...NO (sslv3 alert handshake failure)
+Testing ECDHE-ECDSA-AES128-GCM-SHA256...YES
+Testing ECDHE-RSA-AES128-SHA256...NO (sslv3 alert handshake failure)
+Testing ECDHE-ECDSA-AES128-SHA256...NO (sslv3 alert handshake failure)
+Testing ECDHE-RSA-AES128-SHA...NO (sslv3 alert handshake failure)
+Testing ECDHE-ECDSA-AES128-SHA...NO (sslv3 alert handshake failure)
+Testing DHE-RSA-AES128-GCM-SHA256...NO (sslv3 alert handshake failure)
+Testing DHE-RSA-AES128-SHA256...NO (sslv3 alert handshake failure)
+Testing DHE-RSA-AES128-SHA...NO (sslv3 alert handshake failure)
+Testing DHE-RSA-CAMELLIA128-SHA256...NO (sslv3 alert handshake failure)
+Testing DHE-RSA-CAMELLIA128-SHA...NO (sslv3 alert handshake failure)
+Testing AECDH-AES128-SHA...NO (sslv3 alert handshake failure)
+Testing ADH-AES128-GCM-SHA256...NO (sslv3 alert handshake failure)
+Testing ADH-AES128-SHA256...NO (sslv3 alert handshake failure)
+Testing ADH-AES128-SHA...NO (sslv3 alert handshake failure)
+Testing ADH-CAMELLIA128-SHA256...NO (sslv3 alert handshake failure)
+Testing ADH-CAMELLIA128-SHA...NO (sslv3 alert handshake failure)
+Testing AES128-GCM-SHA256...NO (sslv3 alert handshake failure)
+Testing AES128-SHA256...NO (sslv3 alert handshake failure)
+Testing AES128-SHA...NO (sslv3 alert handshake failure)
+Testing CAMELLIA128-SHA256...NO (sslv3 alert handshake failure)
+Testing CAMELLIA128-SHA...NO (sslv3 alert handshake failure)
+Testing ECDHE-RSA-RC4-SHA...NO (sslv3 alert handshake failure)
+Testing ECDHE-ECDSA-RC4-SHA...NO (sslv3 alert handshake failure)
+Testing AECDH-RC4-SHA...NO (sslv3 alert handshake failure)
+Testing ADH-RC4-MD5...NO (sslv3 alert handshake failure)
+Testing RC4-SHA...NO (sslv3 alert handshake failure)
+Testing RC4-MD5...NO (sslv3 alert handshake failure)
+Testing ECDHE-RSA-DES-CBC3-SHA...NO (sslv3 alert handshake failure)
+Testing ECDHE-ECDSA-DES-CBC3-SHA...NO (sslv3 alert handshake failure)
+Testing EDH-RSA-DES-CBC3-SHA...NO (sslv3 alert handshake failure)
+Testing AECDH-DES-CBC3-SHA...NO (sslv3 alert handshake failure)
+Testing ADH-DES-CBC3-SHA...NO (sslv3 alert handshake failure)
+Testing DES-CBC3-SHA...NO (sslv3 alert handshake failure)
+Testing ECDHE-RSA-NULL-SHA...NO (sslv3 alert handshake failure)
+Testing ECDHE-ECDSA-NULL-SHA...NO (sslv3 alert handshake failure)
+Testing GOST2012256-NULL-STREEBOG256...NO (sslv3 alert handshake failure)
+Testing GOST2001-NULL-GOST94...NO (sslv3 alert handshake failure)
+Testing AECDH-NULL-SHA...NO (sslv3 alert handshake failure)
+Testing NULL-SHA256...NO (sslv3 alert handshake failure)
+Testing NULL-SHA...NO (sslv3 alert handshake failure)
+Testing NULL-MD5...NO (sslv3 alert handshake failure)

hack/Dockerfile_fips

@@ -3,13 +3,13 @@
 # Copyright 2022-2023 the Pinniped contributors. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-# this dockerfile is used to produce a binary of Pinniped that uses
+# This dockerfile is used to produce a binary of Pinniped that uses
-# only fips-allowable ciphers.  Note that this is provided only as
+# only FIPS-allowable ciphers.  Note that this is provided only as
-# an example.  Pinniped has no official support for fips and using
+# an example.  Pinniped has no official support for FIPS and using
 # a version built from this dockerfile may have unforseen consquences.
 # Please do not create issues in regards to problems encountered by
 # using this dockerfile.  Using this dockerfile does not convey
-# any type of fips certification.
+# any type of FIPS certification.
 
 # Starting in 1.19, go-boringcrypto has been added to the main Go toolchain,
 # hidden behind a `GOEXPERIMENT=boringcrypto` env var.
@@ -21,37 +21,21 @@ WORKDIR /work
 COPY . .
 ARG GOPROXY
 
-# Build the executable binary (CGO_ENABLED=1 is required for go boring).
+# Build the executable binary (CGO_ENABLED=0 means static linking)
-# Even though we need cgo to call the boring crypto C functions, these
+# Pass in GOCACHE (build cache) and GOMODCACHE (module cache) so they
-# functions are statically linked into the binary.  We also want to statically
+# can be re-used between image builds.
-# link any libc bits hence we pass "-linkmode=external -extldflags -static"
-# to the ldflags directive.  We do not pass "-s" to ldflags because we do
-# not want to strip symbols - those are used to verify if we compiled correctly.
-# We do not pass in GOCACHE (build cache) and GOMODCACHE (module cache)
-# because there have been bugs in the Go compiler caching when using cgo
-# (it will sometimes use cached artifiacts when it should not).  Since we
-# use gcc as the C compiler, the following warning is emitted:
-# /boring/boringssl/build/../crypto/bio/socket_helper.c:55: warning:
-# Using 'getaddrinfo' in statically linked applications requires at
-# runtime the shared libraries from the glibc version used for linking
-# This is referring to the code in
-# https://github.com/google/boringssl/blob/af34f6460f0bf99dc267818f02b2936f60a30de7/crypto/bio/socket_helper.c#L55
-# which calls the getaddrinfo function.  This function, even when statically linked,
-# uses dlopen to dynamically fetch networking config.  It is safe for us to ignore
-# this warning because the go boring cypto code does not create netowrking connections:
-# https://github.com/golang/go/blob/9d6ab825f6fe125f7ce630e103b887e580403802/src/crypto/internal/boring/goboringcrypto.h
-# The osusergo and netgo tags are used to make sure that the Go implementations of these
-# standard library packages are used instead of the libc based versions.
-# We want to have no reliance on any C code other than the boring crypto bits.
-# Setting GOOS=linux GOARCH=amd64 is a hard requirment for boring crypto:
-# https://github.com/golang/go/blob/9d6ab825f6fe125f7ce630e103b887e580403802/misc/boring/README.md?plain=1#L95
-# Thus trying to compile the pinniped CLI with boring crypto is meaningless
-# since we would not be able to ship windows and macOS binaries.
 RUN \
+  --mount=type=cache,target=/cache/gocache \
+  --mount=type=cache,target=/cache/gomodcache \
   mkdir out && \
-  export CGO_ENABLED=1 GOOS=linux GOARCH=amd64 GOEXPERIMENT=boringcrypto && \
+  export GOCACHE=/cache/gocache && \
-  go build -tags fips_strict,osusergo,netgo -v -trimpath -ldflags "$(hack/get-ldflags.sh) -w -linkmode=external -extldflags -static" -o /usr/local/bin/pinniped-concierge-kube-cert-agent ./cmd/pinniped-concierge-kube-cert-agent/... && \
+  export GOMODCACHE=/cache/gomodcache && \
-  go build -tags fips_strict,osusergo,netgo -v -trimpath -ldflags "$(hack/get-ldflags.sh) -w -linkmode=external -extldflags -static" -o /usr/local/bin/pinniped-server ./cmd/pinniped-server/... && \
+  export CGO_ENABLED=0 && \
+  export GOOS=linux && \
+  export GOARCH=amd64 &&  \
+  export GOEXPERIMENT=boringcrypto && \
+  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/doc.go

@@ -1,6 +1,6 @@
 // Copyright 2023 the Pinniped contributors. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-// Package fips can be imported to enable fipsonly tls mode when compiling with fips_strict.
+// Package fips can be imported to enable fipsonly tls mode when compiling with boringcrypto.
-// It will also cause cgo to be explicitly imported when compiling with fips_strict.
+// It will also cause cgo to be explicitly imported when compiling with boringcrypto.
 package fips

internal/crypto/fips/fips_strict.go

@@ -1,12 +0,0 @@
-// Copyright 2023 the Pinniped contributors. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-//go:build fips_strict
-// +build fips_strict
-
-package fips
-
-import (
-	"C"                     // explicitly import cgo so that runtime/cgo gets linked into the kube-cert-agent
-	_ "crypto/tls/fipsonly" // restricts all TLS configuration to FIPS-approved settings.
-)

internal/crypto/ptls/default.go

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

internal/crypto/ptls/fips_strict.go

@@ -1,80 +0,0 @@
-// Copyright 2022-2023 the Pinniped contributors. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-// 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 fips_strict
-// +build fips_strict
-
-package ptls
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"os"
-	"path/filepath"
-	"runtime"
-
-	"k8s.io/apiserver/pkg/server/options"
-
-	// Cause fipsonly tls mode with this side effect import.
-	_ "go.pinniped.dev/internal/crypto/fips"
-	"go.pinniped.dev/internal/plog"
-)
-
-// Always use TLS 1.2 for FIPs
-const secureServingOptionsMinTLSVersion = "VersionTLS12"
-const SecureTLSConfigMinTLSVersion = tls.VersionTLS12
-
-func init() {
-	switch filepath.Base(os.Args[0]) {
-	case "pinniped-server", "pinniped-supervisor", "pinniped-concierge", "pinniped-concierge-kube-cert-agent":
-	default:
-		return // do not print FIPS logs if we cannot confirm that we are running a server binary
-	}
-
-	// this init runs before we have parsed our config to determine our log level
-	// thus we must use a log statement that will always print instead of conditionally print
-	plog.Always("using boring crypto in fips only mode", "go version", runtime.Version())
-}
-
-func Default(rootCAs *x509.CertPool) *tls.Config {
-	return &tls.Config{
-		// goboring requires TLS 1.2 and only TLS 1.2
-		MinVersion: SecureTLSConfigMinTLSVersion,
-		MaxVersion: SecureTLSConfigMinTLSVersion,
-
-		// enable HTTP2 for go's 1.7 HTTP Server
-		// setting this explicitly is only required in very specific circumstances
-		// it is simpler to just set it here than to try and determine if we need to
-		NextProtos: []string{"h2", "http/1.1"},
-
-		// optional root CAs, nil means use the host's root CA set
-		RootCAs: rootCAs,
-
-		// This is all of the fips-approved ciphers.
-		// The list is hard-coded for convenience of testing.
-		// This is kept in sync with the boring crypto compiler via TestFIPSCipherSuites.
-		CipherSuites: []uint16{
-			tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-			tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
-			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
-			tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
-			tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
-		},
-	}
-}
-
-func Secure(rootCAs *x509.CertPool) *tls.Config {
-	return Default(rootCAs)
-}
-
-func DefaultLDAP(rootCAs *x509.CertPool) *tls.Config {
-	return Default(rootCAs)
-}
-
-func secureServing(opts *options.SecureServingOptionsWithLoopback) {
-	defaultServing(opts)
-}

internal/crypto/ptls/secure.go

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

site/content/docs/reference/fips.md

@@ -9,14 +9,13 @@ menu:
     weight: 30
     parent: reference
 ---
-By default, the Pinniped supervisor and concierge use ciphers that
+By default, the Pinniped supervisor and concierge use ciphers that are not supported by FIPS 140-2.
-are not supported by FIPS 140-2. If you are deploying Pinniped in an
+If you are deploying Pinniped in an environment with FIPS compliance requirements, you will have to build
-environment with FIPS compliance requirements, you will have to build
+the binaries yourself using `GOEXPERIMENT=boringcrypto`.
-the binaries yourself using the `fips_strict` build tag and Golang's
-`go-boringcrypto` fork.
 
 The Pinniped team provides an [example Dockerfile](https://github.com/vmware-tanzu/pinniped/blob/main/hack/Dockerfile_fips)
 demonstrating how you can build Pinniped images in a FIPS compatible way.
+
 However, we do not provide official support for FIPS configuration, and we may not
 respond to GitHub issues opened related to FIPS support.
 We provide this for informational purposes only.

test/integration/securetls_fips_test.go

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

test/testlib/securetls_preference_fips.go

@@ -1,13 +0,0 @@
-// Copyright 2022 the Pinniped contributors. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-//go:build fips_strict
-// +build fips_strict
-
-package testlib
-
-// Because of a bug in nmap, the cipher suite preference is
-// incorrectly shown as 'client' in some cases.
-// in fips-only mode, it correctly shows the cipher preference
-// as 'server', while in non-fips mode it shows as 'client'.
-const cipherSuitePreference = "server"

test/testlib/securetls_preference_nonfips.go

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

test_ciphers.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# OpenSSL requires the port number.
+SERVER=$1
+DELAY=1
+ciphers=$(openssl ciphers 'ALL:eNULL' | sed -e 's/:/ /g')
+
+echo Obtaining cipher list from $(openssl version).
+
+for cipher in ${ciphers[@]}
+do
+  echo -n Testing $cipher...
+  result=$(echo -n | openssl s_client -cipher "$cipher" -connect $SERVER 2>&1)
+  if [[ "$result" =~ ":error:" ]] ; then
+    error=$(echo -n $result | cut -d':' -f6)
+    echo NO \($error\)
+  else
+    if [[ "$result" =~ "Cipher is ${cipher}" || "$result" =~ "Cipher    :" ]] ; then
+      echo YES
+    else
+      echo UNKNOWN RESPONSE
+      echo $result
+    fi
+  fi
+  sleep $DELAY
+done