Merge pull request #278 from harshavardhana/pr_out_add_strict_checks_with_vet_golint_and_gofmt

master
Harshavardhana 10 years ago
commit dd0469542b
  1. 23
      Makefile
  2. 2
      pkg/utils/checksum/crc32c/crc32c_darwin.go
  3. 6
      pkg/utils/crypto/sha1/sha1_linux.go
  4. 2
      pkg/utils/crypto/sha1/sha1block_linux.go
  5. 6
      pkg/utils/crypto/sha256/sha256_linux.go
  6. 7
      pkg/utils/crypto/sha512/sha512_linux.go

@ -12,12 +12,23 @@ checkgopath:
getdeps: checkdeps checkgopath
@go get github.com/tools/godep && echo "Installed godep"
verifier: getdeps
@echo "Checking for offending code"
@go run buildscripts/verifier.go ${PWD}
build-all: verifier
@go get github.com/golang/lint/golint && echo "Installed golint"
@go get golang.org/x/tools/cmd/vet && echo "Installed vet"
verifiers: getdeps vet fmt lint
vet:
@echo "Running $@"
@go vet ./...
fmt:
@echo "Running $@"
@test -z "$$(gofmt -s -l . | grep -v Godeps/_workspace/src/ | tee /dev/stderr)" || \
echo "+ please format Go code with 'gofmt -s'"
lint:
@echo "Running $@"
@test -z "$$(golint ./... | grep -v Godeps/_workspace/src/ | tee /dev/stderr)"
build-all: verifiers
@echo "Building Libraries"
@godep go generate ./...
@godep go build ./...

@ -17,8 +17,8 @@
package crc32c
import (
"io"
"hash/crc32"
"io"
)
var castanagoliTable = crc32.MakeTable(crc32.Castagnoli)

@ -100,10 +100,10 @@ func (d *digest) Write(p []byte) (nn int, err error) {
}
// Return checksum bytes
func (d0 *digest) Sum(in []byte) []byte {
func (d *digest) Sum(in []byte) []byte {
// Make a copy of d0 so that caller can keep writing and summing.
d := *d0
hash := d.checkSum()
d0 := *d
hash := d0.checkSum()
return append(in, hash[:]...)
}

@ -17,5 +17,3 @@ func blockAVX2(dig *digest, p []byte) {
func blockSSE3(dig *digest, p []byte) {
C.sha1_update_intel((*C.int32_t)(unsafe.Pointer(&dig.h[0])), (*C.char)(unsafe.Pointer(&p[0])), (C.size_t)(len(p)/chunk))
}

@ -106,10 +106,10 @@ func (d *digest) Write(p []byte) (nn int, err error) {
}
// Return sha256 sum in bytes
func (d0 *digest) Sum(in []byte) []byte {
func (d *digest) Sum(in []byte) []byte {
// Make a copy of d0 so that caller can keep writing and summing.
d := *d0
hash := d.checkSum()
d0 := *d
hash := d0.checkSum()
return append(in, hash[:]...)
}

@ -107,11 +107,10 @@ func (d *digest) Write(p []byte) (nn int, err error) {
}
// Calculate sha512
func (d0 *digest) Sum(in []byte) []byte {
func (d *digest) Sum(in []byte) []byte {
// Make a copy of d0 so that caller can keep writing and summing.
d := new(digest)
*d = *d0
hash := d.checkSum()
d0 := *d
hash := d0.checkSum()
return append(in, hash[:]...)
}

Loading…
Cancel
Save