From: Filippo Valsorda <hi@filippo.io>
Date: Fri, 25 May 2018 22:06:52 +0000 (-0400)
Subject: [dev.boringcrypto] all: merge master into dev.boringcrypto
X-Git-Tag: go1.19beta1~484^2~146
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3d9a6ac709dd1c63c049300bf924c6eefa84eaf4;p=gostls13.git

[dev.boringcrypto] all: merge master into dev.boringcrypto

Conflicts due to crypto/internal/cipherhw removal:
	src/crypto/aes/cipher_amd64.go
	src/crypto/internal/cipherhw/cipherhw_amd64.go
	src/go/build/deps_test.go

This removes the AESGCMSupport patch, as there is no equivalent place
for it. The logic will be added back in the next change.

Change-Id: I8169069ff732b6cd0b56279c073cf5e0dd36959d
---

3d9a6ac709dd1c63c049300bf924c6eefa84eaf4
diff --cc src/crypto/aes/cipher_amd64.go
index fcdebabb33,4b3b877cd7..7efab31065
--- a/src/crypto/aes/cipher_amd64.go
+++ b/src/crypto/aes/cipher_amd64.go
@@@ -6,8 -6,7 +6,8 @@@ package ae
  
  import (
  	"crypto/cipher"
 +	"crypto/internal/boring"
- 	"crypto/internal/cipherhw"
+ 	"internal/cpu"
  )
  
  // defined in asm_amd64.s
diff --cc src/go/build/deps_test.go
index f3782f8a89,9aebd7327a..33a269a62e
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@@ -125,9 -120,6 +125,8 @@@ var pkgDeps = map[string][]string
  		"L2",
  		"crypto",
  		"crypto/cipher",
 +		"crypto/internal/boring",
 +		"crypto/internal/boring/fipstls",
- 		"crypto/internal/cipherhw",
  		"crypto/subtle",
  		"encoding/base32",
  		"encoding/base64",
@@@ -237,49 -229,49 +236,49 @@@
  	"go/types":                  {"L4", "GOPARSER", "container/heap", "go/constant"},
  
  	// One of a kind.
--	"archive/tar":                    {"L4", "OS", "syscall", "os/user"},
--	"archive/zip":                    {"L4", "OS", "compress/flate"},
--	"container/heap":                 {"sort"},
--	"compress/bzip2":                 {"L4"},
--	"compress/flate":                 {"L4"},
--	"compress/gzip":                  {"L4", "compress/flate"},
--	"compress/lzw":                   {"L4"},
--	"compress/zlib":                  {"L4", "compress/flate"},
--	"context":                        {"errors", "fmt", "reflect", "sync", "time"},
--	"database/sql":                   {"L4", "container/list", "context", "database/sql/driver", "database/sql/internal"},
--	"database/sql/driver":            {"L4", "context", "time", "database/sql/internal"},
--	"debug/dwarf":                    {"L4"},
--	"debug/elf":                      {"L4", "OS", "debug/dwarf", "compress/zlib"},
--	"debug/gosym":                    {"L4"},
--	"debug/macho":                    {"L4", "OS", "debug/dwarf"},
--	"debug/pe":                       {"L4", "OS", "debug/dwarf"},
--	"debug/plan9obj":                 {"L4", "OS"},
--	"encoding":                       {"L4"},
--	"encoding/ascii85":               {"L4"},
--	"encoding/asn1":                  {"L4", "math/big"},
--	"encoding/csv":                   {"L4"},
--	"encoding/gob":                   {"L4", "OS", "encoding"},
--	"encoding/hex":                   {"L4"},
--	"encoding/json":                  {"L4", "encoding"},
--	"encoding/pem":                   {"L4"},
--	"encoding/xml":                   {"L4", "encoding"},
--	"flag":                           {"L4", "OS"},
--	"go/build":                       {"L4", "OS", "GOPARSER"},
--	"html":                           {"L4"},
--	"image/draw":                     {"L4", "image/internal/imageutil"},
--	"image/gif":                      {"L4", "compress/lzw", "image/color/palette", "image/draw"},
--	"image/internal/imageutil":       {"L4"},
--	"image/jpeg":                     {"L4", "image/internal/imageutil"},
--	"image/png":                      {"L4", "compress/zlib"},
--	"index/suffixarray":              {"L4", "regexp"},
--	"internal/singleflight":          {"sync"},
--	"internal/trace":                 {"L4", "OS"},
--	"math/big":                       {"L4"},
--	"mime":                           {"L4", "OS", "syscall", "internal/syscall/windows/registry"},
--	"mime/quotedprintable":           {"L4"},
--	"net/internal/socktest":          {"L4", "OS", "syscall", "internal/syscall/windows"},
--	"net/url":                        {"L4"},
--	"plugin":                         {"L0", "OS", "CGO"},
++	"archive/tar":              {"L4", "OS", "syscall", "os/user"},
++	"archive/zip":              {"L4", "OS", "compress/flate"},
++	"container/heap":           {"sort"},
++	"compress/bzip2":           {"L4"},
++	"compress/flate":           {"L4"},
++	"compress/gzip":            {"L4", "compress/flate"},
++	"compress/lzw":             {"L4"},
++	"compress/zlib":            {"L4", "compress/flate"},
++	"context":                  {"errors", "fmt", "reflect", "sync", "time"},
++	"database/sql":             {"L4", "container/list", "context", "database/sql/driver", "database/sql/internal"},
++	"database/sql/driver":      {"L4", "context", "time", "database/sql/internal"},
++	"debug/dwarf":              {"L4"},
++	"debug/elf":                {"L4", "OS", "debug/dwarf", "compress/zlib"},
++	"debug/gosym":              {"L4"},
++	"debug/macho":              {"L4", "OS", "debug/dwarf"},
++	"debug/pe":                 {"L4", "OS", "debug/dwarf"},
++	"debug/plan9obj":           {"L4", "OS"},
++	"encoding":                 {"L4"},
++	"encoding/ascii85":         {"L4"},
++	"encoding/asn1":            {"L4", "math/big"},
++	"encoding/csv":             {"L4"},
++	"encoding/gob":             {"L4", "OS", "encoding"},
++	"encoding/hex":             {"L4"},
++	"encoding/json":            {"L4", "encoding"},
++	"encoding/pem":             {"L4"},
++	"encoding/xml":             {"L4", "encoding"},
++	"flag":                     {"L4", "OS"},
++	"go/build":                 {"L4", "OS", "GOPARSER"},
++	"html":                     {"L4"},
++	"image/draw":               {"L4", "image/internal/imageutil"},
++	"image/gif":                {"L4", "compress/lzw", "image/color/palette", "image/draw"},
++	"image/internal/imageutil": {"L4"},
++	"image/jpeg":               {"L4", "image/internal/imageutil"},
++	"image/png":                {"L4", "compress/zlib"},
++	"index/suffixarray":        {"L4", "regexp"},
++	"internal/singleflight":    {"sync"},
++	"internal/trace":           {"L4", "OS"},
++	"math/big":                 {"L4"},
++	"mime":                     {"L4", "OS", "syscall", "internal/syscall/windows/registry"},
++	"mime/quotedprintable":     {"L4"},
++	"net/internal/socktest":    {"L4", "OS", "syscall", "internal/syscall/windows"},
++	"net/url":                  {"L4"},
++	"plugin":                   {"L0", "OS", "CGO"},
  	"runtime/pprof/internal/profile": {"L4", "OS", "compress/gzip", "regexp"},
  	"testing/internal/testdeps":      {"L4", "internal/testlog", "runtime/pprof", "regexp"},
  	"text/scanner":                   {"L4", "OS"},