Use bytes.Equal() instead of bytes.Compare()==0

diff --git a/integrity.go b/integrity.go
index 24f14aa939558ee212754f4642a5f7f89ff74074..26fe6a412c0c8388d872cb5879f4922a70a2629e 100644 (file)
--- 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 cc5944ed9529319bba7c41d9173d11dd97a868e8..e0670d7a8211ebfbc14e2aae43cdfa012d175f68 100644 (file)
--- 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 edc91d45700e84164ba57ba305a1c651c6b5fa5c..4179953179f7e703290409b69d8b6db349d9971f 100644 (file)
--- 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 c35f89dbe314bce07f610f84c1b05e016edb27db..b36a575d7cd71818f23a5a1b021a377f7cbd2d71 100644 (file)
--- 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")