From 9a6cc2d3ff347f0137b55f9c849c78d2fc48d909 Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Tue, 4 Feb 2020 22:06:41 +0000 Subject: [PATCH] Tidy dependencies --- v8/client/ASExchange.go | 2 +- v8/config/hosts.go | 2 +- v8/crypto/rfc3962/encryption.go | 2 +- v8/crypto/rfc8009/encryption.go | 2 +- v8/examples/httpServer.go | 3 +-- v8/go.mod | 4 ++-- v8/go.sum | 11 +++++------ 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/v8/client/ASExchange.go b/v8/client/ASExchange.go index 499e22de..e3ef22c8 100644 --- a/v8/client/ASExchange.go +++ b/v8/client/ASExchange.go @@ -86,7 +86,7 @@ func setPAData(cl *Client, krberr *messages.KRBError, ASReq *messages.ASReq) err var et etype.EType var err error var key types.EncryptionKey - kvno := 1 + var kvno int if krberr == nil { // This is not in response to an error from the KDC. It is preemptive or renewal // There is no KRB Error that tells us the etype to use diff --git a/v8/config/hosts.go b/v8/config/hosts.go index 8662fd8c..3f22c70c 100644 --- a/v8/config/hosts.go +++ b/v8/config/hosts.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/jcmturner/dnsutils" + "github.com/jcmturner/dnsutils/v2" ) // GetKDCs returns the count of KDCs available and a map of KDC host names keyed on preference order. diff --git a/v8/crypto/rfc3962/encryption.go b/v8/crypto/rfc3962/encryption.go index b151b70d..5ff89e85 100644 --- a/v8/crypto/rfc3962/encryption.go +++ b/v8/crypto/rfc3962/encryption.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/jcmturner/aescts" + "github.com/jcmturner/aescts/v2" "github.com/jcmturner/gokrb5/v8/crypto/common" "github.com/jcmturner/gokrb5/v8/crypto/etype" ) diff --git a/v8/crypto/rfc8009/encryption.go b/v8/crypto/rfc8009/encryption.go index 12e427fe..bb6f9795 100644 --- a/v8/crypto/rfc8009/encryption.go +++ b/v8/crypto/rfc8009/encryption.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - "github.com/jcmturner/aescts" + "github.com/jcmturner/aescts/v2" "github.com/jcmturner/gokrb5/v8/crypto/common" "github.com/jcmturner/gokrb5/v8/crypto/etype" "github.com/jcmturner/gokrb5/v8/iana/etypeID" diff --git a/v8/examples/httpServer.go b/v8/examples/httpServer.go index b6caadfc..1b7d416a 100644 --- a/v8/examples/httpServer.go +++ b/v8/examples/httpServer.go @@ -15,7 +15,6 @@ import ( "github.com/jcmturner/gokrb5/v8/service" "github.com/jcmturner/gokrb5/v8/spnego" "github.com/jcmturner/gokrb5/v8/test/testdata" - "github.com/pkg/errors" ) const ( @@ -86,7 +85,7 @@ func (smgr SessionMgr) Get(r *http.Request, k string) ([]byte, error) { return nil, err } if s == nil { - return nil, errors.New("nil session") + return nil, error.New("nil session") } b, ok := s.Values[k].([]byte) if !ok { diff --git a/v8/go.mod b/v8/go.mod index caed701b..b2f5d8ad 100644 --- a/v8/go.mod +++ b/v8/go.mod @@ -5,8 +5,8 @@ go 1.13 require ( github.com/gorilla/sessions v1.2.0 github.com/hashicorp/go-uuid v1.0.2 - github.com/jcmturner/aescts v1.0.1 - github.com/jcmturner/dnsutils v1.0.1 + github.com/jcmturner/aescts/v2 v2.0.0 + github.com/jcmturner/dnsutils/v2 v2.0.0 github.com/jcmturner/gofork v1.0.0 github.com/jcmturner/goidentity/v6 v6.0.1 github.com/jcmturner/rpc/v2 v2.0.2 diff --git a/v8/go.sum b/v8/go.sum index 2f735155..12624e3e 100644 --- a/v8/go.sum +++ b/v8/go.sum @@ -6,16 +6,14 @@ github.com/gorilla/sessions v1.2.0 h1:S7P+1Hm5V/AT9cjEcUD5uDaQSX0OE577aCXgoaKpYb github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/jcmturner/aescts v1.0.1 h1:5jhUSHbHSZjQeWFY//Lv8dpP/O3sMDOxrGV/IfCqh44= -github.com/jcmturner/aescts v1.0.1/go.mod h1:k9gJoDUf1GH5r2IBtBjwjDCoLELYxOcEhitdP8RL7qQ= -github.com/jcmturner/dnsutils v1.0.1 h1:zkF8SbVatbr5LGrvcPSes62SV68lASVv6+x9wo2De+w= -github.com/jcmturner/dnsutils v1.0.1/go.mod h1:tqMo38L01jO8AKxT0S9OQVlGZu3dkEt+z5CA+LOhwB0= +github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= +github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= +github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= +github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= github.com/jcmturner/gofork v1.0.0 h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8= github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= -github.com/jcmturner/goidentity v6.0.1+incompatible h1:I+jJ9JbbrqUAiMB8sNLXlginFJ2lPrxst/N3kb67Dko= github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o= github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= -github.com/jcmturner/rpc v2.0.2+incompatible h1:GyRUpVSWVhLISk7Q5rtb6kmejBV4mgO8Q6eR4l6pDF8= github.com/jcmturner/rpc/v2 v2.0.2 h1:gMB4IwRXYsWw4Bc6o/az2HJgFUA1ffSh90i26ZJ6Xl0= github.com/jcmturner/rpc/v2 v2.0.2/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -32,6 +30,7 @@ golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=