From 03f7e4e57735fd598c8e119e031369bfa69cee87 Mon Sep 17 00:00:00 2001
From: Joe Tsai <joetsai@digital-static.net>
Date: Tue, 16 Aug 2022 13:15:33 -0700
Subject: [PATCH] util/hashx: move from sha256x (#5388)

---
 cmd/tailscaled/depaware.txt                             | 2 +-
 util/deephash/deephash.go                               | 2 +-
 util/{sha256x/sha256.go => hashx/block512.go}           | 0
 util/{sha256x/sha256_test.go => hashx/block512_test.go} | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename util/{sha256x/sha256.go => hashx/block512.go} (100%)
 rename util/{sha256x/sha256_test.go => hashx/block512_test.go} (100%)

diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt
index a2e9dae13..e035198df 100644
--- a/cmd/tailscaled/depaware.txt
+++ b/cmd/tailscaled/depaware.txt
@@ -273,13 +273,13 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
         tailscale.com/util/dnsname                                   from tailscale.com/hostinfo+
   LW    tailscale.com/util/endian                                    from tailscale.com/net/dns+
         tailscale.com/util/groupmember                               from tailscale.com/ipn/ipnserver
+     💣 tailscale.com/util/hashx                                     from tailscale.com/util/deephash
         tailscale.com/util/lineread                                  from tailscale.com/hostinfo+
         tailscale.com/util/mak                                       from tailscale.com/control/controlclient+
         tailscale.com/util/multierr                                  from tailscale.com/control/controlclient+
         tailscale.com/util/osshare                                   from tailscale.com/ipn/ipnlocal+
         tailscale.com/util/pidowner                                  from tailscale.com/ipn/ipnserver
         tailscale.com/util/racebuild                                 from tailscale.com/logpolicy
-     💣 tailscale.com/util/sha256x                                   from tailscale.com/util/deephash
         tailscale.com/util/singleflight                              from tailscale.com/control/controlclient+
    L    tailscale.com/util/strs                                      from tailscale.com/hostinfo
         tailscale.com/util/systemd                                   from tailscale.com/control/controlclient+
diff --git a/util/deephash/deephash.go b/util/deephash/deephash.go
index 0d370dc2b..e652d2665 100644
--- a/util/deephash/deephash.go
+++ b/util/deephash/deephash.go
@@ -34,7 +34,7 @@ import (
 	"time"
 	"unsafe"
 
-	hashx "tailscale.com/util/sha256x"
+	"tailscale.com/util/hashx"
 )
 
 // There is much overlap between the theory of serialization and hashing.
diff --git a/util/sha256x/sha256.go b/util/hashx/block512.go
similarity index 100%
rename from util/sha256x/sha256.go
rename to util/hashx/block512.go
diff --git a/util/sha256x/sha256_test.go b/util/hashx/block512_test.go
similarity index 100%
rename from util/sha256x/sha256_test.go
rename to util/hashx/block512_test.go