From 0d5c2fe3a17debafa0fff48fa754ebb6b45ac9c0 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 20 Nov 2024 09:03:35 -0500 Subject: [PATCH] all: rename crypto/internal/fips to crypto/internal/fips140 Sometimes we've used the 140 suffix (GOFIPS140, crypto/fips140) and sometimes not (crypto/internal/fips, cmd/go/internal/fips). Use it always, to avoid having to remember which is which. Also, there are other FIPS standards, like AES (FIPS 197), SHA-2 (FIPS 180), and so on, which have nothing to do with FIPS 140. Best to be clear. For #70123. Change-Id: I33b29dabd9e8b2703d2af25e428f88bc81c7c307 Reviewed-on: https://go-review.googlesource.com/c/go/+/630115 Reviewed-by: Filippo Valsorda LUCI-TryBot-Result: Go LUCI Auto-Submit: Russ Cox Reviewed-by: Roland Shoemaker --- cipher_suites.go | 6 +++--- handshake_client.go | 4 ++-- handshake_client_tls13.go | 6 +++--- handshake_server_tls13.go | 4 ++-- key_schedule.go | 6 +++--- key_schedule_test.go | 4 ++-- prf.go | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cipher_suites.go b/cipher_suites.go index 1c849e3..9e831a9 100644 --- a/cipher_suites.go +++ b/cipher_suites.go @@ -11,8 +11,8 @@ import ( "crypto/des" "crypto/hmac" "crypto/internal/boring" - fipsaes "crypto/internal/fips/aes" - "crypto/internal/fips/aes/gcm" + fipsaes "crypto/internal/fips140/aes" + "crypto/internal/fips140/aes/gcm" "crypto/rc4" "crypto/sha1" "crypto/sha256" @@ -367,7 +367,7 @@ var tdesCiphers = map[uint16]bool{ } var ( - // Keep in sync with crypto/internal/fips/aes/gcm.supportsAESGCM. + // Keep in sync with crypto/internal/fips140/aes/gcm.supportsAESGCM. hasGCMAsmAMD64 = cpu.X86.HasAES && cpu.X86.HasPCLMULQDQ && cpu.X86.HasSSE41 && cpu.X86.HasSSSE3 hasGCMAsmARM64 = cpu.ARM64.HasAES && cpu.ARM64.HasPMULL hasGCMAsmS390X = cpu.S390X.HasAES && cpu.S390X.HasAESCTR && cpu.S390X.HasGHASH diff --git a/handshake_client.go b/handshake_client.go index ea9c4c5..3926ebd 100644 --- a/handshake_client.go +++ b/handshake_client.go @@ -10,8 +10,8 @@ import ( "crypto" "crypto/ecdsa" "crypto/ed25519" - "crypto/internal/fips/mlkem" - "crypto/internal/fips/tls13" + "crypto/internal/fips140/mlkem" + "crypto/internal/fips140/tls13" "crypto/internal/hpke" "crypto/rsa" "crypto/subtle" diff --git a/handshake_client_tls13.go b/handshake_client_tls13.go index 6ce83b9..53f1665 100644 --- a/handshake_client_tls13.go +++ b/handshake_client_tls13.go @@ -9,9 +9,9 @@ import ( "context" "crypto" "crypto/hmac" - "crypto/internal/fips/hkdf" - "crypto/internal/fips/mlkem" - "crypto/internal/fips/tls13" + "crypto/internal/fips140/hkdf" + "crypto/internal/fips140/mlkem" + "crypto/internal/fips140/tls13" "crypto/rsa" "crypto/subtle" "errors" diff --git a/handshake_server_tls13.go b/handshake_server_tls13.go index aa1ffd9..90c0320 100644 --- a/handshake_server_tls13.go +++ b/handshake_server_tls13.go @@ -9,8 +9,8 @@ import ( "context" "crypto" "crypto/hmac" - "crypto/internal/fips/mlkem" - "crypto/internal/fips/tls13" + "crypto/internal/fips140/mlkem" + "crypto/internal/fips140/tls13" "crypto/rsa" "errors" "hash" diff --git a/key_schedule.go b/key_schedule.go index 99229ea..60527b0 100644 --- a/key_schedule.go +++ b/key_schedule.go @@ -7,9 +7,9 @@ package tls import ( "crypto/ecdh" "crypto/hmac" - "crypto/internal/fips/mlkem" - "crypto/internal/fips/sha3" - "crypto/internal/fips/tls13" + "crypto/internal/fips140/mlkem" + "crypto/internal/fips140/sha3" + "crypto/internal/fips140/tls13" "errors" "hash" "io" diff --git a/key_schedule_test.go b/key_schedule_test.go index 0dc3601..f96b14c 100644 --- a/key_schedule_test.go +++ b/key_schedule_test.go @@ -6,8 +6,8 @@ package tls import ( "bytes" - "crypto/internal/fips/mlkem" - "crypto/internal/fips/tls13" + "crypto/internal/fips140/mlkem" + "crypto/internal/fips140/tls13" "crypto/sha256" "encoding/hex" "strings" diff --git a/prf.go b/prf.go index c306ca4..e736954 100644 --- a/prf.go +++ b/prf.go @@ -7,7 +7,7 @@ package tls import ( "crypto" "crypto/hmac" - "crypto/internal/fips/tls12" + "crypto/internal/fips140/tls12" "crypto/md5" "crypto/sha1" "crypto/sha256"