crypto/elliptic/internal/nistec: move to crypto/internal/nistec

So it's reachable from crypto/ecdsa and the upcoming crypto/ecdh.

No code changes.

For #52182

Change-Id: Ie3216052f46c6ef7ec64d8b87a233a9c50c4b16a
Reviewed-on: https://go-review.googlesource.com/c/go/+/398674
Run-TryBot: Filippo Valsorda <filippo@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: David Chase <drchase@google.com>
Reviewed-by: Roland Shoemaker <roland@golang.org>

diff --git a/src/cmd/compile/internal/ssa/stmtlines_test.go b/src/cmd/compile/internal/ssa/stmtlines_test.go
index 088f9802e6484f849667b54f2edea84863f8cbdb..a94ff9c99462756d117627fb3306babaf91d04c8 100644 (file)
--- a/src/cmd/compile/internal/ssa/stmtlines_test.go
+++ b/src/cmd/compile/internal/ssa/stmtlines_test.go
@@ -89,7 +89,7 @@ func TestStmtLines(t *testing.T) {
                if pkgname == "runtime" {
                        continue
                }
-               if pkgname == "crypto/elliptic/internal/fiat" {
+               if pkgname == "crypto/internal/nistec/fiat" {
                        continue // golang.org/issue/49372
                }
                if e.Val(dwarf.AttrStmtList) == nil {

diff --git a/src/crypto/elliptic/nistec.go b/src/crypto/elliptic/nistec.go
index 60d58720f3e4188b4e7eb417818bb6884057d530..9bb46008b5a81adf53e0c89d9069c68edd54cfda 100644 (file)
--- a/src/crypto/elliptic/nistec.go
+++ b/src/crypto/elliptic/nistec.go
@@ -5,7 +5,7 @@
 package elliptic
 
 import (
-       "crypto/elliptic/internal/nistec"
+       "crypto/internal/nistec"
        "errors"
        "math/big"
 )

diff --git a/src/crypto/elliptic/nistec_p256.go b/src/crypto/elliptic/nistec_p256.go
index 205aaa12c7ee4233f77bf5d7371ad38b6cc96572..304f8f2659c0006ba8b4bde11e43da2120f528df 100644 (file)
--- a/src/crypto/elliptic/nistec_p256.go
+++ b/src/crypto/elliptic/nistec_p256.go
@@ -7,7 +7,7 @@
 package elliptic
 
 import (
-       "crypto/elliptic/internal/nistec"
+       "crypto/internal/nistec"
        "math/big"
 )
 

diff --git a/src/crypto/elliptic/internal/fiat/Dockerfile b/src/crypto/internal/nistec/fiat/Dockerfile
similarity index 100%
rename from src/crypto/elliptic/internal/fiat/Dockerfile
rename to src/crypto/internal/nistec/fiat/Dockerfile

diff --git a/src/crypto/elliptic/internal/fiat/README b/src/crypto/internal/nistec/fiat/README
similarity index 100%
rename from src/crypto/elliptic/internal/fiat/README
rename to src/crypto/internal/nistec/fiat/README

diff --git a/src/crypto/elliptic/internal/fiat/fiat_test.go b/src/crypto/internal/nistec/fiat/fiat_test.go
similarity index 97%
rename from src/crypto/elliptic/internal/fiat/fiat_test.go
rename to src/crypto/internal/nistec/fiat/fiat_test.go
index 9ecd8637886bace87db99f5af7c380baaec1c5ed..dee9f68222989100f98c208b87bbeda28453b911 100644 (file)
--- a/src/crypto/elliptic/internal/fiat/fiat_test.go
+++ b/src/crypto/internal/nistec/fiat/fiat_test.go
@@ -5,7 +5,7 @@
 package fiat_test
 
 import (
-       "crypto/elliptic/internal/fiat"
+       "crypto/internal/nistec/fiat"
        "testing"
 )
 

diff --git a/src/crypto/elliptic/internal/fiat/generate.go b/src/crypto/internal/nistec/fiat/generate.go
similarity index 100%
rename from src/crypto/elliptic/internal/fiat/generate.go
rename to src/crypto/internal/nistec/fiat/generate.go

diff --git a/src/crypto/elliptic/internal/fiat/p224.go b/src/crypto/internal/nistec/fiat/p224.go
similarity index 100%
rename from src/crypto/elliptic/internal/fiat/p224.go
rename to src/crypto/internal/nistec/fiat/p224.go

diff --git a/src/crypto/elliptic/internal/fiat/p224_fiat64.go b/src/crypto/internal/nistec/fiat/p224_fiat64.go
similarity index 100%
rename from src/crypto/elliptic/internal/fiat/p224_fiat64.go
rename to src/crypto/internal/nistec/fiat/p224_fiat64.go

diff --git a/src/crypto/elliptic/internal/fiat/p224_invert.go b/src/crypto/internal/nistec/fiat/p224_invert.go
similarity index 100%
rename from src/crypto/elliptic/internal/fiat/p224_invert.go
rename to src/crypto/internal/nistec/fiat/p224_invert.go

diff --git a/src/crypto/elliptic/internal/fiat/p256.go b/src/crypto/internal/nistec/fiat/p256.go
similarity index 100%
rename from src/crypto/elliptic/internal/fiat/p256.go
rename to src/crypto/internal/nistec/fiat/p256.go

diff --git a/src/crypto/elliptic/internal/fiat/p256_fiat64.go b/src/crypto/internal/nistec/fiat/p256_fiat64.go
similarity index 100%
rename from src/crypto/elliptic/internal/fiat/p256_fiat64.go
rename to src/crypto/internal/nistec/fiat/p256_fiat64.go

diff --git a/src/crypto/elliptic/internal/fiat/p256_invert.go b/src/crypto/internal/nistec/fiat/p256_invert.go
similarity index 100%
rename from src/crypto/elliptic/internal/fiat/p256_invert.go
rename to src/crypto/internal/nistec/fiat/p256_invert.go

diff --git a/src/crypto/elliptic/internal/fiat/p384.go b/src/crypto/internal/nistec/fiat/p384.go
similarity index 100%
rename from src/crypto/elliptic/internal/fiat/p384.go
rename to src/crypto/internal/nistec/fiat/p384.go

diff --git a/src/crypto/elliptic/internal/fiat/p384_fiat64.go b/src/crypto/internal/nistec/fiat/p384_fiat64.go
similarity index 100%
rename from src/crypto/elliptic/internal/fiat/p384_fiat64.go
rename to src/crypto/internal/nistec/fiat/p384_fiat64.go

diff --git a/src/crypto/elliptic/internal/fiat/p384_invert.go b/src/crypto/internal/nistec/fiat/p384_invert.go
similarity index 100%
rename from src/crypto/elliptic/internal/fiat/p384_invert.go
rename to src/crypto/internal/nistec/fiat/p384_invert.go

diff --git a/src/crypto/elliptic/internal/fiat/p521.go b/src/crypto/internal/nistec/fiat/p521.go
similarity index 100%
rename from src/crypto/elliptic/internal/fiat/p521.go
rename to src/crypto/internal/nistec/fiat/p521.go

diff --git a/src/crypto/elliptic/internal/fiat/p521_fiat64.go b/src/crypto/internal/nistec/fiat/p521_fiat64.go
similarity index 100%
rename from src/crypto/elliptic/internal/fiat/p521_fiat64.go
rename to src/crypto/internal/nistec/fiat/p521_fiat64.go

diff --git a/src/crypto/elliptic/internal/fiat/p521_invert.go b/src/crypto/internal/nistec/fiat/p521_invert.go
similarity index 100%
rename from src/crypto/elliptic/internal/fiat/p521_invert.go
rename to src/crypto/internal/nistec/fiat/p521_invert.go

diff --git a/src/crypto/elliptic/internal/nistec/generate.go b/src/crypto/internal/nistec/generate.go
similarity index 99%
rename from src/crypto/elliptic/internal/nistec/generate.go
rename to src/crypto/internal/nistec/generate.go
index 30176cb8042969064ef98a96a9af7cbeab341bab..136af7db97e8f055c9b3f3904a1286fa3562ceb1 100644 (file)
--- a/src/crypto/elliptic/internal/nistec/generate.go
+++ b/src/crypto/internal/nistec/generate.go
@@ -151,7 +151,7 @@ const tmplNISTEC = `// Copyright 2022 The Go Authors. All rights reserved.
 package nistec
 
 import (
-       "crypto/elliptic/internal/fiat"
+       "crypto/internal/nistec/fiat"
        "crypto/subtle"
        "errors"
        "sync"

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

diff --git a/src/crypto/elliptic/internal/nistec/nistec_test.go b/src/crypto/internal/nistec/nistec_test.go
similarity index 99%
rename from src/crypto/elliptic/internal/nistec/nistec_test.go
rename to src/crypto/internal/nistec/nistec_test.go
index 410e6b0b6c513b035702257f88a38e6bf3d36b60..1903f19af3195a48ef605fafcd8c3ee0a6a8b9bc 100644 (file)
--- a/src/crypto/elliptic/internal/nistec/nistec_test.go
+++ b/src/crypto/internal/nistec/nistec_test.go
@@ -7,7 +7,7 @@ package nistec_test
 import (
        "bytes"
        "crypto/elliptic"
-       "crypto/elliptic/internal/nistec"
+       "crypto/internal/nistec"
        "math/big"
        "math/rand"
        "os"

diff --git a/src/crypto/elliptic/internal/nistec/p224.go b/src/crypto/internal/nistec/p224.go
similarity index 99%
rename from src/crypto/elliptic/internal/nistec/p224.go
rename to src/crypto/internal/nistec/p224.go
index 83963a4a69ec03c61ca488bf519228127defabf7..8d236b33d730e4ba42676d606cb915e7dedd912c 100644 (file)
--- a/src/crypto/elliptic/internal/nistec/p224.go
+++ b/src/crypto/internal/nistec/p224.go
@@ -7,7 +7,7 @@
 package nistec
 
 import (
-       "crypto/elliptic/internal/fiat"
+       "crypto/internal/nistec/fiat"
        "crypto/subtle"
        "errors"
        "sync"

diff --git a/src/crypto/elliptic/internal/nistec/p224_sqrt.go b/src/crypto/internal/nistec/p224_sqrt.go
similarity index 98%
rename from src/crypto/elliptic/internal/nistec/p224_sqrt.go
rename to src/crypto/internal/nistec/p224_sqrt.go
index 0c82b7b2e001f836a7aacfa7c0e5a7c76047258a..ac4d761bf555f4de82460fe1b0e113a132d3ce88 100644 (file)
--- a/src/crypto/elliptic/internal/nistec/p224_sqrt.go
+++ b/src/crypto/internal/nistec/p224_sqrt.go
@@ -5,7 +5,7 @@
 package nistec
 
 import (
-       "crypto/elliptic/internal/fiat"
+       "crypto/internal/nistec/fiat"
        "sync"
 )
 

diff --git a/src/crypto/elliptic/internal/nistec/p256.go b/src/crypto/internal/nistec/p256.go
similarity index 99%
rename from src/crypto/elliptic/internal/nistec/p256.go
rename to src/crypto/internal/nistec/p256.go
index 1b9305d0447d4598d360acb1eea2f9022f286f09..af6c76a0c7d42e0c6024599b8f18df742d8b98ce 100644 (file)
--- a/src/crypto/elliptic/internal/nistec/p256.go
+++ b/src/crypto/internal/nistec/p256.go
@@ -9,7 +9,7 @@
 package nistec
 
 import (
-       "crypto/elliptic/internal/fiat"
+       "crypto/internal/nistec/fiat"
        "crypto/subtle"
        "errors"
        "sync"

diff --git a/src/crypto/elliptic/internal/nistec/p256_asm.go b/src/crypto/internal/nistec/p256_asm.go
similarity index 100%
rename from src/crypto/elliptic/internal/nistec/p256_asm.go
rename to src/crypto/internal/nistec/p256_asm.go

diff --git a/src/crypto/elliptic/internal/nistec/p256_asm_amd64.s b/src/crypto/internal/nistec/p256_asm_amd64.s
similarity index 100%
rename from src/crypto/elliptic/internal/nistec/p256_asm_amd64.s
rename to src/crypto/internal/nistec/p256_asm_amd64.s

diff --git a/src/crypto/elliptic/internal/nistec/p256_asm_arm64.s b/src/crypto/internal/nistec/p256_asm_arm64.s
similarity index 100%
rename from src/crypto/elliptic/internal/nistec/p256_asm_arm64.s
rename to src/crypto/internal/nistec/p256_asm_arm64.s

diff --git a/src/crypto/elliptic/internal/nistec/p256_asm_ppc64le.s b/src/crypto/internal/nistec/p256_asm_ppc64le.s
similarity index 100%
rename from src/crypto/elliptic/internal/nistec/p256_asm_ppc64le.s
rename to src/crypto/internal/nistec/p256_asm_ppc64le.s

diff --git a/src/crypto/elliptic/internal/nistec/p256_asm_s390x.s b/src/crypto/internal/nistec/p256_asm_s390x.s
similarity index 100%
rename from src/crypto/elliptic/internal/nistec/p256_asm_s390x.s
rename to src/crypto/internal/nistec/p256_asm_s390x.s

diff --git a/src/crypto/elliptic/internal/nistec/p256_asm_table.bin b/src/crypto/internal/nistec/p256_asm_table.bin
similarity index 100%
rename from src/crypto/elliptic/internal/nistec/p256_asm_table.bin
rename to src/crypto/internal/nistec/p256_asm_table.bin

diff --git a/src/crypto/elliptic/internal/nistec/p256_asm_table_test.go b/src/crypto/internal/nistec/p256_asm_table_test.go
similarity index 100%
rename from src/crypto/elliptic/internal/nistec/p256_asm_table_test.go
rename to src/crypto/internal/nistec/p256_asm_table_test.go

diff --git a/src/crypto/elliptic/internal/nistec/p256_asm_test.go b/src/crypto/internal/nistec/p256_asm_test.go
similarity index 98%
rename from src/crypto/elliptic/internal/nistec/p256_asm_test.go
rename to src/crypto/internal/nistec/p256_asm_test.go
index 5d05561b703edd134507dc1717b2c0c4c0b5aaeb..72de6bd487d06e59cae4b2af21206f45539b35f0 100644 (file)
--- a/src/crypto/elliptic/internal/nistec/p256_asm_test.go
+++ b/src/crypto/internal/nistec/p256_asm_test.go
@@ -9,7 +9,7 @@ package nistec_test
 import (
        "bytes"
        "crypto/elliptic"
-       "crypto/elliptic/internal/nistec"
+       "crypto/internal/nistec"
        "math/big"
        "testing"
 )

diff --git a/src/crypto/elliptic/internal/nistec/p256_ppc64le.go b/src/crypto/internal/nistec/p256_ppc64le.go
similarity index 100%
rename from src/crypto/elliptic/internal/nistec/p256_ppc64le.go
rename to src/crypto/internal/nistec/p256_ppc64le.go

diff --git a/src/crypto/elliptic/internal/nistec/p256_s390x.go b/src/crypto/internal/nistec/p256_s390x.go
similarity index 100%
rename from src/crypto/elliptic/internal/nistec/p256_s390x.go
rename to src/crypto/internal/nistec/p256_s390x.go

diff --git a/src/crypto/elliptic/internal/nistec/p384.go b/src/crypto/internal/nistec/p384.go
similarity index 99%
rename from src/crypto/elliptic/internal/nistec/p384.go
rename to src/crypto/internal/nistec/p384.go
index 13fe74c534a263962f328aaef75cf10d67f178f0..1a855cb71337a7ececec0fea795231486b80887c 100644 (file)
--- a/src/crypto/elliptic/internal/nistec/p384.go
+++ b/src/crypto/internal/nistec/p384.go
@@ -7,7 +7,7 @@
 package nistec
 
 import (
-       "crypto/elliptic/internal/fiat"
+       "crypto/internal/nistec/fiat"
        "crypto/subtle"
        "errors"
        "sync"

diff --git a/src/crypto/elliptic/internal/nistec/p521.go b/src/crypto/internal/nistec/p521.go
similarity index 99%
rename from src/crypto/elliptic/internal/nistec/p521.go
rename to src/crypto/internal/nistec/p521.go
index 942089400425e6fe55b9e0f5da601c73eb6aee89..f285d575763b34bdb48c8ae08f10454a6e13e5c2 100644 (file)
--- a/src/crypto/elliptic/internal/nistec/p521.go
+++ b/src/crypto/internal/nistec/p521.go
@@ -7,7 +7,7 @@
 package nistec
 
 import (
-       "crypto/elliptic/internal/fiat"
+       "crypto/internal/nistec/fiat"
        "crypto/subtle"
        "errors"
        "sync"

diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index f331660bfc4a9db35fcf1257b4ba33a2f854b079..f6d41dd28fd729212d10d436b891d783c018ee9d 100644 (file)
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -406,8 +406,8 @@ var depsRules = `
        < crypto
        < crypto/subtle
        < crypto/internal/subtle
-       < crypto/elliptic/internal/fiat
-       < crypto/elliptic/internal/nistec
+       < crypto/internal/nistec/fiat
+       < crypto/internal/nistec
        < crypto/ed25519/internal/edwards25519/field, golang.org/x/crypto/curve25519/internal/field
        < crypto/ed25519/internal/edwards25519
        < crypto/cipher