Merge pull request #130 from tri-adam/switch-crypto

Replace Deprecated golang.org/x/crypto/openpgp Package
sylabs · Aug 26, 2021 · aa570ba · aa570ba
2 parents f811a64 + 7d5a07c
commit aa570ba
Show file tree

Hide file tree

Showing 37 changed files with 201 additions and 183 deletions.
diff --git a/go.mod b/go.mod
@@ -3,19 +3,18 @@ module github.com/sylabs/sif/v2
 go 1.17
 
 require (
+	github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7
 	github.com/blang/semver/v4 v4.0.0
 	github.com/go-git/go-git/v5 v5.4.2
 	github.com/google/uuid v1.3.0
 	github.com/magefile/mage v1.11.0
 	github.com/sebdah/goldie/v2 v2.5.3
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5
-	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
 )
 
 require (
 	github.com/Microsoft/go-winio v0.4.16 // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
 	github.com/acomagu/bufpipe v1.0.3 // indirect
 	github.com/emirpasic/gods v1.12.0 // indirect
 	github.com/go-git/gcfg v1.5.0 // indirect
@@ -28,6 +27,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/xanzy/ssh-agent v0.3.0 // indirect
+	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
 	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect
 	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect

diff --git a/internal/app/siftool/modif_test.go b/internal/app/siftool/modif_test.go
@@ -59,7 +59,7 @@ func TestApp_Add(t *testing.T) {
 			data:     []byte{0xde, 0xad, 0xbe, 0xef},
 			dataType: sif.DataSignature,
 			opts: []sif.DescriptorInputOpt{
-				sif.OptSignatureMetadata(crypto.SHA256, [...]byte{
+				sif.OptSignatureMetadata(crypto.SHA256, []byte{
 					0x12, 0x04, 0x5c, 0x8c, 0x0b, 0x10, 0x04, 0xd0, 0x58, 0xde,
 					0x4b, 0xed, 0xa2, 0x0c, 0x27, 0xee, 0x7f, 0xf7, 0xba, 0x84,
 				}),

diff --git a/internal/app/siftool/testdata/TestApp_Dump/Three.golden b/internal/app/siftool/testdata/TestApp_Dump/Three.golden
@@ -4,11 +4,12 @@ Hash: SHA256
 {"version":1,"header":{"digest":"sha256:2086c56f4fc4b733d256d56b780a16c3c906578ab4a90158306de17798bc3f82"},"objects":[{"relativeId":0,"descriptorDigest":"sha256:59511afc6008d789c6dc03d7446e00cfb3ee3260687643acca8d1d51f212f797","objectDigest":"sha256:004dfc8da678c309de28b5386a1e9efd57f536b150c40d29b31506aa0fb17ec2"},{"relativeId":1,"descriptorDigest":"sha256:be7080b0de694a343a222102966eb02e732a63d28856249e260aed207edf955e","objectDigest":"sha256:5f78c33274e43fa9de5659265c1d917e25c03722dcb0b8d27db8d5feaa813953"}]}
 -----BEGIN PGP SIGNATURE-----
 
-wsBcBAEBCAAQBQJe+oD0CRCiDCfuf/e6hAAAOzsIAByvBjwQ+O8fx4/agHFbtlzd
-jHM2ASECLuS1OUqgnrRPnF2ULZTOA20eFNlG4r25xuinUsBHvpEi8uV0GQN5sTMI
-xCeDlXMEQO92+AHK5zQbxQSUAp2dWzPgiCOhEce1P1/TRcccaf2oA9MdZBu1wzbd
-Evb6URZCk1SyIvFaX1wOfuok6xSkmxXoErSpfIPRVavPG74ZMXFId29noOt5rmHg
-7HUQcctER39WvI1nM7zVmc9Y2SWxK0qdYBpaeXGFTXUtahE9W7jU42KzH163mRiL
-v/V40LadsSIIAf+OKqgmC/VudTuuX0tdRizPq8fsVLW7g08o4e+Y0HUPd1lkQuQ=
-=E43I
+wsBzBAEBCAAnBQJe+oD0CRCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE
+AAA+GAf+OdIq5cqpMDOkrTaX4PaBN+To+7kYS8nFiN/VhEUqo8UknWiKnHgUq0aB
+wfbHXbwClZWdRM7PtScQlLPog8rrR8aVuQPE3TOdCrWIaLwdg/PO/MhpLRZjY9eN
+iR5ujUqAUu9YEtwL0VEUjKSA/x+zhdfcESm8i2jNh6AkyTywk2qMl1wX7ZHG6a5+
+zxmx//ajCMaPNes0Ga9QWONf6/7V8xnC7AM7hJ/ACJL6hkoQOebWHEvadprJQLAI
+Ijod0bhS3AJCFM4+0+wCR0kCUxOvove/CHhZMWZIHOu36B1rhRivlJU3LlozDXes
+d7oZp/aJRDLhGw8qp0klYWwa0LuxIA==
+=0uKo
 -----END PGP SIGNATURE-----
diff --git a/internal/app/siftool/testdata/TestApp_Info/Three.golden b/internal/app/siftool/testdata/TestApp_Info/Three.golden
@@ -3,7 +3,7 @@
   Groupid:   NONE
   Link:      1 (G)
   Fileoff:   40960
-  Filelen:   1021
+  Filelen:   1054
   Ctime:     2020-06-30 00:01:56 +0000 UTC
   Mtime:     2020-06-30 00:01:56 +0000 UTC
   Name:      

diff --git a/internal/app/siftool/testdata/TestApp_List/OneGroupSigned.golden b/internal/app/siftool/testdata/TestApp_List/OneGroupSigned.golden
@@ -7,4 +7,4 @@ ID   |GROUP   |LINK    |SIF POSITION (start-end)  |TYPE
 ------------------------------------------------------------------------------
 1    |1       |NONE    |32768-32772               |FS (Raw/System/386)
 2    |1       |NONE    |36864-36868               |FS (Squashfs/*System/386)
-3    |NONE    |1   (G) |40960-41981               |Signature (SHA-256)
+3    |NONE    |1   (G) |40960-42014               |Signature (SHA-256)
diff --git a/internal/app/siftool/testdata/TestApp_List/TwoGroupsSigned.golden b/internal/app/siftool/testdata/TestApp_List/TwoGroupsSigned.golden
@@ -8,5 +8,5 @@ ID   |GROUP   |LINK    |SIF POSITION (start-end)  |TYPE
 1    |1       |NONE    |32768-32772               |FS (Raw/System/386)
 2    |1       |NONE    |36864-36868               |FS (Squashfs/*System/386)
 3    |2       |NONE    |40960-40964               |FS (Ext3/System/amd64)
-4    |NONE    |1   (G) |45056-46077               |Signature (SHA-256)
-5    |NONE    |2   (G) |49152-49974               |Signature (SHA-256)
+4    |NONE    |1   (G) |45056-46110               |Signature (SHA-256)
+5    |NONE    |2   (G) |49152-50007               |Signature (SHA-256)
diff --git a/pkg/integrity/clearsign.go b/pkg/integrity/clearsign.go
@@ -11,9 +11,9 @@ import (
 	"errors"
 	"io"
 
-	"golang.org/x/crypto/openpgp"
-	"golang.org/x/crypto/openpgp/clearsign"
-	"golang.org/x/crypto/openpgp/packet"
+	"github.com/ProtonMail/go-crypto/openpgp"
+	"github.com/ProtonMail/go-crypto/openpgp/clearsign"
+	"github.com/ProtonMail/go-crypto/openpgp/packet"
 )
 
 var errClearsignedMsgNotFound = errors.New("clearsigned message not found")
@@ -59,7 +59,7 @@ func verifyAndDecode(data []byte, kr openpgp.KeyRing) (*openpgp.Entity, []byte,
 	}
 
 	// Check signature.
-	e, err := openpgp.CheckDetachedSignature(kr, bytes.NewReader(b.Bytes), b.ArmoredSignature.Body)
+	e, err := openpgp.CheckDetachedSignature(kr, bytes.NewReader(b.Bytes), b.ArmoredSignature.Body, nil)
 	return e, b.Plaintext, rest, err
 }
 

diff --git a/pkg/integrity/clearsign_test.go b/pkg/integrity/clearsign_test.go
@@ -15,10 +15,10 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/ProtonMail/go-crypto/openpgp"
+	pgperrors "github.com/ProtonMail/go-crypto/openpgp/errors"
+	"github.com/ProtonMail/go-crypto/openpgp/packet"
 	"github.com/sebdah/goldie/v2"
-	"golang.org/x/crypto/openpgp"
-	pgperrors "golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/packet"
 )
 
 type testType struct {

diff --git a/pkg/integrity/main_test.go b/pkg/integrity/main_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/crypto/openpgp"
+	"github.com/ProtonMail/go-crypto/openpgp"
 )
 
 var corpus = filepath.Join("..", "..", "test", "images")

diff --git a/pkg/integrity/result.go b/pkg/integrity/result.go
@@ -6,8 +6,8 @@
 package integrity
 
 import (
+	"github.com/ProtonMail/go-crypto/openpgp"
 	"github.com/sylabs/sif/v2/pkg/sif"
-	"golang.org/x/crypto/openpgp"
 )
 
 type VerifyResult struct {

diff --git a/pkg/integrity/select.go b/pkg/integrity/select.go
@@ -167,8 +167,8 @@ func getGroupIDs(f *sif.FileImage) (groupIDs []uint32, err error) {
 }
 
 // getFingerprints returns a sorted list of unique fingerprints contained in sigs.
-func getFingerprints(sigs []sif.Descriptor) ([][20]byte, error) {
-	fps := make([][20]byte, 0, len(sigs))
+func getFingerprints(sigs []sif.Descriptor) ([][]byte, error) {
+	fps := make([][]byte, 0, len(sigs))
 
 	for _, sig := range sigs {
 		_, fp, err := sig.SignatureMetadata()
@@ -178,14 +178,14 @@ func getFingerprints(sigs []sif.Descriptor) ([][20]byte, error) {
 
 		// Check if fingerprint is already in list.
 		i := sort.Search(len(fps), func(i int) bool {
-			return bytes.Compare(fps[i][:], fp[:]) >= 0
+			return bytes.Compare(fps[i], fp) >= 0
 		})
-		if i < len(fps) && fps[i] == fp {
+		if i < len(fps) && bytes.Equal(fps[i], fp) {
 			continue
 		}
 
 		// Insert into (sorted) list.
-		fps = append(fps, [20]byte{})
+		fps = append(fps, []byte{})
 		copy(fps[i+1:], fps[i:])
 		fps[i] = fp
 	}

diff --git a/pkg/integrity/sign.go b/pkg/integrity/sign.go
@@ -13,9 +13,9 @@ import (
 	"sort"
 	"time"
 
+	"github.com/ProtonMail/go-crypto/openpgp"
+	"github.com/ProtonMail/go-crypto/openpgp/packet"
 	"github.com/sylabs/sif/v2/pkg/sif"
-	"golang.org/x/crypto/openpgp"
-	"golang.org/x/crypto/openpgp/packet"
 )
 
 var (

diff --git a/pkg/integrity/sign_test.go b/pkg/integrity/sign_test.go
@@ -14,10 +14,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/ProtonMail/go-crypto/openpgp"
+	"github.com/ProtonMail/go-crypto/openpgp/packet"
 	"github.com/sebdah/goldie/v2"
 	"github.com/sylabs/sif/v2/pkg/sif"
-	"golang.org/x/crypto/openpgp"
-	"golang.org/x/crypto/openpgp/packet"
 )
 
 func TestOptSignGroupObjects(t *testing.T) {

diff --git a/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Group1.golden b/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Group1.golden
@@ -4,11 +4,12 @@ Hash: SHA256
 {"version":1,"header":{"digest":"sha1:ada68a4647c332f3b89905972c28432bf8dfbe91"},"objects":[{"relativeId":0,"descriptorDigest":"sha1:2b63769dfb558196043080779cb9c14b5f7f26ae","objectDigest":"sha1:15146b9bf4f1f5f9bf176a398d8c4f0321c63064"},{"relativeId":1,"descriptorDigest":"sha1:253db147368626e683190e6e406c802eb2267697","objectDigest":"sha1:d78f8bb992a56a597f6c7a1fb918bb78271367eb"}]}
 -----BEGIN PGP SIGNATURE-----
 
-wsBcBAEBCAAQBQJZr0CRCRCiDCfuf/e6hAAAMR8IAKRFKLlJE5wpZ2qcsmAjXLJc
-dogjrwFeftPiyMReL2q0BdT7osInTHIoXqRFHooCUe97DMeOn/Ct8sfKBvx6XnM9
-0lHIV/vJi8JGm/VUsfLkcx4cxsgVvrTGATPoqaACaVFV6LtUzLd8mNeSQIct79Pu
-6Q6iFJUZCGuNnXCC0wSNGIjMMqMuK65XaHoPF5AU/64uAdDumqJZQKzrj+ZR93/E
-GgwS9SvBn3CPs1vWWPOo3Bm+T62CXTUpThE7GZ/2ko8FEb+0IJeV6rjaEOaaDxQy
-GUozdn+DFgGnYfzCZNFTOqaGIUogYFSAY4++9M8DtspykHPEFJy3sjglNpzYAxQ=
-=G/8d
+wsBzBAEBCAAnBQJZr0CRCRCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE
+AAABRwf/Y0pXd2qpucZaEsX7nISZ/kO9fFpuEhl7L9FoBEmQyCdf4ZwfLazNKYVb
+iaFwRYawTVoXfTIfAL16M2dqI0N0TuCggAO6rZ5vxF6Lb5kTP9fDvB371x4dXmC6
+e+rsUDvbjYzqwHdIHFLC/QzKi0kbCCtJ2ansa1d9qlCbgVR4ASkffNHmlfxxzukx
+pRh1VXio1oPMao78yzMCYGqTc5O65qD6grigE8gUMVKfArLfkj6l2SgaLEl/jf+H
++Xlj5nt4ljPoRzrEresEOFJ0Vq8TH6M6mk7fL21vyCs9dqwAPmDgni5ZBvds1toV
+Jm5mNM3GP05BK2f7Bt0T4/Y9jbqIAw==
+=uaMa
 -----END PGP SIGNATURE-----
diff --git a/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Group2.golden b/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Group2.golden
@@ -4,11 +4,12 @@ Hash: SHA256
 {"version":1,"header":{"digest":"sha1:ada68a4647c332f3b89905972c28432bf8dfbe91"},"objects":[{"relativeId":0,"descriptorDigest":"sha1:dd56249071ddff775f5aceb0ba4649c291513491","objectDigest":"sha1:5b6f4d388e3bfe2ff34ef90365b35370daa3c4c4"}]}
 -----BEGIN PGP SIGNATURE-----
 
-wsBcBAEBCAAQBQJZr0CRCRCiDCfuf/e6hAAAew8IAJEtO272Y2VyuLBk4OBuPTov
-b3mv0sC4Hyr9pmYyctdLyC94vl/42x/UanqMfgx93WMat4X/syax8QpnmC9miwsD
-qLy/MnHNmQN4Uqm2+b//TWdFEgamT2O1spIHJtJlSrEJ2YG+5ODGm6DKvyMk22CU
-lzuCSJJtHdzeoozt/zrnC9P/JgxG/2k9s5nKowgHQjkjsWAS3ehGHW6RFP1a/96I
-N/HqzcpkDrd02cWA8Mr4yrdbqYsdgLn/o6LzEgsPR3XNAead9oRFcOIskLafu6pT
-Egm4bnj5/VgccymY08cIICdinsz0SdwZFfbv6Iv1GPkWAtOlD6TwaIXcFd8h1KY=
-=MBPp
+wsBzBAEBCAAnBQJZr0CRCRCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE
+AACFugf8C8z0FRLXto5L66OeNuYupmxiR2ZQcF0/T1EaqOVvBwdC4MLrgfHTEuM9
+Cc3Ys4LTaDBaKDYVv5dV1VQHSdtlXfs1xaMMLtAd2F/uKhrIGZleqQt1IfDP9PXK
+NornRaCTKYmEiG6twG/ZYIBxA8p6UfiKwyRYAMED2sD/yiRCkii69fq6gw+QTTF6
+rmXVnjmKK8UPMdbD+fs1qUahUipwS9LeL39xwvMyIoUxf62Hvk4KTma5D15u04fS
+edF86wEp0Qr/WoSBqZwzrHMQMh9u77/qsPRdWa+wTWFoDhfMG7zTgZeJXxH735k8
+dkFaBLOoR3FpOXK4UGr3dyUunto5EQ==
+=0Shx
 -----END PGP SIGNATURE-----
diff --git a/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Object1.golden b/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Object1.golden
@@ -4,11 +4,12 @@ Hash: SHA256
 {"version":1,"header":{"digest":"sha1:ada68a4647c332f3b89905972c28432bf8dfbe91"},"objects":[{"relativeId":0,"descriptorDigest":"sha1:2b63769dfb558196043080779cb9c14b5f7f26ae","objectDigest":"sha1:15146b9bf4f1f5f9bf176a398d8c4f0321c63064"}]}
 -----BEGIN PGP SIGNATURE-----
 
-wsBcBAEBCAAQBQJZr0CRCRCiDCfuf/e6hAAASw0IABIUlngwd+mDEURd7aQrMjbB
-tKS02swi1jnXAhTy9ccseP4ReaNx7In+6juFRdrbvoQpqEO2vXruRIqYbe0+6QU0
-1IzK87tsRuqvE3zJ7LH0VO6gy26pmX6wFC9tQo4IcFdo5qsJp4R34Uq4qF9hn/2L
-9woZQFHwsnhjAZtu5lQ0x9MDF2EMsWXR6TSm+/ZhFQCHzywgJvNtbTjgQVUir17X
-k4V7pjMBeO5uVtxDSKEwBFyFq2B857sh7o24il6E9eXV1GnEkWWrgRCeuCFM6Uxl
-NWaa7zEHL0JQWFDiOaHpHjn0NYeP1xDcF9YUkfDaAurkTrAJnb+VMtVFtWDdGmA=
-=LLsQ
+wsBzBAEBCAAnBQJZr0CRCRCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE
+AAC9eAf+KSZL+yE+WtdygjlQAGMZ2HulAfMD7oz2R5z8EBVrkNwqFhiJTENNyC+H
+8sFpdhlMXwM9upMuI3zNkBexvt12+1ctYfF/DDOPq19o/wOdwQeKUbLouSBv6tIf
+jKdbsygE/9uIUOIZgL6qVHU09v8uP8xE/X8kzqBuYhX2whZZjQxfy8QaslSmzrRo
+jJGIVUTiuBw86Uzf88+4ueaAgN+oQkxVivNwvlXjryllcE7MwlFpUndeQiDGnrbd
+c3cjkMxIWXZMHAuKo5lkgJxpuvsRB0QWEK8HSAx59R1avlMUIA8+sxeyED7D7y34
+G3FOZNTY5gKJ304nXzwbz4PFZl/y6A==
+=G9VS
 -----END PGP SIGNATURE-----
diff --git a/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Object2.golden b/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Object2.golden
@@ -4,11 +4,12 @@ Hash: SHA256
 {"version":1,"header":{"digest":"sha1:ada68a4647c332f3b89905972c28432bf8dfbe91"},"objects":[{"relativeId":1,"descriptorDigest":"sha1:253db147368626e683190e6e406c802eb2267697","objectDigest":"sha1:d78f8bb992a56a597f6c7a1fb918bb78271367eb"}]}
 -----BEGIN PGP SIGNATURE-----
 
-wsBcBAEBCAAQBQJZr0CRCRCiDCfuf/e6hAAACBsIADnK+hKwg2s2HLQv4gP0RlUp
-taSGXjU8j86/QiRUi74tUH3nU/oOzzS9HjBId/CRoInyPbBTjgMdlYk/yvIGtY8B
-TtG0b7tB0TCxAysmBkBBP4gj8215kISXWy1dQ93FORaE35Nz5YQZ9cFEVMFaQQ2c
-jt/d+dgxqXlc5sXlj2u/QrlCLhbcO5LMHXbcp0d/3a/1Ldzr2DyGtoTEgUP3kvfb
-p9D+6k4eUwD0MXTkWm3mnpOUYAwWGs4kh93DM8Yp1wtetbegOIrcMQRLbfL4/fgt
-Jz/OMJQYS2Gln6L4eifR8sJns1ggeIeLWbxwmaH3RWMaBKHGnHUK8u6Xp6ddSMk=
-=SWSp
+wsBzBAEBCAAnBQJZr0CRCRCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE
+AAAJLQf/eEoUKQDgABlyC6v09py6ezG8m3IdSvu1AJVSMQXeuvM0rlh58ZA3juq+
+DsshevYtu5wE3FZ0rak9DKmc6+0GKxYTvs2D7cr/RzeNXGY50sDy1A4M2MZWF5t5
+K1N6tbvVoCE9lrRn5nHpPrXsXOTz1A1jUdqcGmDdaud7lz3oXU57XUUn7J1T2clm
+MxPFB1eBYhi1YBndhjij6kjZazlQ011ZupUt54BS9KFhfIiPtYuaO3PmSeWWghnC
+LbFSlpKK8Acb0PkOt4VbkirbfsmSKIdbcBWnqNSrP2QrcZsU+cpdfc0GsSDrLNFJ
+JpQ8NRxJuXyVnGOeMNA0CFWuJutong==
+=3PxI
 -----END PGP SIGNATURE-----
diff --git a/pkg/integrity/testdata/TestSignAndEncodeJSON/DefaultHash.golden b/pkg/integrity/testdata/TestSignAndEncodeJSON/DefaultHash.golden
@@ -4,11 +4,12 @@ Hash: SHA256
 {"One":1,"Two":2}
 -----BEGIN PGP SIGNATURE-----
 
-wsBcBAEBCAAQBQJZr0CRCRCiDCfuf/e6hAAArhkIAAujKcRwzPBq5HjURqDYzQBL
-YTH9nviKUedWM8x3nyS9RcnMNAOp6VravVhC/8m4xk+VR/PbKwXAAiGsRIc27X6e
-vgkScVNPAm+rriXl2kNKlaNVzynqcQk5qCWrDYnWY7T3J9zQWX5I0okwGF4ZJYfc
-pXhN08xu8pEsxB+dZqGKZ6dTRvJXe0vTa9U0OtJE9RjDxmJsa1kpfQSD4MJ4pi4B
-OnBTw0I3O/o8DWPkDwBc5b/U1lEwoGVsa449d5zlVdlPYy0I9ggYqwkloJmRYg6j
-/XQNA8AS3LhcIN7ouladIJbo50TmHIscnbx+j2pZaDm9gPskj9bJbz4mE/ChotY=
-=1yr3
+wsBzBAEBCAAnBQJZr0CRCRCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE
+AACDsAgAnVhR5jTdvrbICFtjKXYxxG8jsbJBpcJeUpI0isA3Js7VAnsrL+Rf/LHh
+Shjckz57TL9MkRFR7ENqPF0m/6DP3+YlrDAGz7pKEfkM7LEkh4D31doHKHF8L3CE
+cWAO3jxJFVf1EFULLGlUiKlav4nVXkbBqevonje75rdOAL/ARhKSy5/pycq1yWSK
+pXVc6uAk5p7KO/nJ8uPef6nCc1NKYaBsTn9nlBpxNSfxbU6nzZChrQJkf/N3Umg2
+yo4WxQFgUMjAAOqYY6G7PexN9I0r8xgvLpwpZ1gx7fxCW0dHv2pNcPHL2TiPDXvU
+jJOEKedUjf9yIaBtbfTt3/nNkJrI/Q==
+=beI9
 -----END PGP SIGNATURE-----
diff --git a/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA1.golden b/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA1.golden
@@ -4,11 +4,12 @@ Hash: SHA1
 {"One":1,"Two":2}
 -----BEGIN PGP SIGNATURE-----
 
-wsBcBAEBAgAQBQJZr0CRCRCiDCfuf/e6hAAAyTYIABHw05OoUPnPHLzpw9ye/2gz
-ftz/vfZuR0hCUKX9nvXE3dEYE5Y3hTvEmDYXutABx2bXb5gkInM4Rgh2pmLI5Wu9
-v9aK0AUZNLxVaVaHR8CVy773OSyHBquGA/nWDXVg+lnY2UOw7l/E1rxyP0VR+j2M
-h2OJsr5KsDWAHVjPUg+xAbefBlxDA9kLjmaowy4uBShpzrCHA9rSK2kdQ0jaRpxX
-aqeZiugiGmpXMYbtPzaDnfi/zihxxRc1VA9mqhbzYuEWZeM+UQeJN+YdUThrqQbs
-OhJHeWh2RTOZYM7WtijkEsGGRN2DImpdj9Q+8B7ckHVKcXRyX0BwVQm2lVU/YZI=
-=Qwtx
+wsBzBAEBAgAnBQJZr0CRCRCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE
+AAAH/Af/X3lEca+5YMsUUO+BiRyrCyoV2vMoMkUOJJd4tkzki0yVpIebbaZz+cz+
+gr0a1zleTguFRALIJg4hRWkkH2tYEKdCvUegdFkbSpjI8IvEAHGy686Mf5zUVfrK
+on7ITZCytefn0LANug1GtBJYm5QndyFCGqvQSHdn2hQBK0HOtRd19yLWLJgJ1+LX
+VTcCLQPIbmslh1zTLtAb7oQ5tuTQhypdbvLDgrN9B6xzyooAkWAcRfuxC1NmZufg
+pLi60Qc2M23QHSXfYLrxKSXhJQBrRgom45K/SAlYDfXBnEPr0FxrqgyLYpYDp42l
+Nn4VfvbrVdxbl/uVDEyqvdXie5J/Yw==
+=qZlS
 -----END PGP SIGNATURE-----
diff --git a/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA224.golden b/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA224.golden
@@ -4,11 +4,12 @@ Hash: SHA224
 {"One":1,"Two":2}
 -----BEGIN PGP SIGNATURE-----
 
-wsBcBAEBCwAQBQJZr0CRCRCiDCfuf/e6hAAAVZsIAFP3UYRtSxjq6y2ip2Jo2K3v
-PYHsAR++ON5VArAOsTE+q6/EkJlTt0EUV8xCxtsigZSaNPNAXTg4+EcVJ5nsW+pE
-4JQSgsOiBjQ7uH0AE9fxRicVrw44QFn2H2tMdd4zN1DMdzlLt1sa/5DYn1OkJEKA
-qNR0UxbVQHRRUCz9QIHZ5qOunZgdbAbYb4TTlj683MHCue+KJEdetzhereLfg4k+
-2nRJwwYW/JIiDtYBfoTg2r8l3lwnsW9iHsraq5r+/ZXsGjRfaQuKfHO0XY4dwdyQ
-C2loJJL4HTS5ed7bCFWPZ//zeKqZm/sK2+GklH1EuR5CVALqHgYrRYzEmRbne08=
-=S/WT
+wsBzBAEBCwAnBQJZr0CRCRCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE
+AABw2wf/UPvG6GVucl/tD7MxNk+qK2vF/r73UFETIMZUob+O1CJq/GmxKxkir64I
+XLSfMC3e3XyvhoUPZS1EQnxyAaSc6xKS4rFIywssDxLmZOh7ImuMig2emvVE4YmJ
+/w4JtO49Ohxfib18iookDVyjZ6Szw1NlK2HJYGxjYaM6DBQw5AJhBE3P13RaG3qV
+chs2uo0/X/K+JSjukyYz4GeRIDy6Owo+lf0JkBeFxmIWNeRKFty26sAiJ55xQV4t
+HYp2mTqFZWEnZWla7/qp60PQUuN/d4uzYFB4J/6HS23i14y2iohhpGbKUpkwhpcE
+d9Nf9B/KEAArMpoXRFJKsDJnfWbuhA==
+=WfOc
 -----END PGP SIGNATURE-----
diff --git a/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA256.golden b/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA256.golden
@@ -4,11 +4,12 @@ Hash: SHA256
 {"One":1,"Two":2}
 -----BEGIN PGP SIGNATURE-----
 
-wsBcBAEBCAAQBQJZr0CRCRCiDCfuf/e6hAAArhkIAAujKcRwzPBq5HjURqDYzQBL
-YTH9nviKUedWM8x3nyS9RcnMNAOp6VravVhC/8m4xk+VR/PbKwXAAiGsRIc27X6e
-vgkScVNPAm+rriXl2kNKlaNVzynqcQk5qCWrDYnWY7T3J9zQWX5I0okwGF4ZJYfc
-pXhN08xu8pEsxB+dZqGKZ6dTRvJXe0vTa9U0OtJE9RjDxmJsa1kpfQSD4MJ4pi4B
-OnBTw0I3O/o8DWPkDwBc5b/U1lEwoGVsa449d5zlVdlPYy0I9ggYqwkloJmRYg6j
-/XQNA8AS3LhcIN7ouladIJbo50TmHIscnbx+j2pZaDm9gPskj9bJbz4mE/ChotY=
-=1yr3
+wsBzBAEBCAAnBQJZr0CRCRCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE
+AACDsAgAnVhR5jTdvrbICFtjKXYxxG8jsbJBpcJeUpI0isA3Js7VAnsrL+Rf/LHh
+Shjckz57TL9MkRFR7ENqPF0m/6DP3+YlrDAGz7pKEfkM7LEkh4D31doHKHF8L3CE
+cWAO3jxJFVf1EFULLGlUiKlav4nVXkbBqevonje75rdOAL/ARhKSy5/pycq1yWSK
+pXVc6uAk5p7KO/nJ8uPef6nCc1NKYaBsTn9nlBpxNSfxbU6nzZChrQJkf/N3Umg2
+yo4WxQFgUMjAAOqYY6G7PexN9I0r8xgvLpwpZ1gx7fxCW0dHv2pNcPHL2TiPDXvU
+jJOEKedUjf9yIaBtbfTt3/nNkJrI/Q==
+=beI9
 -----END PGP SIGNATURE-----
diff --git a/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA384.golden b/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA384.golden
@@ -4,11 +4,12 @@ Hash: SHA384
 {"One":1,"Two":2}
 -----BEGIN PGP SIGNATURE-----
 
-wsBcBAEBCQAQBQJZr0CRCRCiDCfuf/e6hAAAYhwIADH5qbZhWved0t8VxKn8dqmb
-fkLMwHBsAZ9VyYmw5j0ygfTElNPBLTmWhHVIA9BSreZb/5L+GMvHP0ZgL5myPtjo
-oLiNRauU+Y/lgAssWVc0N0jwS9ELZYEHrt2RNKEzFIzo9Toa37lPhw61ETGpMa31
-1mCUDD4DOaq8LXgD9A1eDswwE00Dts/MJWAayxn7uYloaBUugQbLvxukbWup0mR4
-QmxngSaK/ncWmgo2NeXGQN8QfHc9ArVu8k4hjKZ95QSXaQEgBVJiTNje6reqI9CC
-1iUp5Vm4xet1CbRVaGezOm5thqgB0dfdu17N3/SDnBfgtzWRU2yVkVX7wJKjIc0=
-=a1ow
+wsBzBAEBCQAnBQJZr0CRCRCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE
+AACPhQf9FS4rHcUFyNdW543xVtiGUr6pKXJl4xxwmHMn1I6U8gchwCV+CK9a2JAZ
+XP0egSfmvb8M1WqGJf9oRr/Veq6NLwXs2/iMvvL6B4Q9BCNM4uvSUsNnFj/PTKXF
+ReIglB/P2DGZwFr6nRxGiLIzptwgMXyxs6EMwpIiMp5bIgWzwOKPeDMGrWw3WpZ2
+A46tf9p/Gmj0kqs4YmFw/FZacVbqt4Y+3DjmHvjvyNtGN25IpwLcgpvgXqpdJC5w
+1Sq7E+yjZL8Gu7MHv37/nlqkR+xEF/vrbMMRv5n5Jbvoj9Xg+59+Q6HWkNsa7N8d
+Q4mp1nR6o8KWnH0yXwIzmRm22rWHTw==
+=VLVw
 -----END PGP SIGNATURE-----