summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorGuillaume Rose <gurose@redhat.com>2021-08-19 16:17:23 +0200
committerGuillaume Rose <gurose@redhat.com>2021-08-19 16:54:50 +0200
commitb19812b5a245eec1f04da77f15d86004bd42d3fd (patch)
treeb132bcad8b02abc1e4b4e42fe3a7481806f835e4 /pkg
parent0434571920939576b1708e905cfb156d9fde504b (diff)
downloadpodman-b19812b5a245eec1f04da77f15d86004bd42d3fd.tar.gz
podman-b19812b5a245eec1f04da77f15d86004bd42d3fd.tar.bz2
podman-b19812b5a245eec1f04da77f15d86004bd42d3fd.zip
machine: compute sha256 as we read the image file
It avoids to have the full file in memory. [NO TESTS NEEDED] Signed-off-by: Guillaume Rose <gurose@redhat.com>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/machine/fcos.go16
1 files changed, 11 insertions, 5 deletions
diff --git a/pkg/machine/fcos.go b/pkg/machine/fcos.go
index 943b9fd3c..49ec01e67 100644
--- a/pkg/machine/fcos.go
+++ b/pkg/machine/fcos.go
@@ -3,8 +3,6 @@
package machine
import (
- "crypto/sha256"
- "io/ioutil"
url2 "net/url"
"os"
"path/filepath"
@@ -12,6 +10,7 @@ import (
"strings"
digest "github.com/opencontainers/go-digest"
+ "github.com/sirupsen/logrus"
)
// These should eventually be moved into machine/qemu as
@@ -95,12 +94,19 @@ func UpdateAvailable(d *Download) (bool, error) {
if _, err := os.Stat(d.LocalPath); os.IsNotExist(err) {
return false, nil
}
- b, err := ioutil.ReadFile(d.LocalPath)
+ fd, err := os.Open(d.LocalPath)
+ if err != nil {
+ return false, err
+ }
+ defer func() {
+ if err := fd.Close(); err != nil {
+ logrus.Error(err)
+ }
+ }()
+ sum, err := digest.SHA256.FromReader(fd)
if err != nil {
return false, err
}
- s := sha256.Sum256(b)
- sum := digest.NewDigestFromBytes(digest.SHA256, s[:])
return sum.Encoded() == d.Sha256sum, nil
}