Merge pull request #51 from chrisccoulson/switch-to-mozilla-pkcs7

Switch from github.com/fullsailor/pkcs7 to go.mozilla.org/pkcs7 Fixes #18
canonical · Apr 22, 2020 · 3c2d1f2 · 3c2d1f2
2 parents 6c7d47d + 195da61
commit 3c2d1f2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/secureboot_policy.go b/secureboot_policy.go
@@ -36,11 +36,12 @@ import (
 
 	"github.com/canonical/go-tpm2"
 	"github.com/chrisccoulson/tcglog-parser"
-	"github.com/fullsailor/pkcs7"
 	"github.com/snapcore/snapd/osutil"
 	"github.com/snapcore/snapd/snap"
 
 	"golang.org/x/xerrors"
+
+	"go.mozilla.org/pkcs7"
 )
 
 const (

diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -20,13 +20,6 @@
 			"revision": "7b0f085a85398d368e10382a21a44ec2226c35b3",
 			"revisionTime": "2020-02-28T14:36:39Z"
 		},
-		{
-			"checksumSHA1": "wHGa5uteRxMMSHJLQZtcBpIIUcw=",
-			"origin": "github.com/chrisccoulson/pkcs7",
-			"path": "github.com/fullsailor/pkcs7",
-			"revision": "9d98ea9f9bc8b4feee8f0d7c5ef8179f85f0e237",
-			"revisionTime": "2019-09-06T18:49:57Z"
-		},
 		{
 			"checksumSHA1": "kmcZh6191ZYy/+G/tIWFZoVEkGs=",
 			"path": "github.com/godbus/dbus",
@@ -217,6 +210,12 @@
 			"revision": "cba748d1244e6861a5e407f7abe90fb2f76b6f80",
 			"revisionTime": "2020-04-20T18:59:55Z"
 		},
+		{
+			"checksumSHA1": "/mphxOFx5uIoQCnt6YtFmmPDBao=",
+			"path": "go.mozilla.org/pkcs7",
+			"revision": "432b2356ecb18209c1cec25680b8a23632794f21",
+			"revisionTime": "2020-01-28T12:03:23Z"
+		},
 		{
 			"checksumSHA1": "zJybXQZcPAht+soLp/ozc9q5teE=",
 			"path": "golang.org/x/crypto/cast5",