crypto/internal/fips: fix Avo generators

They needed their package names updated after packages were moved to
crypto/internal/fips. Also, mitigated mmcloughlin/avo#450 which would
require setting GOARCH=amd64 at generation time.

Change-Id: Ib903ef113ebb5a24844204f231f2507cea03a67e
Reviewed-on: https://go-review.googlesource.com/c/go/+/626075
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Russ Cox <rsc@golang.org>
Auto-Submit: Filippo Valsorda <filippo@golang.org>
Reviewed-by: David Chase <drchase@google.com>

diff --git a/src/crypto/internal/fips/sha256/_asm/sha256block_amd64_asm.go b/src/crypto/internal/fips/sha256/_asm/sha256block_amd64_asm.go
index 24256185bc2ab66c5fa79f69ef06b6a2d5526cab..3f5d5bdc23cc7f504d17655ea98b188a94bd1d8f 100644 (file)
--- a/src/crypto/internal/fips/sha256/_asm/sha256block_amd64_asm.go
+++ b/src/crypto/internal/fips/sha256/_asm/sha256block_amd64_asm.go
@@ -5,12 +5,14 @@
 package main
 
 import (
+       "os"
+
        . "github.com/mmcloughlin/avo/build"
        . "github.com/mmcloughlin/avo/operand"
        . "github.com/mmcloughlin/avo/reg"
 )
 
-//go:generate go run . -out ../sha256block_amd64.s -pkg sha256
+//go:generate go run . -out ../sha256block_amd64.s
 
 // SHA256 block routine. See sha256block.go for Go equivalent.
 //
@@ -53,7 +55,11 @@ import (
 // H7 = h + H7
 
 func main() {
-       Package("crypto/sha256")
+       // https://github.com/mmcloughlin/avo/issues/450
+       os.Setenv("GOOS", "linux")
+       os.Setenv("GOARCH", "amd64")
+
+       Package("crypto/internal/fips/sha256")
        ConstraintExpr("!purego")
        blockAMD64()
        blockAVX2()

diff --git a/src/crypto/internal/fips/sha256/sha256block_amd64.s b/src/crypto/internal/fips/sha256/sha256block_amd64.s
index 7d9ed5acea9d71a825395de7cf8bd4d59a54d134..ce0ad4f8877c56f66db8cb91246e96387655a066 100644 (file)
--- a/src/crypto/internal/fips/sha256/sha256block_amd64.s
+++ b/src/crypto/internal/fips/sha256/sha256block_amd64.s
@@ -1,4 +1,4 @@
-// Code generated by command: go run sha256block_amd64_asm.go -out ../sha256block_amd64.s -pkg sha256. DO NOT EDIT.
+// Code generated by command: go run sha256block_amd64_asm.go -out ../sha256block_amd64.s. DO NOT EDIT.
 
 //go:build !purego
 

diff --git a/src/crypto/internal/fips/sha3/_asm/keccakf_amd64_asm.go b/src/crypto/internal/fips/sha3/_asm/keccakf_amd64_asm.go
index 06e2db3a44c5669e79266bfa70ddb8173bcbb5e6..bdaafb72c5b0b643d9c054fb03569f5a5aaa3cd5 100644 (file)
--- a/src/crypto/internal/fips/sha3/_asm/keccakf_amd64_asm.go
+++ b/src/crypto/internal/fips/sha3/_asm/keccakf_amd64_asm.go
@@ -8,13 +8,15 @@
 package main
 
 import (
+       "os"
+
        . "github.com/mmcloughlin/avo/build"
        . "github.com/mmcloughlin/avo/operand"
        . "github.com/mmcloughlin/avo/reg"
        _ "golang.org/x/crypto/sha3"
 )
 
-//go:generate go run . -out ../keccakf_amd64.s -pkg sha3
+//go:generate go run . -out ../sha3_amd64.s
 
 // Round Constants for use in the ι step.
 var RoundConstants = [24]uint64{
@@ -100,7 +102,11 @@ const (
 )
 
 func main() {
-       Package("golang.org/x/crypto/sha3")
+       // https://github.com/mmcloughlin/avo/issues/450
+       os.Setenv("GOOS", "linux")
+       os.Setenv("GOARCH", "amd64")
+
+       Package("crypto/internal/fips/sha3")
        ConstraintExpr("!purego")
        keccakF1600()
        Generate()

diff --git a/src/crypto/internal/fips/sha3/sha3_amd64.s b/src/crypto/internal/fips/sha3/sha3_amd64.s
index 7f9a315157d485653c102cbae2f912b7269cc868..3137e2d6cfa1342ff843179eab4098e0ce9a307d 100644 (file)
--- a/src/crypto/internal/fips/sha3/sha3_amd64.s
+++ b/src/crypto/internal/fips/sha3/sha3_amd64.s
@@ -1,4 +1,4 @@
-// Code generated by command: go run keccakf_amd64_asm.go -out ../keccakf_amd64.s -pkg sha3. DO NOT EDIT.
+// Code generated by command: go run keccakf_amd64_asm.go -out ../sha3_amd64.s. DO NOT EDIT.
 
 //go:build !purego
 

diff --git a/src/crypto/internal/fips/sha512/_asm/sha512block_amd64_asm.go b/src/crypto/internal/fips/sha512/_asm/sha512block_amd64_asm.go
index c0959714d01caa275673a6696859743f0b99a259..fa540d0f2d57116f430c0cd7c9f4cd2a003429e5 100644 (file)
--- a/src/crypto/internal/fips/sha512/_asm/sha512block_amd64_asm.go
+++ b/src/crypto/internal/fips/sha512/_asm/sha512block_amd64_asm.go
@@ -5,12 +5,14 @@
 package main
 
 import (
+       "os"
+
        . "github.com/mmcloughlin/avo/build"
        . "github.com/mmcloughlin/avo/operand"
        . "github.com/mmcloughlin/avo/reg"
 )
 
-//go:generate go run . -out ../sha512block_amd64.s -pkg sha512
+//go:generate go run . -out ../sha512block_amd64.s
 
 // SHA512 block routine. See sha512block.go for Go equivalent.
 //
@@ -138,7 +140,11 @@ var _K = []uint64{
 }
 
 func main() {
-       Package("crypto/sha512")
+       // https://github.com/mmcloughlin/avo/issues/450
+       os.Setenv("GOOS", "linux")
+       os.Setenv("GOARCH", "amd64")
+
+       Package("crypto/internal/fips/sha512")
        ConstraintExpr("!purego")
        blockAMD64()
        blockAVX2()

diff --git a/src/crypto/internal/fips/sha512/sha512block_amd64.s b/src/crypto/internal/fips/sha512/sha512block_amd64.s
index ffccdf229feff1f2d03c17393f1df0bbe77f0222..534563ee1410e9c53fa44a48afcd5cedf2b046bd 100644 (file)
--- a/src/crypto/internal/fips/sha512/sha512block_amd64.s
+++ b/src/crypto/internal/fips/sha512/sha512block_amd64.s
@@ -1,4 +1,4 @@
-// Code generated by command: go run sha512block_amd64_asm.go -out ../sha512block_amd64.s -pkg sha512. DO NOT EDIT.
+// Code generated by command: go run sha512block_amd64_asm.go -out ../sha512block_amd64.s. DO NOT EDIT.
 
 //go:build !purego