integrity.go | 2 +- main.go | 2 +- refresh.go | 6 +++--- upload.go | 4 ++-- diff --git a/integrity.go b/integrity.go index 36d55d72307235bf8417985d69c5935af5c2d560848e00f2a6692b92c3ee4972..60f64d2b15819d2cad4933b87abebda6552bc13f737090fc40606e12e16fa615 100644 --- a/integrity.go +++ b/integrity.go @@ -52,7 +52,7 @@ fd.Close() 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 a5d68c07a8caad100c61571ba762fe31cd0cfa06292af9895e20a4ef98c8aed2..8bac8d9e06e8c05e778fa8d0a2f6e42d26e4d0613a69b1470f5bf24908c11914 100644 --- a/main.go +++ b/main.go @@ -236,7 +236,7 @@ } 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 0387b11b7793ea4648f89e05962f0873be07fecd88bde12adb45367753ffdb32..b9349d1b8fcef79f4a4543854f38636a0f107c3ca03139bb8a58a6e4a4837ec3 100644 --- a/refresh.go +++ b/refresh.go @@ -240,7 +240,7 @@ return false } 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 @@ log.Println("error", r.RemoteAddr, "pypi", filename, err) 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 @@ http.Error(w, "digest mismatch", http.StatusBadGateway) 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 49974ee2a588eb3d2a874fff068dc50093f6022669f054c4cd03c580915562c0..164d46ecaf2359915ce414ade637318610c7ff56905a6ad452200c19f40d61bd 100644 --- a/upload.go +++ b/upload.go @@ -152,7 +152,7 @@ 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 @@ return } } 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")