From 7d1546f4655d67ffc8f03ef3aac9d6f08fec1eb6 Mon Sep 17 00:00:00 2001 From: Durand Fabrice Date: Thu, 13 May 2021 16:34:38 -0400 Subject: [PATCH] Use inverse-inc/scep lib --- go/caddy/pfpki/models/models.go | 2 +- go/caddy/pfpki/scep/scep.go | 6 +++--- go/go.mod | 3 +-- go/go.sum | 17 +++-------------- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/go/caddy/pfpki/models/models.go b/go/caddy/pfpki/models/models.go index af84fce79301..3a3c9430a779 100644 --- a/go/caddy/pfpki/models/models.go +++ b/go/caddy/pfpki/models/models.go @@ -20,7 +20,7 @@ import ( "strconv" "strings" - "github.com/fdurand/scep/scep" + "github.com/inverse-inc/scep/scep" "github.com/knq/pemutil" "context" diff --git a/go/caddy/pfpki/scep/scep.go b/go/caddy/pfpki/scep/scep.go index 77ed7a2d74a0..5a1033ae45be 100644 --- a/go/caddy/pfpki/scep/scep.go +++ b/go/caddy/pfpki/scep/scep.go @@ -4,9 +4,9 @@ import ( "net/http" "os" - "github.com/fdurand/scep/csrverifier" - scepdepot "github.com/fdurand/scep/depot" - scepserver "github.com/fdurand/scep/server" + "github.com/inverse-inc/scep/csrverifier" + scepdepot "github.com/inverse-inc/scep/depot" + scepserver "github.com/inverse-inc/scep/server" kitlog "github.com/go-kit/kit/log" kitloglevel "github.com/go-kit/kit/log/level" "github.com/gorilla/mux" diff --git a/go/go.mod b/go/go.mod index 1e560d2f7fa3..66e783b4c02e 100644 --- a/go/go.mod +++ b/go/go.mod @@ -27,7 +27,6 @@ require ( github.com/fatih/structs v1.1.0 // indirect github.com/fdurand/arp v0.0.0-20180807174648-27b38d3af1be github.com/fdurand/go-cache v0.0.0-20180104143916-cf0198ac7d92 - github.com/fdurand/scep v1.0.1-0.20210510133821-f0adfbeb1820 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 github.com/gavv/httpexpect/v2 v2.1.0 github.com/gdey/jsonpath v0.0.0-20151203210429-124c978a1ffc @@ -60,7 +59,7 @@ require ( github.com/inverse-inc/dhcp4 v0.0.0-20200625173842-2c4d1e50d7ca github.com/inverse-inc/go-ipset v0.0.0-20190925174109-4d5749cc4aa6 github.com/inverse-inc/go-radius v0.0.0-20201019132414-82756e2d8d47 - github.com/inverse-inc/scep v0.0.0-20210120201805-eb98f5654ee4 + github.com/inverse-inc/scep v0.0.0-20210513203155-0afeb79ee054 github.com/jcuga/golongpoll v1.1.0 github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a github.com/jinzhu/gorm v1.9.16 diff --git a/go/go.sum b/go/go.sum index a7d8e5f67be5..cb74c7689880 100644 --- a/go/go.sum +++ b/go/go.sum @@ -154,20 +154,6 @@ github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga github.com/fdurand/arp v0.0.0-20180807174648-27b38d3af1be/go.mod h1:XLQwuRqf7f3RjNreAmdPASlBU6/juBaoMzI93a7De1s= github.com/fdurand/go-cache v0.0.0-20180104143916-cf0198ac7d92/go.mod h1:v+JY1cLdRxXdjkw/PMyO810oIdqhpXxnOBf8xxWyewQ= github.com/fdurand/ietf-cms v0.1.1-0.20210505133910-ac94c128ae8f/go.mod h1:qVQX5uRdIZMwx8I9EeRmfUEN+VbStGz13ZX50BoEbyY= -github.com/fdurand/pkcs7 v0.0.0-20210506123158-4334f94dbc4b h1:VxDtlFwjR7uVgxNVY37rKPgXXVLz1/r7iNaWeqtFwRA= -github.com/fdurand/pkcs7 v0.0.0-20210506123158-4334f94dbc4b/go.mod h1:rE1r2nTFkcPJymxScEHWRJAdD9Ofo2OyybMyS9b96aE= -github.com/fdurand/scep v1.0.1-0.20210506190004-8417052b4399 h1:PH3/uab5j/mfiZzQyx8yyZvEfQwJHxGE9EJtvUclrQw= -github.com/fdurand/scep v1.0.1-0.20210506190004-8417052b4399/go.mod h1:ajxeJjc5Ju30du1pMgiXdin2i1BNstGicvTWlKO2dQw= -github.com/fdurand/scep v1.0.1-0.20210506190853-bb9ea17e3cc8 h1:C/h2vn1RoHtI811w4nP6IqlDaQb6M80jGU+RsOtzNso= -github.com/fdurand/scep v1.0.1-0.20210506190853-bb9ea17e3cc8/go.mod h1:ajxeJjc5Ju30du1pMgiXdin2i1BNstGicvTWlKO2dQw= -github.com/fdurand/scep v1.0.1-0.20210506191837-ce5cb7a75777 h1:t6nl37egs6Ejp0Q8fbwXCwtRN11SUNW772/dto6Dm0Y= -github.com/fdurand/scep v1.0.1-0.20210506191837-ce5cb7a75777/go.mod h1:ajxeJjc5Ju30du1pMgiXdin2i1BNstGicvTWlKO2dQw= -github.com/fdurand/scep v1.0.1-0.20210506192603-d6680c98fea5 h1:5Nkhk1GIRXYXvKPVT3NTsIMbkfglDJP2L99Nfg3FRCQ= -github.com/fdurand/scep v1.0.1-0.20210506192603-d6680c98fea5/go.mod h1:ajxeJjc5Ju30du1pMgiXdin2i1BNstGicvTWlKO2dQw= -github.com/fdurand/scep v1.0.1-0.20210510130826-75b04bcf8256 h1:zy9YMEoeDd2wx89Gf6bkqLZYzdqTZqH8Rp3Nb04WR2k= -github.com/fdurand/scep v1.0.1-0.20210510130826-75b04bcf8256/go.mod h1:ajxeJjc5Ju30du1pMgiXdin2i1BNstGicvTWlKO2dQw= -github.com/fdurand/scep v1.0.1-0.20210510133821-f0adfbeb1820 h1:JyeJftjzsonVp1FJ3ys1euglRbCt6As1kKuw7sh7jUs= -github.com/fdurand/scep v1.0.1-0.20210510133821-f0adfbeb1820/go.mod h1:ajxeJjc5Ju30du1pMgiXdin2i1BNstGicvTWlKO2dQw= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk= @@ -336,7 +322,10 @@ github.com/inverse-inc/go-ipset v0.0.0-20190925174109-4d5749cc4aa6/go.mod h1:unv github.com/inverse-inc/go-radius v0.0.0-20201019132414-82756e2d8d47/go.mod h1:IQmy9DslBZ9lU4/y/MphJ9oY//4r9A9wQwqOjjLmBso= github.com/inverse-inc/pkcs7 v0.0.0-20210120195334-f839fdbb1f84/go.mod h1:adBgAyadl5D9Mz9rhkQyzZpwcUK9eXdKslXH4oImbB0= github.com/inverse-inc/pkcs7 v0.0.0-20210314004602-f33daade6c53/go.mod h1:adBgAyadl5D9Mz9rhkQyzZpwcUK9eXdKslXH4oImbB0= +github.com/inverse-inc/pkcs7 v0.0.0-20210506124822-140ab7b963b3/go.mod h1:adBgAyadl5D9Mz9rhkQyzZpwcUK9eXdKslXH4oImbB0= github.com/inverse-inc/scep v0.0.0-20210120201805-eb98f5654ee4/go.mod h1:bcHlFB5I8JqSU5Lqt+NatfA9y64T2fFt05QSFOEFJGI= +github.com/inverse-inc/scep v0.0.0-20210513203155-0afeb79ee054 h1:4a2mcGgMp+o+eOIezaceGFXVq00Np1RL52g93xiEAfg= +github.com/inverse-inc/scep v0.0.0-20210513203155-0afeb79ee054/go.mod h1:gk824OzLdCFRAvk4Je/hPXxbmET1WPvLXEGVhpv8c5g= github.com/jcuga/golongpoll v1.1.0/go.mod h1:sM63poxLraGZiLM83pQwKL3GbcPxWaxWcD7Hj94CcBc= github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8= github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o=