From 091cef63014a798ffdf352f41c03b306e472216c Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Thu, 23 Mar 2023 13:20:20 +0300
Subject: [PATCH] Use bytes.Equal() instead of bytes.Compare()==0

---
 integrity.go | 2 +-
 main.go      | 2 +-
 refresh.go   | 6 +++---
 upload.go    | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/integrity.go b/integrity.go
index 24f14aa..26fe6a4 100644
--- a/integrity.go
+++ b/integrity.go
@@ -52,7 +52,7 @@ func checkFile(
 	if err != nil {
 		log.Fatal(err)
 	}
-	isEqual := bytes.Compare(hasher.Sum(digest[:0]), expected) == 0
+	isEqual := bytes.Equal(hasher.Sum(digest[:0]), expected)
 	hasher.Reset()
 	if isEqual {
 		fmt.Println("GOOD", hasherName, pkgName)
diff --git a/main.go b/main.go
index cc5944e..e0670d7 100644
--- a/main.go
+++ b/main.go
@@ -236,7 +236,7 @@ func main() {
 		tlsConfig.VerifyConnection = func(s tls.ConnectionState) error {
 			spki := s.VerifiedChains[0][0].RawSubjectPublicKeyInfo
 			theirDgst := sha256.Sum256(spki)
-			if bytes.Compare(ourDgst, theirDgst[:]) != 0 {
+			if !bytes.Equal(ourDgst, theirDgst[:]) {
 				return errors.New("certificate's SPKI digest mismatch")
 			}
 			return nil
diff --git a/refresh.go b/refresh.go
index edc91d4..4179953 100644
--- a/refresh.go
+++ b/refresh.go
@@ -240,7 +240,7 @@ func refreshDir(
 		}
 		path := filepath.Join(dirPath, MDFile)
 		existing, err := os.ReadFile(path)
-		if err != nil || bytes.Compare(existing, buf.Bytes()) != 0 {
+		if err != nil || !bytes.Equal(existing, buf.Bytes()) {
 			if err = WriteFileSync(dirPath, path, buf.Bytes(), now); err != nil {
 				log.Println("error", r.RemoteAddr, "refresh-json", path, err)
 				http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -426,7 +426,7 @@ func refreshDir(
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return false
 			}
-			if bytes.Compare(hasher.Sum(nil), digest) != 0 {
+			if !bytes.Equal(hasher.Sum(nil), digest) {
 				log.Println(r.RemoteAddr, "pypi", filename, "digest mismatch")
 				os.Remove(dst.Name())
 				dst.Close()
@@ -434,7 +434,7 @@ func refreshDir(
 				return false
 			}
 			if digestStored, err := os.ReadFile(path + "." + hashAlgo); err == nil &&
-				bytes.Compare(digest, digestStored) != 0 {
+				!bytes.Equal(digest, digestStored) {
 				err = errors.New("stored digest mismatch")
 				log.Println("error", r.RemoteAddr, "pypi", filename, err)
 				os.Remove(dst.Name())
diff --git a/upload.go b/upload.go
index c35f89d..b36a575 100644
--- a/upload.go
+++ b/upload.go
@@ -152,7 +152,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 		digestSHA256 := hasherSHA256.Sum(nil)
 		digestBLAKE2b256 := hasherBLAKE2b256.Sum(nil)
 		if digestSHA256Expected != nil {
-			if bytes.Compare(digestSHA256Expected, digestSHA256) == 0 {
+			if bytes.Equal(digestSHA256Expected, digestSHA256) {
 				log.Println(r.RemoteAddr, filename, "good SHA256 checksum received")
 			} else {
 				log.Println(r.RemoteAddr, filename, "bad SHA256 checksum received")
@@ -162,7 +162,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 			}
 		}
 		if digestBLAKE2b256Expected != nil {
-			if bytes.Compare(digestBLAKE2b256Expected, digestBLAKE2b256) == 0 {
+			if bytes.Equal(digestBLAKE2b256Expected, digestBLAKE2b256) {
 				log.Println(r.RemoteAddr, filename, "good BLAKE2b-256 checksum received")
 			} else {
 				log.Println(r.RemoteAddr, filename, "bad BLAKE2b-256 checksum received")
-- 
2.44.0