projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16265-security-updates' into dependabot/bundler/apps/workbench/loofah...
[arvados.git]
/
sdk
/
go
/
keepclient
/
hashcheck.go
diff --git
a/sdk/go/keepclient/hashcheck.go
b/sdk/go/keepclient/hashcheck.go
index 9b13eda771afcf9a3ac523454a7f2163a67864e4..9295c14cc24a47cd38479e19a8aa57dc91c1c42a 100644
(file)
--- a/
sdk/go/keepclient/hashcheck.go
+++ b/
sdk/go/keepclient/hashcheck.go
@@
-35,7
+35,7
@@
func (this HashCheckingReader) Read(p []byte) (n int, err error) {
this.Hash.Write(p[:n])
}
if err == io.EOF {
this.Hash.Write(p[:n])
}
if err == io.EOF {
- sum := this.Hash.Sum(
make([]byte, 0, this.Hash.Size())
)
+ sum := this.Hash.Sum(
nil
)
if fmt.Sprintf("%x", sum) != this.Check {
err = BadChecksum
}
if fmt.Sprintf("%x", sum) != this.Check {
err = BadChecksum
}
@@
-57,7
+57,7
@@
func (this HashCheckingReader) WriteTo(dest io.Writer) (written int64, err error
return written, err
}
return written, err
}
- sum := this.Hash.Sum(
make([]byte, 0, this.Hash.Size())
)
+ sum := this.Hash.Sum(
nil
)
if fmt.Sprintf("%x", sum) != this.Check {
return written, BadChecksum
}
if fmt.Sprintf("%x", sum) != this.Check {
return written, BadChecksum
}
@@
-72,19
+72,16
@@
func (this HashCheckingReader) Close() (err error) {
_, err = io.Copy(this.Hash, this.Reader)
if closer, ok := this.Reader.(io.Closer); ok {
_, err = io.Copy(this.Hash, this.Reader)
if closer, ok := this.Reader.(io.Closer); ok {
-
err2
:= closer.Close()
- if err
2 != nil && err
== nil {
- return err2
+
closeErr
:= closer.Close()
+ if err == nil {
+ err = closeErr
}
}
if err != nil {
return err
}
}
}
if err != nil {
return err
}
-
- sum := this.Hash.Sum(make([]byte, 0, this.Hash.Size()))
- if fmt.Sprintf("%x", sum) != this.Check {
- err = BadChecksum
+ if fmt.Sprintf("%x", this.Hash.Sum(nil)) != this.Check {
+ return BadChecksum
}
}
-
- return err
+ return nil
}
}