From 0a431a2a2d97e9156ed48abc6600b236c0d8cdbb Mon Sep 17 00:00:00 2001 From: Brandon Mitchell Date: Mon, 7 Mar 2022 08:51:21 -0500 Subject: [PATCH] Include encryption algorithms for digest Signed-off-by: Brandon Mitchell --- cmd/regbot/sandbox/blob.go | 4 ++++ cmd/regctl/artifact.go | 4 ++++ cmd/regctl/blob.go | 4 ++++ cmd/regctl/digest.go | 4 ++++ cmd/regsync/root.go | 4 ++++ internal/reghttp/http.go | 4 ++++ internal/reqresp/reqresp.go | 4 ++++ regclient.go | 3 --- scheme/ocidir/blob.go | 4 ++++ scheme/ocidir/manifest.go | 4 ++++ scheme/reg/blob.go | 4 ++++ scheme/reg/tag.go | 4 ++++ types/blob/common.go | 4 ++++ types/blob/ociconfig.go | 4 ++++ types/blob/reader.go | 4 ++++ types/docker/schema1/manifest.go | 3 +++ types/manifest/common.go | 4 ++++ types/manifest/docker1.go | 4 ++++ types/manifest/docker2.go | 4 ++++ types/manifest/manifest.go | 4 ++++ types/manifest/oci1.go | 4 ++++ types/oci/v1/image.go | 3 +++ 22 files changed, 82 insertions(+), 3 deletions(-) diff --git a/cmd/regbot/sandbox/blob.go b/cmd/regbot/sandbox/blob.go index fc97fad..00a408e 100644 --- a/cmd/regbot/sandbox/blob.go +++ b/cmd/regbot/sandbox/blob.go @@ -6,6 +6,10 @@ import ( "io" "strings" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + "github.com/opencontainers/go-digest" "github.com/regclient/regclient/types" "github.com/regclient/regclient/types/blob" diff --git a/cmd/regctl/artifact.go b/cmd/regctl/artifact.go index 0dfa4c4..4ab7a62 100644 --- a/cmd/regctl/artifact.go +++ b/cmd/regctl/artifact.go @@ -9,6 +9,10 @@ import ( "path/filepath" "strings" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + "github.com/opencontainers/go-digest" "github.com/regclient/regclient/pkg/archive" "github.com/regclient/regclient/types" diff --git a/cmd/regctl/blob.go b/cmd/regctl/blob.go index 8723447..786cce3 100644 --- a/cmd/regctl/blob.go +++ b/cmd/regctl/blob.go @@ -4,6 +4,10 @@ import ( "io" "os" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + "github.com/opencontainers/go-digest" "github.com/regclient/regclient/pkg/template" "github.com/regclient/regclient/types" diff --git a/cmd/regctl/digest.go b/cmd/regctl/digest.go index 24bea87..85cae5b 100644 --- a/cmd/regctl/digest.go +++ b/cmd/regctl/digest.go @@ -5,6 +5,10 @@ import ( "io" "os" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + "github.com/opencontainers/go-digest" "github.com/spf13/cobra" ) diff --git a/cmd/regsync/root.go b/cmd/regsync/root.go index 201cee7..9a1e722 100644 --- a/cmd/regsync/root.go +++ b/cmd/regsync/root.go @@ -15,6 +15,10 @@ import ( "syscall" "time" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + "github.com/opencontainers/go-digest" "github.com/regclient/regclient" "github.com/regclient/regclient/config" diff --git a/internal/reghttp/http.go b/internal/reghttp/http.go index 9185c2f..a9dffd7 100644 --- a/internal/reghttp/http.go +++ b/internal/reghttp/http.go @@ -19,6 +19,10 @@ import ( "sync" "time" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + "github.com/opencontainers/go-digest" "github.com/regclient/regclient/config" "github.com/regclient/regclient/internal/auth" diff --git a/internal/reqresp/reqresp.go b/internal/reqresp/reqresp.go index 506f50a..8bd5892 100644 --- a/internal/reqresp/reqresp.go +++ b/internal/reqresp/reqresp.go @@ -10,6 +10,10 @@ import ( "regexp" "testing" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + "github.com/opencontainers/go-digest" ) diff --git a/regclient.go b/regclient.go index 9e84c46..b830807 100644 --- a/regclient.go +++ b/regclient.go @@ -10,9 +10,6 @@ import ( "strings" "time" - // crypto libraries included for go-digest - _ "crypto/sha256" - _ "crypto/sha512" "fmt" "os" diff --git a/scheme/ocidir/blob.go b/scheme/ocidir/blob.go index 400946b..b609811 100644 --- a/scheme/ocidir/blob.go +++ b/scheme/ocidir/blob.go @@ -9,6 +9,10 @@ import ( "io/fs" "path" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + "github.com/opencontainers/go-digest" "github.com/regclient/regclient/internal/rwfs" "github.com/regclient/regclient/types" diff --git a/scheme/ocidir/manifest.go b/scheme/ocidir/manifest.go index f412c19..df32dae 100644 --- a/scheme/ocidir/manifest.go +++ b/scheme/ocidir/manifest.go @@ -8,6 +8,10 @@ import ( "io/fs" "path" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + "github.com/opencontainers/go-digest" "github.com/regclient/regclient/internal/rwfs" "github.com/regclient/regclient/internal/wraperr" diff --git a/scheme/reg/blob.go b/scheme/reg/blob.go index ec4a40f..b7ac359 100644 --- a/scheme/reg/blob.go +++ b/scheme/reg/blob.go @@ -9,6 +9,10 @@ import ( "net/http" "net/url" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + "github.com/opencontainers/go-digest" "github.com/regclient/regclient/internal/reghttp" "github.com/regclient/regclient/types" diff --git a/scheme/reg/tag.go b/scheme/reg/tag.go index 0741506..7f105a7 100644 --- a/scheme/reg/tag.go +++ b/scheme/reg/tag.go @@ -12,6 +12,10 @@ import ( "strconv" "time" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + "github.com/opencontainers/go-digest" "github.com/regclient/regclient/internal/reghttp" "github.com/regclient/regclient/scheme" diff --git a/types/blob/common.go b/types/blob/common.go index 47e174c..5ce4e33 100644 --- a/types/blob/common.go +++ b/types/blob/common.go @@ -3,6 +3,10 @@ package blob import ( "net/http" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + "github.com/opencontainers/go-digest" "github.com/regclient/regclient/types" "github.com/regclient/regclient/types/ref" diff --git a/types/blob/ociconfig.go b/types/blob/ociconfig.go index f0a934c..21b1362 100644 --- a/types/blob/ociconfig.go +++ b/types/blob/ociconfig.go @@ -4,6 +4,10 @@ import ( "encoding/json" "fmt" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + "github.com/opencontainers/go-digest" "github.com/regclient/regclient/types" v1 "github.com/regclient/regclient/types/oci/v1" diff --git a/types/blob/reader.go b/types/blob/reader.go index 992db05..6d67a42 100644 --- a/types/blob/reader.go +++ b/types/blob/reader.go @@ -6,6 +6,10 @@ import ( "io/ioutil" "strconv" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + "github.com/opencontainers/go-digest" ) diff --git a/types/docker/schema1/manifest.go b/types/docker/schema1/manifest.go index 91ad0ec..bdac594 100644 --- a/types/docker/schema1/manifest.go +++ b/types/docker/schema1/manifest.go @@ -3,6 +3,9 @@ package schema1 import ( "encoding/json" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" "github.com/docker/libtrust" "github.com/opencontainers/go-digest" diff --git a/types/manifest/common.go b/types/manifest/common.go index ebff83d..36fc850 100644 --- a/types/manifest/common.go +++ b/types/manifest/common.go @@ -5,6 +5,10 @@ import ( "strconv" "strings" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + digest "github.com/opencontainers/go-digest" "github.com/regclient/regclient/types" "github.com/regclient/regclient/types/ref" diff --git a/types/manifest/docker1.go b/types/manifest/docker1.go index f2874cb..5b5ae47 100644 --- a/types/manifest/docker1.go +++ b/types/manifest/docker1.go @@ -5,6 +5,10 @@ import ( "encoding/json" "fmt" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + digest "github.com/opencontainers/go-digest" "github.com/regclient/regclient/internal/wraperr" "github.com/regclient/regclient/types" diff --git a/types/manifest/docker2.go b/types/manifest/docker2.go index f772f8c..7ab47f9 100644 --- a/types/manifest/docker2.go +++ b/types/manifest/docker2.go @@ -6,6 +6,10 @@ import ( "fmt" "text/tabwriter" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + digest "github.com/opencontainers/go-digest" "github.com/regclient/regclient/internal/units" "github.com/regclient/regclient/internal/wraperr" diff --git a/types/manifest/manifest.go b/types/manifest/manifest.go index 392a486..fa94574 100644 --- a/types/manifest/manifest.go +++ b/types/manifest/manifest.go @@ -10,6 +10,10 @@ import ( "strconv" "strings" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + digest "github.com/opencontainers/go-digest" "github.com/regclient/regclient/internal/wraperr" "github.com/regclient/regclient/types" diff --git a/types/manifest/oci1.go b/types/manifest/oci1.go index 0079ff0..c8b2f72 100644 --- a/types/manifest/oci1.go +++ b/types/manifest/oci1.go @@ -6,6 +6,10 @@ import ( "fmt" "text/tabwriter" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" + digest "github.com/opencontainers/go-digest" "github.com/regclient/regclient/internal/units" "github.com/regclient/regclient/internal/wraperr" diff --git a/types/oci/v1/image.go b/types/oci/v1/image.go index c9de701..8b4f32b 100644 --- a/types/oci/v1/image.go +++ b/types/oci/v1/image.go @@ -2,6 +2,9 @@ package v1 import ( "time" + // crypto libraries included for go-digest + _ "crypto/sha256" + _ "crypto/sha512" digest "github.com/opencontainers/go-digest" )