crypto/internal/alias: move to crypto/internal/fips/alias

For #69536

Change-Id: Id0bb46fbb39c205ebc903e72e706bbbaaeec6dbd
Reviewed-on: https://go-review.googlesource.com/c/go/+/622275
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Daniel McCarney <daniel@binaryparadox.net>
Reviewed-by: Roland Shoemaker <roland@golang.org>

diff --git a/src/crypto/aes/aes_gcm.go b/src/crypto/aes/aes_gcm.go
index d9a9545f120f7604863432e3d23c9298d9197635..c1de6bfb3d907650a27154777a46909750d3cc79 100644 (file)
--- a/src/crypto/aes/aes_gcm.go
+++ b/src/crypto/aes/aes_gcm.go
@@ -8,7 +8,7 @@ package aes
 
 import (
        "crypto/cipher"
-       "crypto/internal/alias"
+       "crypto/internal/fips/alias"
        "crypto/subtle"
        "errors"
 )

diff --git a/src/crypto/aes/cbc_ppc64x.go b/src/crypto/aes/cbc_ppc64x.go
index d5b491e8e1fe5bb95bcc2cac4110fce451477641..6311a115f7a3621c5035504da6cae909f2114170 100644 (file)
--- a/src/crypto/aes/cbc_ppc64x.go
+++ b/src/crypto/aes/cbc_ppc64x.go
@@ -8,7 +8,7 @@ package aes
 
 import (
        "crypto/cipher"
-       "crypto/internal/alias"
+       "crypto/internal/fips/alias"
 )
 
 // Assert that aesCipherAsm implements the cbcEncAble and cbcDecAble interfaces.

diff --git a/src/crypto/aes/cbc_s390x.go b/src/crypto/aes/cbc_s390x.go
index 09c19ff394793a0a520cd109672816f8b1403fe2..3cc531e50ba6fd15291fa617be1fa0a2d6bef113 100644 (file)
--- a/src/crypto/aes/cbc_s390x.go
+++ b/src/crypto/aes/cbc_s390x.go
@@ -8,7 +8,7 @@ package aes
 
 import (
        "crypto/cipher"
-       "crypto/internal/alias"
+       "crypto/internal/fips/alias"
 )
 
 // Assert that aesCipherAsm implements the cbcEncAble and cbcDecAble interfaces.

diff --git a/src/crypto/aes/cipher.go b/src/crypto/aes/cipher.go
index cde2e45d2ca55962c9a1b58694ea0b6c7b1a37e7..c9a76252155a3e16644c24cbc5e779389a6e8cf4 100644 (file)
--- a/src/crypto/aes/cipher.go
+++ b/src/crypto/aes/cipher.go
@@ -6,8 +6,8 @@ package aes
 
 import (
        "crypto/cipher"
-       "crypto/internal/alias"
        "crypto/internal/boring"
+       "crypto/internal/fips/alias"
        "strconv"
 )
 

diff --git a/src/crypto/aes/cipher_asm.go b/src/crypto/aes/cipher_asm.go
index 3e5f589c2cdd0b50b1010ad27fe3d87c573b3f38..84f8e91f6fefb2f2ecfd3320d18cd0837e612860 100644 (file)
--- a/src/crypto/aes/cipher_asm.go
+++ b/src/crypto/aes/cipher_asm.go
@@ -8,8 +8,8 @@ package aes
 
 import (
        "crypto/cipher"
-       "crypto/internal/alias"
        "crypto/internal/boring"
+       "crypto/internal/fips/alias"
        "internal/cpu"
        "internal/goarch"
 )

diff --git a/src/crypto/aes/cipher_s390x.go b/src/crypto/aes/cipher_s390x.go
index 1541890deab7fa2ccffdf587333935640dd0d255..08de1caa114951321f1172fb8dee4d247e5445d8 100644 (file)
--- a/src/crypto/aes/cipher_s390x.go
+++ b/src/crypto/aes/cipher_s390x.go
@@ -8,7 +8,7 @@ package aes
 
 import (
        "crypto/cipher"
-       "crypto/internal/alias"
+       "crypto/internal/fips/alias"
        "internal/cpu"
 )
 

