Skip to content

Commit ac13343

Browse files
committed
Fix crypto UT after upgrading to golang v1.21.7
golang/go#65323
1 parent 7cc1fd0 commit ac13343

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

crypto/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ fv: setup-fv bin/fips-test-build
1616
# Run the nmap tool on the server to find out the tls versions and ciphers.
1717
docker run --net=host --rm -it instrumentisto/nmap --script ssl-enum-ciphers -p 8083 127.0.0.1 > tmp/nmap.log
1818
# remove times and dates from file
19-
sed -i '1,4d;22d' tmp/nmap.log
19+
sed -i '1,4d;19d' tmp/nmap.log
2020
$(MAKE) kill
2121
# If the ciphers are as expected, we get exit code 0.
22-
diff fv/expected-nmap.log tmp/nmap.log
22+
diff -u fv/expected-nmap.log tmp/nmap.log
2323

2424
bin/fips-test-build:
2525
$(call build_cgo_boring_binary, $(PACKAGE_NAME)/fv/main, $@)

crypto/fv/expected-nmap.log

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@ PORT STATE SERVICE
55
| ciphers:
66
| TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (secp256r1) - A
77
| TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (secp256r1) - A
8+
| TLS_RSA_WITH_AES_128_GCM_SHA256 (rsa 2048) - A
9+
| TLS_RSA_WITH_AES_256_GCM_SHA384 (rsa 2048) - A
810
| compressors:
911
| NULL
1012
| cipher preference: server
11-
| TLSv1.3:
12-
| ciphers:
13-
| TLS_AKE_WITH_AES_128_GCM_SHA256 (secp256r1) - A
14-
| TLS_AKE_WITH_AES_256_GCM_SHA384 (secp256r1) - A
15-
| cipher preference: server
1613
|_ least strength: A
1714

0 commit comments

Comments
 (0)