Merge pull request #12 from smallstep/herman/use-smallstep-pkcs7

Use the `github.com/smallstep/pkcs7` fork
smallstep · Oct 24, 2023 · aee96d7 · aee96d7
2 parents a149f94 + f795a56
commit aee96d7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/go.mod b/go.mod
@@ -4,13 +4,10 @@ go 1.16
 
 require (
  github.com/go-kit/kit v0.4.0
- go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352
+ github.com/smallstep/pkcs7 v0.0.0-20231024181729-3b98ecc1ca81
 )
 
 require (
  github.com/go-logfmt/logfmt v0.5.1 // indirect
  github.com/go-stack/stack v1.6.0 // indirect
 )
-
-// use github.com/smallstep/pkcs7 fork with patches applied
-replace go.mozilla.org/pkcs7 => github.com/smallstep/pkcs7 v0.0.0-20230615175518-7ce6486b74eb
diff --git a/go.sum b/go.sum
@@ -4,5 +4,5 @@ github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNV
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-stack/stack v1.6.0 h1:MmJCxYVKTJ0SplGKqFVX3SBnmaUhODHZrrFF6jMbpZk=
 github.com/go-stack/stack v1.6.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/smallstep/pkcs7 v0.0.0-20230615175518-7ce6486b74eb h1:wWc8z37baPz2oyusY9BVuM+uPtq6XAOb7qSegevnRs0=
-github.com/smallstep/pkcs7 v0.0.0-20230615175518-7ce6486b74eb/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk=
+github.com/smallstep/pkcs7 v0.0.0-20231024181729-3b98ecc1ca81 h1:B6cED3iLJTgxpdh4tuqByDjRRKan2EvtnOfHr2zHJVg=
+github.com/smallstep/pkcs7 v0.0.0-20231024181729-3b98ecc1ca81/go.mod h1:SoUAr/4M46rZ3WaLstHxGhLEgoYIDRqxQEXLOmOEB0Y=
diff --git a/scep.go b/scep.go
@@ -15,7 +15,7 @@ import (
  "fmt"
 
  "github.com/go-kit/kit/log/level"
- "go.mozilla.org/pkcs7"
+ "github.com/smallstep/pkcs7"
 
  "github.com/smallstep/scep/cryptoutil"
  "github.com/smallstep/scep/x509util"