Update back to the sha256 branch of pkcs7 (#493)

Gopkg.lock

@@ -2,124 +2,157 @@
 
 
 [[projects]]
+  digest = "1:529387bee72d49e7c1ef9a54371fd3cf951c5e94879ec53f3adc476c1a8efac4"
   name = "github.com/RobotsAndPencils/buford"
   packages = [
     "payload",
     "payload/badge",
-    "push"
+    "push",
   ]
+  pruneopts = ""
   revision = "1589c179b764ddceb204a439d9bf366f04c55f9b"
   version = "v0.12.0"
 
 [[projects]]
+  digest = "1:ed112122ed4a920d944cc99b9d00b0441c11685939c28462c719488d36fe29aa"
   name = "github.com/boltdb/bolt"
   packages = ["."]
+  pruneopts = ""
   revision = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"
   version = "v1.3.1"
 
 [[projects]]
-  branch = "aes_fix"
+  branch = "sha256"
+  digest = "1:debb41ae4e9ca72a773c807c854ce9d6b07973eac5e5de923e12bcf37cc1bc56"
   name = "github.com/fullsailor/pkcs7"
   packages = [
     ".",
-    "internal/x509util"
+    "internal/x509util",
   ]
-  revision = "43a5f00f86940533f35c4a3d8b0fe8fe9b874d4b"
+  pruneopts = ""
+  revision = "36585635cb64c53e0f176795edb64ebd7482d716"
   source = "github.com/groob/pkcs7"
 
 [[projects]]
   branch = "master"
+  digest = "1:3e475864c53cf4225f5c050640fca1aef1157f4208752c92cc01a1b430e759f7"
   name = "github.com/garyburd/go-oauth"
   packages = ["oauth"]
+  pruneopts = ""
   revision = "bca2e7f09a178fd36b034107a00e2323bca6a82e"
 
 [[projects]]
+  digest = "1:684664f6d28c17faefd0e9824ccaae8a673c25b4fad17d2659c1ff36c6fe1c81"
   name = "github.com/go-kit/kit"
   packages = [
     "auth/basic",
     "endpoint",
     "log",
     "log/level",
-    "transport/http"
+    "transport/http",
   ]
+  pruneopts = ""
   revision = "ca4112baa34cb55091301bdc13b1420a122b1b9e"
   version = "v0.7.0"
 
 [[projects]]
+  digest = "1:6a4a01d58b227c4b6b11111b9f172ec5c17682b82724e58e6daf3f19f4faccd8"
   name = "github.com/go-logfmt/logfmt"
   packages = ["."]
+  pruneopts = ""
   revision = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"
   version = "v0.3.0"
 
 [[projects]]
+  digest = "1:9ca737b471693542351e112c9e86be9bf7385e42256893a09ecb2a98e2036f74"
   name = "github.com/go-stack/stack"
   packages = ["."]
+  pruneopts = ""
   revision = "259ab82a6cad3992b4e21ff5cac294ccb06474bc"
   version = "v1.7.0"
 
 [[projects]]
+  digest = "1:0a3f6a0c68ab8f3d455f8892295503b179e571b7fefe47cc6c556405d1f83411"
   name = "github.com/gogo/protobuf"
   packages = ["proto"]
+  pruneopts = ""
   revision = "1adfc126b41513cc696b209667c8656ea7aac67c"
   version = "v1.0.0"
 
 [[projects]]
+  digest = "1:f958a1c137db276e52f0b50efee41a1a389dcdded59a69711f3e872757dab34b"
   name = "github.com/golang/protobuf"
   packages = ["proto"]
+  pruneopts = ""
   revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265"
   version = "v1.1.0"
 
 [[projects]]
+  digest = "1:dbbeb8ddb0be949954c8157ee8439c2adfd8dc1c9510eb44a6e58cb68c3dce28"
   name = "github.com/gorilla/context"
   packages = ["."]
+  pruneopts = ""
   revision = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"
   version = "v1.1.1"
 
 [[projects]]
+  digest = "1:c2c8666b4836c81a1d247bdf21c6a6fc1ab586538ab56f74437c2e0df5c375e1"
   name = "github.com/gorilla/mux"
   packages = ["."]
+  pruneopts = ""
   revision = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"
   version = "v1.6.2"
 
 [[projects]]
   branch = "master"
+  digest = "1:81927b16db0e4c8ad868af18e9afa8dfb05aa847801ba00f301a2f8e9f099752"
   name = "github.com/groob/finalizer"
   packages = [
     ".",
-    "logutil"
+    "logutil",
   ]
+  pruneopts = ""
   revision = "4c2ed49aabdaa038f247d72d183e410757cdbe9c"
 
 [[projects]]
   branch = "master"
+  digest = "1:28b14d89d538b4938a493263dbf05a45e45bb2de0914da77f794ae9e47fe20dd"
   name = "github.com/groob/plist"
   packages = ["."]
+  pruneopts = ""
   revision = "dd56909aee38bb3860460e3e1ca8a4270c04ce15"
 
 [[projects]]
   branch = "master"
+  digest = "1:1ed9eeebdf24aadfbca57eb50e6455bd1d2474525e0f0d4454de8c8e9bc7ee9a"
   name = "github.com/kr/logfmt"
   packages = ["."]
+  pruneopts = ""
   revision = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0"
 
 [[projects]]
   branch = "master"
+  digest = "1:ebfa7825df91ac4d456c0398759d08bdc9d36f394916dc0423db4033cb7ef525"
   name = "github.com/micromdm/dep"
   packages = ["."]
+  pruneopts = ""
   revision = "03ff93db459fe3baf80b2d1f4acb668a92c5a40e"
 
 [[projects]]
   branch = "master"
+  digest = "1:748a12b64ea1763f91beed763fc79194002ffe1629fd82d139b262eb7ba03f87"
   name = "github.com/micromdm/go4"
   packages = [
     "env",
     "httputil",
-    "version"
+    "version",
   ]
+  pruneopts = ""
   revision = "deded5397014104c618443dde9408a94c8232e21"
 
 [[projects]]
   branch = "master"
+  digest = "1:ab4d4fc9bef11f4eff070854f9e55e26c649e8e2efecfafa836b74acf450e529"
   name = "github.com/micromdm/scep"
   packages = [
     "challenge",
@@ -128,53 +161,65 @@
     "depot",
     "depot/bolt",
     "scep",
-    "server"
+    "server",
   ]
+  pruneopts = ""
   revision = "528937a33139b55852ba3d2b8944dce7b3261404"
 
 [[projects]]
+  digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca"
   name = "github.com/pkg/errors"
   packages = ["."]
+  pruneopts = ""
   revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
   version = "v0.8.0"
 
 [[projects]]
+  digest = "1:7f569d906bdd20d906b606415b7d794f798f91a62fcfb6a4daa6d50690fb7a3f"
   name = "github.com/satori/go.uuid"
   packages = ["."]
+  pruneopts = ""
   revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
   version = "v1.2.0"
 
 [[projects]]
   branch = "master"
+  digest = "1:dd91a21c74644977aae2cefe158ced9c2f56d7e8726580fc80481740a4e4b841"
   name = "golang.org/x/crypto"
   packages = [
     "acme",
     "acme/autocert",
     "pbkdf2",
     "pkcs12",
-    "pkcs12/internal/rc2"
+    "pkcs12/internal/rc2",
   ]
+  pruneopts = ""
   revision = "fd5f17ee729917fcb39f16421460212d917a0813"
 
 [[projects]]
   branch = "master"
+  digest = "1:5dc6753986b9eeba4abdf05dedc5ba06bb52dad43cc8aad35ffb42bb7adfa68f"
   name = "golang.org/x/net"
   packages = [
     "context",
     "http/httpguts",
     "http2",
     "http2/hpack",
-    "idna"
+    "idna",
   ]
+  pruneopts = ""
   revision = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196"
 
 [[projects]]
   branch = "master"
+  digest = "1:14ef7df419735d494ee96b2cbc653f4209bd6634125bb66a63c4bcf5f5ab6bf3"
   name = "golang.org/x/sys"
   packages = ["unix"]
+  pruneopts = ""
   revision = "8883426083c04a2627e6e59d84d5f6fb63d16c91"
 
 [[projects]]
+  digest = "1:5acd3512b047305d49e8763eef7ba423901e85d5dd2fd1e71778a0ea8de10bd4"
   name = "golang.org/x/text"
   packages = [
     "collate",
@@ -190,14 +235,43 @@
     "unicode/bidi",
     "unicode/cldr",
     "unicode/norm",
-    "unicode/rangetable"
+    "unicode/rangetable",
   ]
+  pruneopts = ""
   revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
   version = "v0.3.0"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "ceca2893e295b61c0074ae5ea408660e76a3dd56f93603a11ecc8772c00f8940"
+  input-imports = [
+    "github.com/RobotsAndPencils/buford/payload",
+    "github.com/RobotsAndPencils/buford/push",
+    "github.com/boltdb/bolt",
+    "github.com/fullsailor/pkcs7",
+    "github.com/go-kit/kit/auth/basic",
+    "github.com/go-kit/kit/endpoint",
+    "github.com/go-kit/kit/log",
+    "github.com/go-kit/kit/log/level",
+    "github.com/go-kit/kit/transport/http",
+    "github.com/gogo/protobuf/proto",
+    "github.com/golang/protobuf/proto",
+    "github.com/gorilla/mux",
+    "github.com/groob/finalizer/logutil",
+    "github.com/groob/plist",
+    "github.com/micromdm/dep",
+    "github.com/micromdm/go4/env",
+    "github.com/micromdm/go4/httputil",
+    "github.com/micromdm/go4/version",
+    "github.com/micromdm/scep/depot/bolt",
+    "github.com/micromdm/scep/server",
+    "github.com/pkg/errors",
+    "github.com/satori/go.uuid",
+    "golang.org/x/crypto/acme/autocert",
+    "golang.org/x/crypto/pbkdf2",
+    "golang.org/x/crypto/pkcs12",
+    "golang.org/x/net/context",
+    "golang.org/x/net/http2",
+  ]
   solver-name = "gps-cdcl"
   solver-version = 1

Gopkg.toml

@@ -31,6 +31,6 @@
   branch = "master"
 
 [[override]]
-  branch = "aes_fix"
+  branch = "sha256"
   name = "github.com/fullsailor/pkcs7"
   source = "github.com/groob/pkcs7"