Fix crypto UT after upgrading to golang v1.21.7

golang/go#65323
projectcalico · Mar 6, 2024 · a67f1ee · a67f1ee
1 parent a92b26c
commit a67f1ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/crypto/Makefile b/crypto/Makefile
@@ -16,10 +16,10 @@ fv: setup-fv bin/fips-test-build
 	# Run the nmap tool on the server to find out the tls versions and ciphers.
 	docker run --net=host --rm -it instrumentisto/nmap --script ssl-enum-ciphers -p 8083 127.0.0.1 > tmp/nmap.log
 	# remove times and dates from file
-	sed -i '1,4d;22d' tmp/nmap.log
+	sed -i '1,4d;19d' tmp/nmap.log
 	docker rm -f fips-test-build
 	# If the ciphers are as expected, we get exit code 0.
-	diff fv/expected-nmap.log  tmp/nmap.log
+	diff -u fv/expected-nmap.log tmp/nmap.log
 
 bin/fips-test-build:
 	$(call build_cgo_boring_binary, $(PACKAGE_NAME)/fv/main, $@)

diff --git a/crypto/fv/expected-nmap.log b/crypto/fv/expected-nmap.log
@@ -5,13 +5,10 @@ PORT     STATE SERVICE
 |     ciphers: 
 |       TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (secp256r1) - A
 |       TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (secp256r1) - A
+|       TLS_RSA_WITH_AES_128_GCM_SHA256 (rsa 2048) - A
+|       TLS_RSA_WITH_AES_256_GCM_SHA384 (rsa 2048) - A
 |     compressors: 
 |       NULL
 |     cipher preference: server
-|   TLSv1.3: 
-|     ciphers: 
-|       TLS_AKE_WITH_AES_128_GCM_SHA256 (secp256r1) - A
-|       TLS_AKE_WITH_AES_256_GCM_SHA384 (secp256r1) - A
-|     cipher preference: server
 |_  least strength: A