From 808b71675a9dd4771661de9fccdeab0be8f7f4b4 Mon Sep 17 00:00:00 2001 From: Adam Hughes Date: Mon, 30 Aug 2021 20:02:29 +0000 Subject: [PATCH] build(deps): bump github.com/ProtonMail/go-crypto from v0.0.0-20210428141323-04723f9f07d7 to v0.0.0-20210707164159-52430bf6b52c --- go.mod | 2 +- go.sum | 3 ++- .../testdata/TestApp_Dump/Three.golden | 16 ++++++++-------- .../Group1.golden | 16 ++++++++-------- .../Group2.golden | 16 ++++++++-------- .../Object1.golden | 16 ++++++++-------- .../Object2.golden | 16 ++++++++-------- .../TestSignAndEncodeJSON/DefaultHash.golden | 16 ++++++++-------- .../TestSignAndEncodeJSON/SHA1.golden | 16 ++++++++-------- .../TestSignAndEncodeJSON/SHA224.golden | 16 ++++++++-------- .../TestSignAndEncodeJSON/SHA256.golden | 16 ++++++++-------- .../TestSignAndEncodeJSON/SHA384.golden | 16 ++++++++-------- .../TestSignAndEncodeJSON/SHA512.golden | 16 ++++++++-------- .../Test_command_getDump/Three/out.golden | 16 ++++++++-------- test/images/one-group-signed.sif | Bin 42014 -> 42014 bytes test/images/two-groups-signed.sif | Bin 50007 -> 50007 bytes 16 files changed, 99 insertions(+), 98 deletions(-) diff --git a/go.mod b/go.mod index 0d7ff1a7..ebec66b8 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/sylabs/sif/v2 go 1.17 require ( - github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 + github.com/ProtonMail/go-crypto v0.0.0-20210707164159-52430bf6b52c 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 diff --git a/go.sum b/go.sum index 0b325a11..dc5e8481 100644 --- a/go.sum +++ b/go.sum @@ -42,8 +42,9 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk= github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= -github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 h1:YoJbenK9C67SkzkDfmQuVln04ygHj3vjZfd9FL+GmQQ= github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= +github.com/ProtonMail/go-crypto v0.0.0-20210707164159-52430bf6b52c h1:FP7mMdsXy0ybzar1sJeIcZtaJka0U/ZmLTW4wRpolYk= +github.com/ProtonMail/go-crypto v0.0.0-20210707164159-52430bf6b52c/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= diff --git a/internal/app/siftool/testdata/TestApp_Dump/Three.golden b/internal/app/siftool/testdata/TestApp_Dump/Three.golden index df1f884f..7ee07862 100644 --- a/internal/app/siftool/testdata/TestApp_Dump/Three.golden +++ b/internal/app/siftool/testdata/TestApp_Dump/Three.golden @@ -4,12 +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----- -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 +wsBzBAEBCAAnBQJe+oD0CZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE +AABqVQf/T/TUg/hxphb4RzbJ1r2itG3MzTAZy6cm1E1QClz74pyZ/cYGmV+r95Hx +CFs4s5zr4k2UQlucb1gXnCgxfWcuEHpvURHrnDLWZyMpLLB2lODTcTTqfrKYUxcP +E0XyKkF7Sn3G7VPqlhyr8iFDwEc9zGp4HBchfKhnfafYcBnJx44GtG6Du3h9lHvL +RCNyUEPtrdERxFicrfEXPNrIeszaDUyRaA0AtrGwGwBrbDawt08M2wFCns8atKd1 +VaGVndlpuwD/cyyaPufFSCMiqVygl4hX3b0yhSYZCF8pE7RzUcNi78YTNiWL0bmq +91Ra/IrBGLVleFCngMJqTstHZGgwzw== +=eXva -----END PGP SIGNATURE----- \ No newline at end of file diff --git a/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Group1.golden b/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Group1.golden index 8958a4e0..250405f1 100644 --- a/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Group1.golden +++ b/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Group1.golden @@ -4,12 +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----- -wsBzBAEBCAAnBQJZr0CRCRCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE -AAABRwf/Y0pXd2qpucZaEsX7nISZ/kO9fFpuEhl7L9FoBEmQyCdf4ZwfLazNKYVb -iaFwRYawTVoXfTIfAL16M2dqI0N0TuCggAO6rZ5vxF6Lb5kTP9fDvB371x4dXmC6 -e+rsUDvbjYzqwHdIHFLC/QzKi0kbCCtJ2ansa1d9qlCbgVR4ASkffNHmlfxxzukx -pRh1VXio1oPMao78yzMCYGqTc5O65qD6grigE8gUMVKfArLfkj6l2SgaLEl/jf+H -+Xlj5nt4ljPoRzrEresEOFJ0Vq8TH6M6mk7fL21vyCs9dqwAPmDgni5ZBvds1toV -Jm5mNM3GP05BK2f7Bt0T4/Y9jbqIAw== -=uaMa +wsBzBAEBCAAnBQJZr0CRCZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE +AACEuQf/V/M1scQrG/HOCABbXNLpY36moUWnSu656O192SQb/vciGst0oR6QSj+g +p1D46egKnba0Ab/iGtDg0lHXfAjW2Vj1v/eqWBoh2WE+tK56laVpY+LB3+JLDg1t +H3jo57fA/JASg20rgDi5Wea+RWrCBdBlwR55FUQd8wjwq1F9lymsaLLOJILuJXL7 +vaOrnv2j0cpwjBvyaQVJEdBvynNtE8B6rKCxOYLe1bdkIYgCa7pg2nYXrcPCDJvB +HlpfP0eLJt+ytv4jwnmAsSBLi0JbgQgkFtax4YJalJw9aW7PirQWHwE/gnURjXhI +lndEOYV+0phkX0BTN5safIuiDRqkgQ== +=Y2ed -----END PGP SIGNATURE----- \ No newline at end of file diff --git a/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Group2.golden b/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Group2.golden index 643133d5..e02a9b9b 100644 --- a/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Group2.golden +++ b/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Group2.golden @@ -4,12 +4,12 @@ Hash: SHA256 {"version":1,"header":{"digest":"sha1:ada68a4647c332f3b89905972c28432bf8dfbe91"},"objects":[{"relativeId":0,"descriptorDigest":"sha1:dd56249071ddff775f5aceb0ba4649c291513491","objectDigest":"sha1:5b6f4d388e3bfe2ff34ef90365b35370daa3c4c4"}]} -----BEGIN PGP SIGNATURE----- -wsBzBAEBCAAnBQJZr0CRCRCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE -AACFugf8C8z0FRLXto5L66OeNuYupmxiR2ZQcF0/T1EaqOVvBwdC4MLrgfHTEuM9 -Cc3Ys4LTaDBaKDYVv5dV1VQHSdtlXfs1xaMMLtAd2F/uKhrIGZleqQt1IfDP9PXK -NornRaCTKYmEiG6twG/ZYIBxA8p6UfiKwyRYAMED2sD/yiRCkii69fq6gw+QTTF6 -rmXVnjmKK8UPMdbD+fs1qUahUipwS9LeL39xwvMyIoUxf62Hvk4KTma5D15u04fS -edF86wEp0Qr/WoSBqZwzrHMQMh9u77/qsPRdWa+wTWFoDhfMG7zTgZeJXxH735k8 -dkFaBLOoR3FpOXK4UGr3dyUunto5EQ== -=0Shx +wsBzBAEBCAAnBQJZr0CRCZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE +AABkvgf+LMF6XtGTYDJYqtoVZJGhR6K4/Ra6T/uIWQsrsIiqdtR7RHzjN+63zt00 +ZyqvFaNGfu2AI2a/ze82E1/KEcOVrqr64N2wKsccxn6oI0OSkHVSr57sXaWawyue +IXjvaxXggkmByneuAPYZzRo5j1eTaLR8EB1sg2NCW32t/ZEdCZZ0KUuTq+aLGPwL +OS56NyBI+9Hd3EeTvYMeFhccksdeVolpqFoVsTxKeuOr70mvyN+8B1ZNQ8eCTXtZ +mz2m575y1QX8k5Qi7fJceRUqbfFZMfNxKVhML7MMRlYQCmA/mh8Z6tYNyMUOtbxz +1kY+GLL6Usav4BEMZzzXYGRYUgze3Q== +=f6iR -----END PGP SIGNATURE----- \ No newline at end of file diff --git a/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Object1.golden b/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Object1.golden index 16122c7f..fc6ea2e5 100644 --- a/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Object1.golden +++ b/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Object1.golden @@ -4,12 +4,12 @@ Hash: SHA256 {"version":1,"header":{"digest":"sha1:ada68a4647c332f3b89905972c28432bf8dfbe91"},"objects":[{"relativeId":0,"descriptorDigest":"sha1:2b63769dfb558196043080779cb9c14b5f7f26ae","objectDigest":"sha1:15146b9bf4f1f5f9bf176a398d8c4f0321c63064"}]} -----BEGIN PGP SIGNATURE----- -wsBzBAEBCAAnBQJZr0CRCRCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE -AAC9eAf+KSZL+yE+WtdygjlQAGMZ2HulAfMD7oz2R5z8EBVrkNwqFhiJTENNyC+H -8sFpdhlMXwM9upMuI3zNkBexvt12+1ctYfF/DDOPq19o/wOdwQeKUbLouSBv6tIf -jKdbsygE/9uIUOIZgL6qVHU09v8uP8xE/X8kzqBuYhX2whZZjQxfy8QaslSmzrRo -jJGIVUTiuBw86Uzf88+4ueaAgN+oQkxVivNwvlXjryllcE7MwlFpUndeQiDGnrbd -c3cjkMxIWXZMHAuKo5lkgJxpuvsRB0QWEK8HSAx59R1avlMUIA8+sxeyED7D7y34 -G3FOZNTY5gKJ304nXzwbz4PFZl/y6A== -=G9VS +wsBzBAEBCAAnBQJZr0CRCZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE +AADyKAf/bUiDncyZY6JRoKnlDHtaXgx5SUZhnCrL0f7/V0NiYNIzp0l24eqvT51g +lwOFooNWkd7rwlXz10D3FvWHGPW3YlK/cR03losIA1nmoQT2D5Zwqt/HYCoWjDC8 +YsIy4sOqk8+GzGmEQ+i7bTDz5R127vDahEOebZ+eeS1vblNm0pT2UJHVCC9Nm5+f +WY67c6LrWtGrOQhsRB7ePPzjON27RnL6bmfZS0bZ8mcuVo9dz9EJdX1uJzrgALwu +E5C+Ut9n6kIgUXqxFe40jddJKqcl/xDgGp/hys5DcvBP5kmuV/p9paSAZJT1KvCI +ZjvzQQ1q+9JK9JMDwRpN/aMA/9ommQ== +=+WMD -----END PGP SIGNATURE----- \ No newline at end of file diff --git a/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Object2.golden b/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Object2.golden index 4baf58a2..c8107ffd 100644 --- a/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Object2.golden +++ b/pkg/integrity/testdata/TestGroupSigner_SignWithEntity/Object2.golden @@ -4,12 +4,12 @@ Hash: SHA256 {"version":1,"header":{"digest":"sha1:ada68a4647c332f3b89905972c28432bf8dfbe91"},"objects":[{"relativeId":1,"descriptorDigest":"sha1:253db147368626e683190e6e406c802eb2267697","objectDigest":"sha1:d78f8bb992a56a597f6c7a1fb918bb78271367eb"}]} -----BEGIN PGP SIGNATURE----- -wsBzBAEBCAAnBQJZr0CRCRCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE -AAAJLQf/eEoUKQDgABlyC6v09py6ezG8m3IdSvu1AJVSMQXeuvM0rlh58ZA3juq+ -DsshevYtu5wE3FZ0rak9DKmc6+0GKxYTvs2D7cr/RzeNXGY50sDy1A4M2MZWF5t5 -K1N6tbvVoCE9lrRn5nHpPrXsXOTz1A1jUdqcGmDdaud7lz3oXU57XUUn7J1T2clm -MxPFB1eBYhi1YBndhjij6kjZazlQ011ZupUt54BS9KFhfIiPtYuaO3PmSeWWghnC -LbFSlpKK8Acb0PkOt4VbkirbfsmSKIdbcBWnqNSrP2QrcZsU+cpdfc0GsSDrLNFJ -JpQ8NRxJuXyVnGOeMNA0CFWuJutong== -=3PxI +wsBzBAEBCAAnBQJZr0CRCZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE +AAA8fggAmHTxLq8eAWBp9lbU6d58i0b2GiREe6IZPyVKccmUvPVCRQEtfc11Wary +Ai/Vb5ndHfFPiodNnkxYYlpKemZpa3bYprgXrTI8BRfx0RC0vWFJQnfdokbRXx/P +qH3EDkYF9m3j79lAy/IPs2gi7C6+YB3piPUSdxmsoh0mgNTfubbe4GiKTZON09ZV +c256rg7MlBNxLZoi8DHQINAb9G2nzvtIMJpR6ql11FHCuVfZRhMvMK8+VQmRXsO7 +HYt9/8ImQ4H131GXqyDAe7JoAz0rXjKPCRt6+C7x+s/K10Q1C2AyJrepE9tKIgnt +JL8lHrAUotY5S1w82mktz/wfaQg30w== +=7kh/ -----END PGP SIGNATURE----- \ No newline at end of file diff --git a/pkg/integrity/testdata/TestSignAndEncodeJSON/DefaultHash.golden b/pkg/integrity/testdata/TestSignAndEncodeJSON/DefaultHash.golden index 020cb527..94cf19fe 100644 --- a/pkg/integrity/testdata/TestSignAndEncodeJSON/DefaultHash.golden +++ b/pkg/integrity/testdata/TestSignAndEncodeJSON/DefaultHash.golden @@ -4,12 +4,12 @@ Hash: SHA256 {"One":1,"Two":2} -----BEGIN PGP SIGNATURE----- -wsBzBAEBCAAnBQJZr0CRCRCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE -AACDsAgAnVhR5jTdvrbICFtjKXYxxG8jsbJBpcJeUpI0isA3Js7VAnsrL+Rf/LHh -Shjckz57TL9MkRFR7ENqPF0m/6DP3+YlrDAGz7pKEfkM7LEkh4D31doHKHF8L3CE -cWAO3jxJFVf1EFULLGlUiKlav4nVXkbBqevonje75rdOAL/ARhKSy5/pycq1yWSK -pXVc6uAk5p7KO/nJ8uPef6nCc1NKYaBsTn9nlBpxNSfxbU6nzZChrQJkf/N3Umg2 -yo4WxQFgUMjAAOqYY6G7PexN9I0r8xgvLpwpZ1gx7fxCW0dHv2pNcPHL2TiPDXvU -jJOEKedUjf9yIaBtbfTt3/nNkJrI/Q== -=beI9 +wsBzBAEBCAAnBQJZr0CRCZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE +AABw3Af+JOwZe9vRSBAUbuv0akGte0vmiyBAOOJgMgP8G6PtSVMOuyk87hMs9WyB +Gfgm8st0jkYsCP60lSziNd24cevrqSW+8CnbcWuyhSpl9DBtKnjt/BXc0AturkQA +/8Yn/9XImSYGrcqjJeCWhVBrJTlPaYu8swbXhvDoHvrVG/t6POO4xYumN3Nf8uoY +zP8TtK8L1c2H1sY1MbngL/rVaFapdChQw8XCc280JMqnnjixnqSdjaeVPoQJItjG +m6k2nTUBn7OS9lHYRc9batc38ty13tVSCSd62nvfQILL5YOPqfRtGJzLU0LGMrIO +aJv5oAPI8SaPaFGuFOPxc7oTckNCIw== +=FYE/ -----END PGP SIGNATURE----- \ No newline at end of file diff --git a/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA1.golden b/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA1.golden index 36ff3a50..872a24af 100644 --- a/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA1.golden +++ b/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA1.golden @@ -4,12 +4,12 @@ Hash: SHA1 {"One":1,"Two":2} -----BEGIN PGP SIGNATURE----- -wsBzBAEBAgAnBQJZr0CRCRCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE -AAAH/Af/X3lEca+5YMsUUO+BiRyrCyoV2vMoMkUOJJd4tkzki0yVpIebbaZz+cz+ -gr0a1zleTguFRALIJg4hRWkkH2tYEKdCvUegdFkbSpjI8IvEAHGy686Mf5zUVfrK -on7ITZCytefn0LANug1GtBJYm5QndyFCGqvQSHdn2hQBK0HOtRd19yLWLJgJ1+LX -VTcCLQPIbmslh1zTLtAb7oQ5tuTQhypdbvLDgrN9B6xzyooAkWAcRfuxC1NmZufg -pLi60Qc2M23QHSXfYLrxKSXhJQBrRgom45K/SAlYDfXBnEPr0FxrqgyLYpYDp42l -Nn4VfvbrVdxbl/uVDEyqvdXie5J/Yw== -=qZlS +wsBzBAEBAgAnBQJZr0CRCZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE +AACnHAf+J7rou/ZbPfY+fodtzyIBTrCKyYv4R37Kiu7DQclLfBDvEiRp8ISo6VqE +siGSUapkKCyAzgKcSs3W/A2PFdeI+w5qZ4+Vb/SMjtLCBraKdukNVbsXw8JcE9Mb +mJGFkVvZu5afpNDQqiNAOJnpV4J1+jpnAZAMu7TQs1FmN6/hCwo4GLCtFDwbI8fO +dPna3k1lNB/M0UDiPMhn2qdF6vMWF1m41aQ5CwvCAsMOFZi+3sBA8yZngXJ29fjL +Wng0xaFZPfR/3dEFhlMcqCpM4OFpsVTP5b99GPXUEwaZpwPJuGVUSk7Ck8hfbndQ +pCYg/sAXojQj69Ymc88utJq4GfR7eg== +=EY0t -----END PGP SIGNATURE----- \ No newline at end of file diff --git a/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA224.golden b/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA224.golden index f2fe5afe..e01869bf 100644 --- a/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA224.golden +++ b/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA224.golden @@ -4,12 +4,12 @@ Hash: SHA224 {"One":1,"Two":2} -----BEGIN PGP SIGNATURE----- -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 +wsBzBAEBCwAnBQJZr0CRCZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE +AADZhQf8DDXI6Ac4RQwpb6dWEhSOKiKC/voPS1+NGEvFeZ0XE9aqdXgPxQkT5RSJ +sAG7Hoe8tRRrcagXgcHSGVOnE6tqpL6CITFs6g5MtvlZRxRftpNEHo4xqbUMM1ce +JPBKrg0u4nCARdq3XCQbuUjVJ2R24XojBjfBXsmNzDsiyekYyllpK/mmWouzQSdC +IU1sa6/P0JyA0vYzuYPOAqJgFO/cRzXSDEuqW6I07kIbKCHi1joGYb5xVUofJ+2B +Rt3QnlNrTzMCUxLYE6Rzy0JyzjpjhozY5ldVRkE2NrFkxrgLrItCIMNPjqud7n88 +/DPHuLBdTK6+g6qVMUBLF8QKB5X3yA== +=Npht -----END PGP SIGNATURE----- \ No newline at end of file diff --git a/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA256.golden b/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA256.golden index 020cb527..94cf19fe 100644 --- a/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA256.golden +++ b/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA256.golden @@ -4,12 +4,12 @@ Hash: SHA256 {"One":1,"Two":2} -----BEGIN PGP SIGNATURE----- -wsBzBAEBCAAnBQJZr0CRCRCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE -AACDsAgAnVhR5jTdvrbICFtjKXYxxG8jsbJBpcJeUpI0isA3Js7VAnsrL+Rf/LHh -Shjckz57TL9MkRFR7ENqPF0m/6DP3+YlrDAGz7pKEfkM7LEkh4D31doHKHF8L3CE -cWAO3jxJFVf1EFULLGlUiKlav4nVXkbBqevonje75rdOAL/ARhKSy5/pycq1yWSK -pXVc6uAk5p7KO/nJ8uPef6nCc1NKYaBsTn9nlBpxNSfxbU6nzZChrQJkf/N3Umg2 -yo4WxQFgUMjAAOqYY6G7PexN9I0r8xgvLpwpZ1gx7fxCW0dHv2pNcPHL2TiPDXvU -jJOEKedUjf9yIaBtbfTt3/nNkJrI/Q== -=beI9 +wsBzBAEBCAAnBQJZr0CRCZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE +AABw3Af+JOwZe9vRSBAUbuv0akGte0vmiyBAOOJgMgP8G6PtSVMOuyk87hMs9WyB +Gfgm8st0jkYsCP60lSziNd24cevrqSW+8CnbcWuyhSpl9DBtKnjt/BXc0AturkQA +/8Yn/9XImSYGrcqjJeCWhVBrJTlPaYu8swbXhvDoHvrVG/t6POO4xYumN3Nf8uoY +zP8TtK8L1c2H1sY1MbngL/rVaFapdChQw8XCc280JMqnnjixnqSdjaeVPoQJItjG +m6k2nTUBn7OS9lHYRc9batc38ty13tVSCSd62nvfQILL5YOPqfRtGJzLU0LGMrIO +aJv5oAPI8SaPaFGuFOPxc7oTckNCIw== +=FYE/ -----END PGP SIGNATURE----- \ No newline at end of file diff --git a/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA384.golden b/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA384.golden index 77ef6b88..7269fb4a 100644 --- a/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA384.golden +++ b/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA384.golden @@ -4,12 +4,12 @@ Hash: SHA384 {"One":1,"Two":2} -----BEGIN PGP SIGNATURE----- -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 +wsBzBAEBCQAnBQJZr0CRCZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE +AACoHQgAlRlRxWaxCkiQPFFC8DtsV7GSw6dN4ELFxzMXd6slWhxFOJYnHX2VH1uC +/9/1Wqzvvrv5uha5Fy3dRQT1Zpa802sJU0GorPxv6LIvOEcJ8UMUj2dTQ4traSSW +aPb7+Dyvfsosai2it1dFU25+IFScsCk6xaf8l2mSTZxj/0jjx8lxwKUZaEjKTNNf +uL9U46UmP3w7lN6g+Nk4lz+dqU6lzMCcyJmgekGNl7/1mmOdFxqR/QKgiK5etHzZ +WxIy1yHpV7FLtwGYA6O7vXpw3uktl8Muoc78pU1E1YMibLfygj+VO5RINMyuYb/4 +uGn6I+LJczqFpgSKcnP7/+yRVTOHQg== +=SYuD -----END PGP SIGNATURE----- \ No newline at end of file diff --git a/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA512.golden b/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA512.golden index 8058f730..2bbc6800 100644 --- a/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA512.golden +++ b/pkg/integrity/testdata/TestSignAndEncodeJSON/SHA512.golden @@ -4,12 +4,12 @@ Hash: SHA512 {"One":1,"Two":2} -----BEGIN PGP SIGNATURE----- -wsBzBAEBCgAnBQJZr0CRCRCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE -AADw7Qf/cUVo8BixBjbFWraT7UICtnVBcY9TdRyZVO9w6ffDwFqxwzNEb3MVDdQo -MCf18ThHPBHDEkK4EiDKRg2j7qdybzmOVGqEcbf48lvdPUAFG1lXD22Z5WYNwC0M -2S2gH2B+xgC8lLNqXSVhYHIdT6IHHNaDyo7u24fteuN3oIGSQBSKc+j+FIDHJiZw -JAb3We97GfyaVxxq58vSBJtToMLVKZt1b3WrY50k4FjVoLGA1xJ2PwCYBF/22bU2 -wGyqq1tsujroTp2r31slld8TZg0aVH82OkTrobRfkr9bP9F8Z45ZqYnI4U1fI6P0 -2wiSsnicCt9KPocccaB8wiXJ9KySnw== -=DIGp +wsBzBAEBCgAnBQJZr0CRCZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE +AADw9QgAl3ZD0vCmvxyPHiz3PuQpgEUM17z6msOtYJ8ZxL+uNe1niTeBYShvPxm1 +6VULiYnBEJ4npkHMKqIXUAnHIN9wUD/FO7/JkEW1ttxZSoQKIiJeL7m/C5E/qEG8 +ikFLlhYproo5lN18xf64h9oi2UaZGlF4jLufWflRNemSm/d5hPpns2gvP47L3jF2 +vDZO7VGi4Q5P6zO2Zg4E4tLBWZkH5PxQls5QC13VCu36zOXmEt2TRLeSQ47Y60du +Sp+LFuSpnIC9qJmj6OWabfIvOzLyuoZQpcCjDmYOpxSftrF8b0pFXN/tXdbJzWI5 +dH8EBvdCJ15EWL41hgxyOps9uGAVaw== +=aBQa -----END PGP SIGNATURE----- \ No newline at end of file diff --git a/pkg/siftool/testdata/Test_command_getDump/Three/out.golden b/pkg/siftool/testdata/Test_command_getDump/Three/out.golden index df1f884f..7ee07862 100644 --- a/pkg/siftool/testdata/Test_command_getDump/Three/out.golden +++ b/pkg/siftool/testdata/Test_command_getDump/Three/out.golden @@ -4,12 +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----- -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 +wsBzBAEBCAAnBQJe+oD0CZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE +AABqVQf/T/TUg/hxphb4RzbJ1r2itG3MzTAZy6cm1E1QClz74pyZ/cYGmV+r95Hx +CFs4s5zr4k2UQlucb1gXnCgxfWcuEHpvURHrnDLWZyMpLLB2lODTcTTqfrKYUxcP +E0XyKkF7Sn3G7VPqlhyr8iFDwEc9zGp4HBchfKhnfafYcBnJx44GtG6Du3h9lHvL +RCNyUEPtrdERxFicrfEXPNrIeszaDUyRaA0AtrGwGwBrbDawt08M2wFCns8atKd1 +VaGVndlpuwD/cyyaPufFSCMiqVygl4hX3b0yhSYZCF8pE7RzUcNi78YTNiWL0bmq +91Ra/IrBGLVleFCngMJqTstHZGgwzw== +=eXva -----END PGP SIGNATURE----- \ No newline at end of file diff --git a/test/images/one-group-signed.sif b/test/images/one-group-signed.sif index 217acf80d7ce74ff33a02df39bced11014db869a..c36b0f99482b81685bef3a8145df42d237b40b1e 100755 GIT binary patch delta 416 zcmWm6J#wl*007{bRBtHW8SFC|K#5>sA%BYs1aU#2TUHksk%0w-rSTByQ+R?LBge{n z-vPd_pO>$nm+$NIZ=w~tMtZ_umbr>P*>m<#oA5w*$ipDx^RdoT$)D1lNasZd7S04W z30vZuXov@`oMfqH36EoN3t#E#-5NQ~Y^C;nqSAF99LgT2Vir|eHj)$W4XeHfzC|nD zJ|)blZCjm}A3DSkHiYiuV8q^oGlYokucmyg7C;WYrpy^t3R52pyqZ8QSt`!SKCcKO zF;=VHC`q6LOTAy@tJ1pLoUgeoFuabQ4SzHXOo007XctfpAZ8QfD-O=1LGxM&-~$L0?r>{=*B~2pM@vLF>I*l{mlH8Br;MLe|j&k4oGT9EEtIk6w zLw#%zJZ4AWI>4eW_R}g^=JuT{{l!p49gK!$qJE56*s4*r2_TsG8_kM?8obNpOJ!3L zvTJx9*-K~D&*M%?bxkA-p1V!&69A+_7IE$TENEou#g1KwK-$XF2}#hBs0ko4u}E3t zIr%=;)eFhm-t_Jm8k|uznXsq99Gd9OdgTRvM83dKG&z^%k^`jE)QVF>cZRvRe(tGX zUTQO%$Qj@lTn7)FkHp*QqusVrHBH&>%;A+LKgkjTg|Nc{LW#($`EHE@1 JhM)NH=NE~0h^znr diff --git a/test/images/two-groups-signed.sif b/test/images/two-groups-signed.sif index 2800dcc100fcb9dee8a34ec4956b31704b20f665..864860d8a87997e93e3e73ca6b610b53463b6115 100755 GIT binary patch delta 828 zcmZ|MIntA00D$4b#$iT};QW2YVN1S1@fWNg`x3(1u?GktKuCZl-G2cu;;1+95MD>^ z^*zAbJip%F{d#-%wfXij;wqjirUK2uiH*N3-(H@~aCj7`hmx|G>y&t=&RCxVPcA&Y zIZM4H+d#NyVJ}DYgV?CbnalJ`05PqRk0%S^U5?m|*flq7a}T!N%53nc(_|&8g~JZd z=0K$+UP+S*=?on8W43cLUqCljdlKg*5}4OlG}A?%r}8|=OE zVf(jU+A^zWDvhOy5rNE8%ax{+QvKaoeUx`n&Qa9Glhbu*!;N0$;waQyb7vU~BsEsX zQc=0BvhvbkJPpG}x{96i0R~LF;Ps@_V@J4Ty`t3CA2B}*Cx{L{3>SYyX=VcK$Pm&w r>ZDqXRmb%ygb0=`Pv`1BQwH5Xr6sJR3jK2!uwU!^1ZXjTubR*<4^RqFU_@_7Hm= z&F0c~fG_y}etvxU`SIoN`r99SP^uuCG9u**<@$B~_VNUDBj@rha3>+xYF`WIb#ba> zH#Vh$)GB5tu3=Zoc1L8f&Zt;EA+^9=5+tK?#+I!ZTna}q4Rl?&3{Ae~eGow^ntYF8 zp`foMk?pxR0uK&TU(Rkn$R~E+D|p1P;p2&EeG?+L>K08YBvz0cBSoNotH_z?3smOE z>)mKHFz*j?BHZVS-@^EQidOh}MQg~w*!ducNh>S#;CF*JW-um)8{?l(VYkMqHER}hWWCWQPGu;$T(3)?y^rNnO|BSoL*^N_q*l(lAvvSW&}5fhbRj)f=WYf-_PQoT z<~mUWCkePZ>vMYTTeeWcsrcNmL1j5%>>~-rdd+e`Y z(|q+MFoKtZW%zRVb@$`9fByXb@%w+-sPi;uA}DHPEq>G7R|X1NdaHqSZR9Cn_7*4A zhy*+DxF!~9Ib`_WLYfl#;#hu$ArF8^8~Hw2fR1>QnP@nQ-5B=>7Ax0Vsamc?4sgOv zs6-*QC1SVnQFnl1Ogk=~SP|U>J92OBAUC*y2i}QZ@U)j`ojaDvxnwTPmhTi&x#e46 zF_LK?%`UG*V|UrLsC6)o9X8(0=W1q9LlkT9S=O<=6Q|$o4J^<`Q)TXKo~QH_a$Q0` zuG!XE3~P-Q|BUSbyHjx`In7UocRB<`4=q|4wwJ{