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 <filippo@golang.org>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Russ Cox <rsc@golang.org>
Reviewed-by: Roland Shoemaker <roland@golang.org>
This commit is contained in:
Russ Cox 2024-11-20 09:03:35 -05:00 committed by Gopher Robot
parent 7e4b8b87ca
commit 0d5c2fe3a1
7 changed files with 16 additions and 16 deletions

View file

@ -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

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

2
prf.go
View file

@ -7,7 +7,7 @@ package tls
import (
"crypto"
"crypto/hmac"
"crypto/internal/fips/tls12"
"crypto/internal/fips140/tls12"
"crypto/md5"
"crypto/sha1"
"crypto/sha256"