diff --git a/src/crypto/aes/ctr_s390x.go b/src/crypto/aes/ctr_s390x.go
index 56b82d58859cacd5e4b6d1e43a5e0607aeed80db..df335dcea30cc27574ac23b94073ddbebbffcde2 100644 (file)
--- a/src/crypto/aes/ctr_s390x.go
+++ b/src/crypto/aes/ctr_s390x.go
@@ -8,7 +8,7 @@ package aes
 
 import (
        "crypto/cipher"
-       "crypto/internal/alias"
+       "crypto/internal/fips/alias"
        "internal/byteorder"
 )
 

diff --git a/src/crypto/aes/gcm_ppc64x.go b/src/crypto/aes/gcm_ppc64x.go
index e3fa48ed8d135cf3ac3ac7cd576f4d1427172903..d9aa5cf0ea6ae5ba8de21271f2196206a03274fe 100644 (file)
--- a/src/crypto/aes/gcm_ppc64x.go
+++ b/src/crypto/aes/gcm_ppc64x.go
@@ -8,7 +8,7 @@ package aes
 
 import (
        "crypto/cipher"
-       "crypto/internal/alias"
+       "crypto/internal/fips/alias"
        "crypto/subtle"
        "errors"
        "internal/byteorder"

diff --git a/src/crypto/aes/gcm_s390x.go b/src/crypto/aes/gcm_s390x.go
index 492ae5d83b48554004db1e7d7eb22f700852ee3a..8524cbb51c2efd54a8352ebf62238b82e554a23e 100644 (file)
--- a/src/crypto/aes/gcm_s390x.go
+++ b/src/crypto/aes/gcm_s390x.go
@@ -8,7 +8,7 @@ package aes
 
 import (
        "crypto/cipher"
-       "crypto/internal/alias"
+       "crypto/internal/fips/alias"
        "crypto/subtle"
        "errors"
        "internal/byteorder"

diff --git a/src/crypto/cipher/cbc.go b/src/crypto/cipher/cbc.go
index 51a142071f8c54b64048be9607117890fe00eafc..61a6b7a39693165d179ec04bdadf6789913db10c 100644 (file)
--- a/src/crypto/cipher/cbc.go
+++ b/src/crypto/cipher/cbc.go
@@ -13,7 +13,7 @@ package cipher
 
 import (
        "bytes"
-       "crypto/internal/alias"
+       "crypto/internal/fips/alias"
        "crypto/subtle"
 )
 

diff --git a/src/crypto/cipher/cfb.go b/src/crypto/cipher/cfb.go
index 7e3f9695b7fcf2607fbcf489b6002f82ff4f3b93..7a18f1c2313e54d23d8e5522de08d3bf1a898fcd 100644 (file)
--- a/src/crypto/cipher/cfb.go
+++ b/src/crypto/cipher/cfb.go
@@ -7,7 +7,7 @@
 package cipher
 
 import (
-       "crypto/internal/alias"
+       "crypto/internal/fips/alias"
        "crypto/subtle"
 )
 

diff --git a/src/crypto/cipher/ctr.go b/src/crypto/cipher/ctr.go
index eac8e266cf75912d98a55199dc5820b4f6e473d3..8974bf3d88bd6b1c6cef7a34ec13e02ff87d9746 100644 (file)
--- a/src/crypto/cipher/ctr.go
+++ b/src/crypto/cipher/ctr.go
@@ -14,7 +14,7 @@ package cipher
 
 import (
        "bytes"
-       "crypto/internal/alias"
+       "crypto/internal/fips/alias"
        "crypto/subtle"
 )
 

diff --git a/src/crypto/cipher/gcm.go b/src/crypto/cipher/gcm.go
index 9b86b06c98084f388227b859e607e20457aa510c..ec5090b326938a5f48a86911f5b5e7d227f97587 100644 (file)
--- a/src/crypto/cipher/gcm.go
+++ b/src/crypto/cipher/gcm.go
@@ -5,7 +5,7 @@
 package cipher
 
 import (
-       "crypto/internal/alias"
+       "crypto/internal/fips/alias"
        "crypto/subtle"
        "errors"
        "internal/byteorder"

diff --git a/src/crypto/cipher/ofb.go b/src/crypto/cipher/ofb.go
index bdfc977d5e19697f502b085a04c062cf7880cfe9..339864f4e2882aec2cc317e9d9bb95a015236a5e 100644 (file)
--- a/src/crypto/cipher/ofb.go
+++ b/src/crypto/cipher/ofb.go
@@ -7,7 +7,7 @@
 package cipher
 
 import (
-       "crypto/internal/alias"
+       "crypto/internal/fips/alias"
        "crypto/subtle"
 )
 

diff --git a/src/crypto/des/cipher.go b/src/crypto/des/cipher.go
index 04b73e7d3bf758391902769b6eab1b2000cc0b09..361b9621fe20c4f9294f8946e17d5455e0c431d2 100644 (file)
--- a/src/crypto/des/cipher.go
+++ b/src/crypto/des/cipher.go
@@ -6,7 +6,7 @@ package des
 
 import (
        "crypto/cipher"
-       "crypto/internal/alias"
+       "crypto/internal/fips/alias"
        "internal/byteorder"
        "strconv"
 )

diff --git a/src/crypto/internal/alias/alias.go b/src/crypto/internal/fips/alias/alias.go
similarity index 100%
rename from src/crypto/internal/alias/alias.go
rename to src/crypto/internal/fips/alias/alias.go

diff --git a/src/crypto/internal/alias/alias_test.go b/src/crypto/internal/fips/alias/alias_test.go
similarity index 100%
rename from src/crypto/internal/alias/alias_test.go
rename to src/crypto/internal/fips/alias/alias_test.go

diff --git a/src/crypto/rc4/rc4.go b/src/crypto/rc4/rc4.go
index 67452ec39f0fd42d7697d3e07e9e5f6f3c0b6a0b..4c6bab168168074d9c9e46784473c4cee77c2983 100644 (file)
--- a/src/crypto/rc4/rc4.go
+++ b/src/crypto/rc4/rc4.go
@@ -10,7 +10,7 @@
 package rc4
 
 import (
-       "crypto/internal/alias"
+       "crypto/internal/fips/alias"
        "strconv"
 )
 

diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index bb2bfba6e4f32a35f0a9bbfca31d07bf4e5938f0..d8992f8bb8ea65f0dc6792a2d15170e29f817197 100644 (file)
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -452,6 +452,7 @@ var depsRules = `
        # backwards compatibility with older versions of the module.
        STR, crypto/internal/impl
        < crypto/internal/fips
+       < crypto/internal/fips/alias
        < crypto/internal/fips/subtle
        < crypto/internal/fips/sha256
        < crypto/internal/fips/sha512
@@ -474,7 +475,6 @@ var depsRules = `
        hash, embed
        < crypto
        < crypto/subtle
-       < crypto/internal/alias
        < crypto/cipher;
 
        crypto/cipher,
@@ -482,7 +482,8 @@ var depsRules = `
        < crypto/internal/boring
        < crypto/boring;
 
-       crypto/internal/alias, math/rand/v2
+       crypto/internal/fips/alias, math/rand/v2,
+       crypto/subtle, embed
        < crypto/internal/randutil
        < crypto/internal/nistec/fiat
        < crypto/internal/nistec

diff --git a/src/slices/slices.go b/src/slices/slices.go
index f53c93be52d9aa34ac199133b30cbaed33c2d594..13e41ae0d807b595395acd882e5e16dd4543405b 100644 (file)
--- a/src/slices/slices.go
+++ b/src/slices/slices.go
@@ -449,7 +449,7 @@ func overlaps[E any](a, b []E) bool {
                return false
        }
        // TODO: use a runtime/unsafe facility once one becomes available. See issue 12445.
-       // Also see crypto/internal/alias/alias.go:AnyOverlap
+       // Also see crypto/internal/fips/alias/alias.go:AnyOverlap
        return uintptr(unsafe.Pointer(&a[0])) <= uintptr(unsafe.Pointer(&b[len(b)-1]))+(elemSize-1) &&
                uintptr(unsafe.Pointer(&b[0])) <= uintptr(unsafe.Pointer(&a[len(a)-1]))+(elemSize-1)
 }