Преглед на файлове

major version increment to v6

Jonathan Turner преди 7 години
родител
ревизия
91e2843b95
променени са 97 файла, в които са добавени 358 реда и са изтрити 358 реда
  1. 1 1
      .travis.yml
  2. 7 7
      README.md
  3. 8 8
      client/ASExchange.go
  4. 4 4
      client/TGSExchange.go
  5. 2 2
      client/cache.go
  6. 10 10
      client/client.go
  7. 4 4
      client/client_ad_integration_test.go
  8. 3 3
      client/client_dns_test.go
  9. 5 5
      client/client_integration_test.go
  10. 5 5
      client/http.go
  11. 2 2
      client/network.go
  12. 2 2
      client/passwd.go
  13. 4 4
      client/session.go
  14. 1 1
      config/krb5conf.go
  15. 1 1
      credentials/ccache.go
  16. 3 3
      credentials/ccache_integration_test.go
  17. 3 3
      credentials/ccache_test.go
  18. 3 3
      credentials/credentials.go
  19. 5 5
      crypto/aes128-cts-hmac-sha1-96.go
  20. 2 2
      crypto/aes128-cts-hmac-sha1-96_test.go
  21. 4 4
      crypto/aes128-cts-hmac-sha256-128.go
  22. 2 2
      crypto/aes128-cts-hmac-sha256-128_test.go
  23. 5 5
      crypto/aes256-cts-hmac-sha1-96.go
  24. 2 2
      crypto/aes256-cts-hmac-sha1-96_test.go
  25. 4 4
      crypto/aes256-cts-hmac-sha384-192.go
  26. 2 2
      crypto/aes256-cts-hmac-sha384-192_test.go
  27. 1 1
      crypto/common/common.go
  28. 5 5
      crypto/crypto.go
  29. 4 4
      crypto/des3-cbc-sha1-kd.go
  30. 4 4
      crypto/rc4-hmac.go
  31. 2 2
      crypto/rfc3961/encryption.go
  32. 1 1
      crypto/rfc3961/keyDerivation.go
  33. 2 2
      crypto/rfc3962/encryption.go
  34. 1 1
      crypto/rfc3962/keyDerivation.go
  35. 1 1
      crypto/rfc4757/encryption.go
  36. 3 3
      crypto/rfc8009/encryption.go
  37. 2 2
      crypto/rfc8009/keyDerivation.go
  38. 6 6
      examples/example-AD.go
  39. 5 5
      examples/example.go
  40. 4 4
      examples/httpClient.go
  41. 4 4
      examples/httpServer.go
  42. 3 3
      gssapi/NegotiationToken.go
  43. 3 3
      gssapi/WrapToken.go
  44. 2 2
      gssapi/WrapToken_test.go
  45. 4 4
      gssapi/gssapi.go
  46. 6 6
      gssapi/krb5Token.go
  47. 5 5
      gssapi/krb5Token_test.go
  48. 1 1
      kadmin/changepasswddata.go
  49. 3 3
      kadmin/changepasswddata_test.go
  50. 2 2
      kadmin/message.go
  51. 3 3
      kadmin/message_test.go
  52. 4 4
      kadmin/passwd.go
  53. 1 1
      keytab/keytab.go
  54. 1 1
      keytab/keytab_test.go
  55. 4 4
      messages/APRep.go
  56. 3 3
      messages/APRep_test.go
  57. 8 8
      messages/APReq.go
  58. 4 4
      messages/APReq_test.go
  59. 10 10
      messages/KDCRep.go
  60. 8 8
      messages/KDCRep_test.go
  61. 12 12
      messages/KDCReq.go
  62. 6 6
      messages/KDCReq_test.go
  63. 6 6
      messages/KRBCred.go
  64. 5 5
      messages/KRBCred_test.go
  65. 6 6
      messages/KRBError.go
  66. 5 5
      messages/KRBError_test.go
  67. 8 8
      messages/KRBPriv.go
  68. 5 5
      messages/KRBPriv_test.go
  69. 4 4
      messages/KRBSafe.go
  70. 4 4
      messages/KRBSafe_test.go
  71. 11 11
      messages/Ticket.go
  72. 8 8
      messages/Ticket_test.go
  73. 1 1
      pac/client_claims_test.go
  74. 1 1
      pac/client_info_test.go
  75. 3 3
      pac/credentials_info.go
  76. 1 1
      pac/kerb_validation_info_test.go
  77. 3 3
      pac/pac_type.go
  78. 2 2
      pac/pac_type_test.go
  79. 1 1
      pac/signature_data.go
  80. 2 2
      pac/signature_data_test.go
  81. 1 1
      pac/upn_dns_info_test.go
  82. 6 6
      service/APExchange.go
  83. 10 10
      service/APExchange_test.go
  84. 5 5
      service/authenticator.go
  85. 1 1
      service/cache.go
  86. 6 6
      service/http_test.go
  87. 3 3
      types/Authenticator.go
  88. 4 4
      types/Authenticator_test.go
  89. 3 3
      types/AuthorizationData_test.go
  90. 2 2
      types/Cryptosystem_test.go
  91. 1 1
      types/HostAddress.go
  92. 1 1
      types/KerberosFlags_test.go
  93. 1 1
      types/PAData.go
  94. 2 2
      types/PAData_test.go
  95. 1 1
      types/PrincipalName.go
  96. 1 1
      types/PrincipalName_test.go
  97. 2 2
      types/TypedData_test.go

+ 1 - 1
.travis.yml

@@ -7,7 +7,7 @@ go:
   - 1.10.x
   - master
 
-go_import_path: gopkg.in/jcmturner/gokrb5.v5
+go_import_path: gopkg.in/jcmturner/gokrb5.v6
 
 sudo: required
 

+ 7 - 7
README.md

@@ -1,13 +1,13 @@
 # gokrb5
-[![GoDoc](https://godoc.org/gopkg.in/jcmturner/gokrb5.v5?status.svg)](https://godoc.org/gopkg.in/jcmturner/gokrb5.v5) [![Go Report Card](https://goreportcard.com/badge/gopkg.in/jcmturner/gokrb5.v5)](https://goreportcard.com/report/gopkg.in/jcmturner/gokrb5.v5) [![Build Status](https://travis-ci.org/jcmturner/gokrb5.svg?branch=master)](https://travis-ci.org/jcmturner/gokrb5)
+[![GoDoc](https://godoc.org/gopkg.in/jcmturner/gokrb5.v6?status.svg)](https://godoc.org/gopkg.in/jcmturner/gokrb5.v6) [![Go Report Card](https://goreportcard.com/badge/gopkg.in/jcmturner/gokrb5.v6)](https://goreportcard.com/report/gopkg.in/jcmturner/gokrb5.v6) [![Build Status](https://travis-ci.org/jcmturner/gokrb5.svg?branch=master)](https://travis-ci.org/jcmturner/gokrb5)
 
 To get the package, execute:
 ```
-go get -d gopkg.in/jcmturner/gokrb5.v5/...
+go get -d gopkg.in/jcmturner/gokrb5.v6/...
 ```
 To import this package, add the following line to your code:
 ```go
-import "gopkg.in/jcmturner/gokrb5.v5/<sub package>"
+import "gopkg.in/jcmturner/gokrb5.v6/<sub package>"
 ```
 
 ## Features
@@ -54,7 +54,7 @@ If you are interested in contributing to gokrb5, great! Please read the [contrib
 The gokrb5 libraries use the same krb5.conf configuration file format as MIT Kerberos, described [here](https://web.mit.edu/kerberos/krb5-latest/doc/admin/conf_files/krb5_conf.html).
 Config instances can be created by loading from a file path or by passing a string, io.Reader or bufio.Scanner to the relevant method:
 ```go
-import "gopkg.in/jcmturner/gokrb5.v5/config"
+import "gopkg.in/jcmturner/gokrb5.v6/config"
 cfg, err := config.Load("/path/to/config/file")
 cfg, err := config.NewConfigFromString(krb5Str) //String must have appropriate newline separations
 cfg, err := config.NewConfigFromReader(reader)
@@ -63,7 +63,7 @@ cfg, err := config.NewConfigFromScanner(scanner)
 ### Keytab files
 Standard keytab files can be read from a file or from a slice of bytes:
 ```go
-import 	"gopkg.in/jcmturner/gokrb5.v5/keytab"
+import 	"gopkg.in/jcmturner/gokrb5.v6/keytab"
 ktFromFile, err := keytab.Load("/path/to/file.keytab")
 ktFromBytes, err := keytab.Parse(b)
 
@@ -74,7 +74,7 @@ ktFromBytes, err := keytab.Parse(b)
 ### Kerberos Client
 Create a client instance with either a password or a keytab:
 ```go
-import 	"gopkg.in/jcmturner/gokrb5.v5/client"
+import 	"gopkg.in/jcmturner/gokrb5.v6/client"
 cl := client.NewClientWithPassword("username", "REALM.COM", "password")
 cl := client.NewClientWithKeytab("username", "REALM.COM", kt)
 
@@ -231,7 +231,7 @@ if validuser, ok := ctx.Value(service.CTXKeyAuthenticated).(bool); ok && validus
 #### Generic Kerberised Service - Validating Client Details
 To validate the AP_REQ sent by the client on the service side call this method:
 ```go
-import 	"gopkg.in/jcmturner/gokrb5.v5/service"
+import 	"gopkg.in/jcmturner/gokrb5.v6/service"
 var ktprinc string //The SPN of the service to find the key in the keytab.
 var requireHostAddr bool //Whether to force requiring the ticket to contain host addresses to check the client against.
 if ok, creds, err := service.ValidateAPREQ(mt.APReq, kt, ktprinc, r.RemoteAddr, requireHostAddr); ok {

+ 8 - 8
client/ASExchange.go

@@ -1,14 +1,14 @@
 package client
 
 import (
-	"gopkg.in/jcmturner/gokrb5.v5/crypto"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/etype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/errorcode"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/keyusage"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/patype"
-	"gopkg.in/jcmturner/gokrb5.v5/krberror"
-	"gopkg.in/jcmturner/gokrb5.v5/messages"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/etype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/errorcode"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/keyusage"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/patype"
+	"gopkg.in/jcmturner/gokrb5.v6/krberror"
+	"gopkg.in/jcmturner/gokrb5.v6/messages"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 // ASExchange performs an AS exchange for the client to retrieve a TGT.

+ 4 - 4
client/TGSExchange.go

@@ -3,10 +3,10 @@ package client
 import (
 	"time"
 
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v5/krberror"
-	"gopkg.in/jcmturner/gokrb5.v5/messages"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/krberror"
+	"gopkg.in/jcmturner/gokrb5.v6/messages"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 // TGSExchange performs a TGS exchange to retrieve a ticket to the specified SPN.

+ 2 - 2
client/cache.go

@@ -1,8 +1,8 @@
 package client
 
 import (
-	"gopkg.in/jcmturner/gokrb5.v5/messages"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/messages"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 	"strings"
 	"sync"
 	"time"

+ 10 - 10
client/client.go

@@ -5,16 +5,16 @@ import (
 	"errors"
 	"fmt"
 
-	"gopkg.in/jcmturner/gokrb5.v5/config"
-	"gopkg.in/jcmturner/gokrb5.v5/credentials"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/etype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/errorcode"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v5/keytab"
-	"gopkg.in/jcmturner/gokrb5.v5/krberror"
-	"gopkg.in/jcmturner/gokrb5.v5/messages"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/config"
+	"gopkg.in/jcmturner/gokrb5.v6/credentials"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/etype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/errorcode"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/keytab"
+	"gopkg.in/jcmturner/gokrb5.v6/krberror"
+	"gopkg.in/jcmturner/gokrb5.v6/messages"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 // Client side configuration and state.

+ 4 - 4
client/client_ad_integration_test.go

@@ -6,10 +6,10 @@ package client
 import (
 	"encoding/hex"
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/config"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/etypeID"
-	"gopkg.in/jcmturner/gokrb5.v5/keytab"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/config"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v6/keytab"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 	"testing"
 )
 

+ 3 - 3
client/client_dns_test.go

@@ -5,9 +5,9 @@ package client
 import (
 	"encoding/hex"
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/config"
-	"gopkg.in/jcmturner/gokrb5.v5/keytab"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/config"
+	"gopkg.in/jcmturner/gokrb5.v6/keytab"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 	"testing"
 )
 

+ 5 - 5
client/client_integration_test.go

@@ -19,11 +19,11 @@ import (
 	"errors"
 	"fmt"
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/config"
-	"gopkg.in/jcmturner/gokrb5.v5/credentials"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/etypeID"
-	"gopkg.in/jcmturner/gokrb5.v5/keytab"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/config"
+	"gopkg.in/jcmturner/gokrb5.v6/credentials"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v6/keytab"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 	"strings"
 	"sync"
 )

+ 5 - 5
client/http.go

@@ -6,11 +6,11 @@ import (
 	"net/http"
 	"strings"
 
-	"gopkg.in/jcmturner/gokrb5.v5/credentials"
-	"gopkg.in/jcmturner/gokrb5.v5/gssapi"
-	"gopkg.in/jcmturner/gokrb5.v5/krberror"
-	"gopkg.in/jcmturner/gokrb5.v5/messages"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/credentials"
+	"gopkg.in/jcmturner/gokrb5.v6/gssapi"
+	"gopkg.in/jcmturner/gokrb5.v6/krberror"
+	"gopkg.in/jcmturner/gokrb5.v6/messages"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 // SetSPNEGOHeader gets the service ticket and sets it as the SPNEGO authorization header on HTTP request object.

+ 2 - 2
client/network.go

@@ -9,8 +9,8 @@ import (
 	"net"
 	"time"
 
-	"gopkg.in/jcmturner/gokrb5.v5/iana/errorcode"
-	"gopkg.in/jcmturner/gokrb5.v5/messages"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/errorcode"
+	"gopkg.in/jcmturner/gokrb5.v6/messages"
 )
 
 // SendToKDC performs network actions to send data to the KDC.

+ 2 - 2
client/passwd.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"net"
 
-	"gopkg.in/jcmturner/gokrb5.v5/kadmin"
-	"gopkg.in/jcmturner/gokrb5.v5/messages"
+	"gopkg.in/jcmturner/gokrb5.v6/kadmin"
+	"gopkg.in/jcmturner/gokrb5.v6/messages"
 )
 
 // Kpasswd server response codes.

+ 4 - 4
client/session.go

@@ -5,10 +5,10 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v5/krberror"
-	"gopkg.in/jcmturner/gokrb5.v5/messages"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/krberror"
+	"gopkg.in/jcmturner/gokrb5.v6/messages"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 // Sessions keyed on the realm name

+ 1 - 1
config/krb5conf.go

@@ -16,7 +16,7 @@ import (
 	"time"
 
 	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/etypeID"
 )
 
 // Config represents the KRB5 configuration.

+ 1 - 1
credentials/ccache.go

@@ -10,7 +10,7 @@ import (
 	"unsafe"
 
 	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 const (

+ 3 - 3
credentials/ccache_integration_test.go

@@ -15,9 +15,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 const (

+ 3 - 3
credentials/ccache_test.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 func TestParse(t *testing.T) {

+ 3 - 3
credentials/credentials.go

@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-uuid"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v5/keytab"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/keytab"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 const (

+ 5 - 5
crypto/aes128-cts-hmac-sha1-96.go

@@ -6,11 +6,11 @@ import (
 	"crypto/sha1"
 	"hash"
 
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/rfc3961"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/rfc3962"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/chksumtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/rfc3961"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/rfc3962"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/chksumtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/etypeID"
 )
 
 // RFC 3962

+ 2 - 2
crypto/aes128-cts-hmac-sha1-96_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/rfc3962"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/rfc3962"
 )
 
 func TestAes128CtsHmacSha196_StringToKey(t *testing.T) {

+ 4 - 4
crypto/aes128-cts-hmac-sha256-128.go

@@ -6,10 +6,10 @@ import (
 	"crypto/sha256"
 	"hash"
 
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/rfc8009"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/chksumtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/rfc8009"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/chksumtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/etypeID"
 )
 
 // RFC https://tools.ietf.org/html/rfc8009

+ 2 - 2
crypto/aes128-cts-hmac-sha256-128_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/rfc8009"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/rfc8009"
 )
 
 func TestAes128CtsHmacSha256128_StringToKey(t *testing.T) {

+ 5 - 5
crypto/aes256-cts-hmac-sha1-96.go

@@ -6,11 +6,11 @@ import (
 	"crypto/sha1"
 	"hash"
 
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/rfc3961"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/rfc3962"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/chksumtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/rfc3961"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/rfc3962"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/chksumtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/etypeID"
 )
 
 // RFC 3962

+ 2 - 2
crypto/aes256-cts-hmac-sha1-96_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/rfc3962"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/rfc3962"
 )
 
 func TestAes256CtsHmacSha196_StringToKey(t *testing.T) {

+ 4 - 4
crypto/aes256-cts-hmac-sha384-192.go

@@ -6,10 +6,10 @@ import (
 	"crypto/sha512"
 	"hash"
 
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/rfc8009"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/chksumtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/rfc8009"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/chksumtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/etypeID"
 )
 
 // RFC https://tools.ietf.org/html/rfc8009

+ 2 - 2
crypto/aes256-cts-hmac-sha384-192_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/rfc8009"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/rfc8009"
 )
 
 func TestAes256CtsHmacSha384192_StringToKey(t *testing.T) {

+ 1 - 1
crypto/common/common.go

@@ -9,7 +9,7 @@ import (
 	"errors"
 	"fmt"
 
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/etype"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/etype"
 )
 
 // ZeroPad pads bytes with zeros to nearest multiple of message size m.

+ 5 - 5
crypto/crypto.go

@@ -5,11 +5,11 @@ import (
 	"encoding/hex"
 	"fmt"
 
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/etype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/chksumtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/etypeID"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/patype"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/etype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/chksumtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/patype"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 // GetEtype returns an instances of the required etype struct for the etype ID.

+ 4 - 4
crypto/des3-cbc-sha1-kd.go

@@ -7,10 +7,10 @@ import (
 	"errors"
 	"hash"
 
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/rfc3961"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/chksumtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/rfc3961"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/chksumtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/etypeID"
 )
 
 //RFC: 3961 Section 6.3

+ 4 - 4
crypto/rc4-hmac.go

@@ -7,10 +7,10 @@ import (
 	"io"
 
 	"golang.org/x/crypto/md4"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/rfc3961"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/rfc4757"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/chksumtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/rfc3961"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/rfc4757"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/chksumtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/etypeID"
 )
 
 //http://grepcode.com/file/repository.grepcode.com/java/root/jdk/openjdk/8u40-b25/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java#ArcFourCrypto.encrypt%28byte%5B%5D%2Cint%2Cbyte%5B%5D%2Cbyte%5B%5D%2Cbyte%5B%5D%2Cint%2Cint%29

+ 2 - 2
crypto/rfc3961/encryption.go

@@ -9,8 +9,8 @@ import (
 	"errors"
 	"fmt"
 
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/etype"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/etype"
 )
 
 // DES3EncryptData encrypts the data provided using DES3 and methods specific to the etype provided.

+ 1 - 1
crypto/rfc3961/keyDerivation.go

@@ -1,7 +1,7 @@
 package rfc3961
 
 import (
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/etype"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/etype"
 )
 
 const (

+ 2 - 2
crypto/rfc3962/encryption.go

@@ -7,8 +7,8 @@ import (
 	"fmt"
 
 	"gopkg.in/jcmturner/aescts.v1"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/etype"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/etype"
 )
 
 // EncryptData encrypts the data provided using methods specific to the etype provided as defined in RFC 3962.

+ 1 - 1
crypto/rfc3962/keyDerivation.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 
 	"github.com/jcmturner/gofork/x/crypto/pbkdf2"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/etype"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/etype"
 )
 
 const (

+ 1 - 1
crypto/rfc4757/encryption.go

@@ -8,7 +8,7 @@ import (
 	"errors"
 	"fmt"
 
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/etype"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/etype"
 )
 
 // EncryptData encrypts the data provided using methods specific to the etype provided as defined in RFC 4757.

+ 3 - 3
crypto/rfc8009/encryption.go

@@ -9,9 +9,9 @@ import (
 	"fmt"
 
 	"gopkg.in/jcmturner/aescts.v1"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/etype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/etype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/etypeID"
 )
 
 // EncryptData encrypts the data provided using methods specific to the etype provided as defined in RFC 8009.

+ 2 - 2
crypto/rfc8009/keyDerivation.go

@@ -7,8 +7,8 @@ import (
 	"errors"
 
 	"golang.org/x/crypto/pbkdf2"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto/etype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto/etype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/etypeID"
 )
 
 const (

+ 6 - 6
examples/example-AD.go

@@ -6,12 +6,12 @@ import (
 	"encoding/hex"
 	"fmt"
 	"gopkg.in/jcmturner/goidentity.v3"
-	"gopkg.in/jcmturner/gokrb5.v5/client"
-	"gopkg.in/jcmturner/gokrb5.v5/config"
-	"gopkg.in/jcmturner/gokrb5.v5/credentials"
-	"gopkg.in/jcmturner/gokrb5.v5/keytab"
-	"gopkg.in/jcmturner/gokrb5.v5/service"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/client"
+	"gopkg.in/jcmturner/gokrb5.v6/config"
+	"gopkg.in/jcmturner/gokrb5.v6/credentials"
+	"gopkg.in/jcmturner/gokrb5.v6/keytab"
+	"gopkg.in/jcmturner/gokrb5.v6/service"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 	"io/ioutil"
 	"log"
 	"net/http"

+ 5 - 5
examples/example.go

@@ -12,11 +12,11 @@ import (
 	"os"
 
 	"gopkg.in/jcmturner/goidentity.v3"
-	"gopkg.in/jcmturner/gokrb5.v5/client"
-	"gopkg.in/jcmturner/gokrb5.v5/config"
-	"gopkg.in/jcmturner/gokrb5.v5/keytab"
-	"gopkg.in/jcmturner/gokrb5.v5/service"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/client"
+	"gopkg.in/jcmturner/gokrb5.v6/config"
+	"gopkg.in/jcmturner/gokrb5.v6/keytab"
+	"gopkg.in/jcmturner/gokrb5.v6/service"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 func main() {

+ 4 - 4
examples/httpClient.go

@@ -10,10 +10,10 @@ import (
 	"os"
 
 	//"github.com/pkg/profile"
-	"gopkg.in/jcmturner/gokrb5.v5/client"
-	"gopkg.in/jcmturner/gokrb5.v5/config"
-	"gopkg.in/jcmturner/gokrb5.v5/keytab"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/client"
+	"gopkg.in/jcmturner/gokrb5.v6/config"
+	"gopkg.in/jcmturner/gokrb5.v6/keytab"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 const (

+ 4 - 4
examples/httpServer.go

@@ -10,10 +10,10 @@ import (
 	"os"
 
 	//"github.com/pkg/profile"
-	"gopkg.in/jcmturner/gokrb5.v5/credentials"
-	"gopkg.in/jcmturner/gokrb5.v5/keytab"
-	"gopkg.in/jcmturner/gokrb5.v5/service"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/credentials"
+	"gopkg.in/jcmturner/gokrb5.v6/keytab"
+	"gopkg.in/jcmturner/gokrb5.v6/service"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 const (

+ 3 - 3
gssapi/NegotiationToken.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 
 	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v5/credentials"
-	"gopkg.in/jcmturner/gokrb5.v5/messages"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/credentials"
+	"gopkg.in/jcmturner/gokrb5.v6/messages"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 /*

+ 3 - 3
gssapi/WrapToken.go

@@ -7,9 +7,9 @@ import (
 	"errors"
 	"fmt"
 
-	"gopkg.in/jcmturner/gokrb5.v5/crypto"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/keyusage"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/keyusage"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 /*

+ 2 - 2
gssapi/WrapToken_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/keyusage"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/keyusage"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 const (

+ 4 - 4
gssapi/gssapi.go

@@ -6,10 +6,10 @@ import (
 	"fmt"
 
 	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v5/asn1tools"
-	"gopkg.in/jcmturner/gokrb5.v5/credentials"
-	"gopkg.in/jcmturner/gokrb5.v5/messages"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/asn1tools"
+	"gopkg.in/jcmturner/gokrb5.v6/credentials"
+	"gopkg.in/jcmturner/gokrb5.v6/messages"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 // SPNEGO_OID is the OID for SPNEGO header type.

+ 6 - 6
gssapi/krb5Token.go

@@ -7,12 +7,12 @@ import (
 	"fmt"
 
 	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v5/asn1tools"
-	"gopkg.in/jcmturner/gokrb5.v5/credentials"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/chksumtype"
-	"gopkg.in/jcmturner/gokrb5.v5/krberror"
-	"gopkg.in/jcmturner/gokrb5.v5/messages"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/asn1tools"
+	"gopkg.in/jcmturner/gokrb5.v6/credentials"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/chksumtype"
+	"gopkg.in/jcmturner/gokrb5.v6/krberror"
+	"gopkg.in/jcmturner/gokrb5.v6/messages"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 // GSSAPI MechToken IDs and flags.

+ 5 - 5
gssapi/krb5Token_test.go

@@ -6,11 +6,11 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/credentials"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/msgtype"
-	"gopkg.in/jcmturner/gokrb5.v5/messages"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/credentials"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/msgtype"
+	"gopkg.in/jcmturner/gokrb5.v6/messages"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 const (

+ 1 - 1
kadmin/changepasswddata.go

@@ -2,7 +2,7 @@ package kadmin
 
 import (
 	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 // ChangePasswdData is the payload to a password change message.

+ 3 - 3
kadmin/changepasswddata_test.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 func TestChangePasswdData_Marshal(t *testing.T) {

+ 2 - 2
kadmin/message.go

@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"math"
 
-	"gopkg.in/jcmturner/gokrb5.v5/messages"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/messages"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 const (

+ 3 - 3
kadmin/message_test.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/msgtype"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/iana"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/msgtype"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 func TestUnmarshalReply(t *testing.T) {

+ 4 - 4
kadmin/passwd.go

@@ -2,10 +2,10 @@
 package kadmin
 
 import (
-	"gopkg.in/jcmturner/gokrb5.v5/crypto"
-	"gopkg.in/jcmturner/gokrb5.v5/krberror"
-	"gopkg.in/jcmturner/gokrb5.v5/messages"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto"
+	"gopkg.in/jcmturner/gokrb5.v6/krberror"
+	"gopkg.in/jcmturner/gokrb5.v6/messages"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 // ChangePasswdMsg generate a change password request and also return the key needed to decrypt the reply.

+ 1 - 1
keytab/keytab.go

@@ -11,7 +11,7 @@ import (
 	"time"
 	"unsafe"
 
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 const (

+ 1 - 1
keytab/keytab_test.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 func TestParse(t *testing.T) {

+ 4 - 4
messages/APRep.go

@@ -5,10 +5,10 @@ import (
 	"time"
 
 	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/asnAppTag"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/msgtype"
-	"gopkg.in/jcmturner/gokrb5.v5/krberror"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/asnAppTag"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/msgtype"
+	"gopkg.in/jcmturner/gokrb5.v6/krberror"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 /*

+ 3 - 3
messages/APRep_test.go

@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/msgtype"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/iana"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/msgtype"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 func TestUnmarshalAPRep(t *testing.T) {

+ 8 - 8
messages/APReq.go

@@ -4,14 +4,14 @@ import (
 	"fmt"
 
 	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v5/asn1tools"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto"
-	"gopkg.in/jcmturner/gokrb5.v5/iana"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/asnAppTag"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/keyusage"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/msgtype"
-	"gopkg.in/jcmturner/gokrb5.v5/krberror"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/asn1tools"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto"
+	"gopkg.in/jcmturner/gokrb5.v6/iana"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/asnAppTag"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/keyusage"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/msgtype"
+	"gopkg.in/jcmturner/gokrb5.v6/krberror"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 /*AP-REQ          ::= [APPLICATION 14] SEQUENCE {

+ 4 - 4
messages/APReq_test.go

@@ -5,10 +5,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/msgtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/iana"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/msgtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 func TestUnmarshalAPReq(t *testing.T) {

+ 10 - 10
messages/KDCRep.go

@@ -8,16 +8,16 @@ import (
 	"time"
 
 	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v5/config"
-	"gopkg.in/jcmturner/gokrb5.v5/credentials"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/asnAppTag"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/flags"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/keyusage"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/msgtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/patype"
-	"gopkg.in/jcmturner/gokrb5.v5/krberror"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/config"
+	"gopkg.in/jcmturner/gokrb5.v6/credentials"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/asnAppTag"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/flags"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/keyusage"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/msgtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/patype"
+	"gopkg.in/jcmturner/gokrb5.v6/krberror"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 type marshalKDCRep struct {

+ 8 - 8
messages/KDCRep_test.go

@@ -7,14 +7,14 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/credentials"
-	"gopkg.in/jcmturner/gokrb5.v5/iana"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/etypeID"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/msgtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/patype"
-	"gopkg.in/jcmturner/gokrb5.v5/keytab"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/credentials"
+	"gopkg.in/jcmturner/gokrb5.v6/iana"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/msgtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/patype"
+	"gopkg.in/jcmturner/gokrb5.v6/keytab"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 const (

+ 12 - 12
messages/KDCReq.go

@@ -11,18 +11,18 @@ import (
 	"time"
 
 	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v5/asn1tools"
-	"gopkg.in/jcmturner/gokrb5.v5/config"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto"
-	"gopkg.in/jcmturner/gokrb5.v5/iana"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/asnAppTag"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/flags"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/keyusage"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/msgtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/patype"
-	"gopkg.in/jcmturner/gokrb5.v5/krberror"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/asn1tools"
+	"gopkg.in/jcmturner/gokrb5.v6/config"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto"
+	"gopkg.in/jcmturner/gokrb5.v6/iana"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/asnAppTag"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/flags"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/keyusage"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/msgtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/patype"
+	"gopkg.in/jcmturner/gokrb5.v6/krberror"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 type marshalKDCReq struct {

+ 6 - 6
messages/KDCReq_test.go

@@ -7,12 +7,12 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/addrtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/msgtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/patype"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/iana"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/addrtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/msgtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/patype"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 func TestUnmarshalKDCReqBody(t *testing.T) {

+ 6 - 6
messages/KRBCred.go

@@ -5,12 +5,12 @@ import (
 	"time"
 
 	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/asnAppTag"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/keyusage"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/msgtype"
-	"gopkg.in/jcmturner/gokrb5.v5/krberror"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/asnAppTag"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/keyusage"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/msgtype"
+	"gopkg.in/jcmturner/gokrb5.v6/krberror"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 type marshalKRBCred struct {

+ 5 - 5
messages/KRBCred_test.go

@@ -7,11 +7,11 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/addrtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/msgtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/iana"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/addrtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/msgtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 func TestUnmarshalKRBCred(t *testing.T) {

+ 6 - 6
messages/KRBError.go

@@ -6,12 +6,12 @@ import (
 	"time"
 
 	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v5/iana"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/asnAppTag"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/errorcode"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/msgtype"
-	"gopkg.in/jcmturner/gokrb5.v5/krberror"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/iana"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/asnAppTag"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/errorcode"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/msgtype"
+	"gopkg.in/jcmturner/gokrb5.v6/krberror"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 // KRBError implements RFC 4120 KRB_ERROR: https://tools.ietf.org/html/rfc4120#section-5.9.1.

+ 5 - 5
messages/KRBError_test.go

@@ -6,11 +6,11 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/errorcode"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/msgtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/iana"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/errorcode"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/msgtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 func TestUnmarshalKRBError(t *testing.T) {

+ 8 - 8
messages/KRBPriv.go

@@ -5,14 +5,14 @@ import (
 	"time"
 
 	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v5/asn1tools"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto"
-	"gopkg.in/jcmturner/gokrb5.v5/iana"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/asnAppTag"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/keyusage"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/msgtype"
-	"gopkg.in/jcmturner/gokrb5.v5/krberror"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/asn1tools"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto"
+	"gopkg.in/jcmturner/gokrb5.v6/iana"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/asnAppTag"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/keyusage"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/msgtype"
+	"gopkg.in/jcmturner/gokrb5.v6/krberror"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 // KRBPriv implements RFC 4120 type: https://tools.ietf.org/html/rfc4120#section-5.7.1.

+ 5 - 5
messages/KRBPriv_test.go

@@ -6,11 +6,11 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/addrtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/msgtype"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/iana"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/addrtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/msgtype"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 func TestUnmarshalKRBPriv(t *testing.T) {

+ 4 - 4
messages/KRBSafe.go

@@ -5,10 +5,10 @@ import (
 	"time"
 
 	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/asnAppTag"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/msgtype"
-	"gopkg.in/jcmturner/gokrb5.v5/krberror"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/asnAppTag"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/msgtype"
+	"gopkg.in/jcmturner/gokrb5.v6/krberror"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 /*

+ 4 - 4
messages/KRBSafe_test.go

@@ -6,10 +6,10 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/addrtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/msgtype"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/iana"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/addrtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/msgtype"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 func TestUnmarshalKRBSafe(t *testing.T) {

+ 11 - 11
messages/Ticket.go

@@ -7,17 +7,17 @@ import (
 	"time"
 
 	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v5/asn1tools"
-	"gopkg.in/jcmturner/gokrb5.v5/crypto"
-	"gopkg.in/jcmturner/gokrb5.v5/iana"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/adtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/asnAppTag"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/errorcode"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/keyusage"
-	"gopkg.in/jcmturner/gokrb5.v5/keytab"
-	"gopkg.in/jcmturner/gokrb5.v5/krberror"
-	"gopkg.in/jcmturner/gokrb5.v5/pac"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/asn1tools"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto"
+	"gopkg.in/jcmturner/gokrb5.v6/iana"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/adtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/asnAppTag"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/errorcode"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/keyusage"
+	"gopkg.in/jcmturner/gokrb5.v6/keytab"
+	"gopkg.in/jcmturner/gokrb5.v6/krberror"
+	"gopkg.in/jcmturner/gokrb5.v6/pac"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 // Reference: https://www.ietf.org/rfc/rfc4120.txt

+ 8 - 8
messages/Ticket_test.go

@@ -7,14 +7,14 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/addrtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/adtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/trtype"
-	"gopkg.in/jcmturner/gokrb5.v5/keytab"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/iana"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/addrtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/adtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/trtype"
+	"gopkg.in/jcmturner/gokrb5.v6/keytab"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 func TestUnmarshalTicket(t *testing.T) {

+ 1 - 1
pac/client_claims_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 	"gopkg.in/jcmturner/rpc.v1/mstypes"
 )
 

+ 1 - 1
pac/client_info_test.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 func TestPAC_ClientInfo_Unmarshal(t *testing.T) {

+ 3 - 3
pac/credentials_info.go

@@ -5,9 +5,9 @@ import (
 	"errors"
 	"fmt"
 
-	"gopkg.in/jcmturner/gokrb5.v5/crypto"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/keyusage"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/keyusage"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 	"gopkg.in/jcmturner/rpc.v1/mstypes"
 	"gopkg.in/jcmturner/rpc.v1/ndr"
 )

+ 1 - 1
pac/kerb_validation_info_test.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 	"gopkg.in/jcmturner/rpc.v1/mstypes"
 )
 

+ 3 - 3
pac/pac_type.go

@@ -5,9 +5,9 @@ import (
 	"errors"
 	"fmt"
 
-	"gopkg.in/jcmturner/gokrb5.v5/crypto"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/keyusage"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/crypto"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/keyusage"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 	"gopkg.in/jcmturner/rpc.v1/mstypes"
 )
 

+ 2 - 2
pac/pac_type_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/keytab"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/keytab"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 func TestPACTypeValidate(t *testing.T) {

+ 1 - 1
pac/signature_data.go

@@ -3,7 +3,7 @@ package pac
 import (
 	"bytes"
 
-	"gopkg.in/jcmturner/gokrb5.v5/iana/chksumtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/chksumtype"
 	"gopkg.in/jcmturner/rpc.v1/mstypes"
 )
 

+ 2 - 2
pac/signature_data_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/chksumtype"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/chksumtype"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 func TestPAC_SignatureData_Unmarshal_Server_Signature(t *testing.T) {

+ 1 - 1
pac/upn_dns_info_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 func TestUPN_DNSInfo_Unmarshal(t *testing.T) {

+ 6 - 6
service/APExchange.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"time"
 
-	"gopkg.in/jcmturner/gokrb5.v5/credentials"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/errorcode"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/flags"
-	"gopkg.in/jcmturner/gokrb5.v5/krberror"
-	"gopkg.in/jcmturner/gokrb5.v5/messages"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/credentials"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/errorcode"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/flags"
+	"gopkg.in/jcmturner/gokrb5.v6/krberror"
+	"gopkg.in/jcmturner/gokrb5.v6/messages"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 // ValidateAPREQ validates an AP_REQ sent to the service. Returns a boolean for if the AP_REQ is valid and the client's principal name and realm.

+ 10 - 10
service/APExchange_test.go

@@ -6,16 +6,16 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/client"
-	"gopkg.in/jcmturner/gokrb5.v5/config"
-	"gopkg.in/jcmturner/gokrb5.v5/credentials"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/errorcode"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/flags"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v5/keytab"
-	"gopkg.in/jcmturner/gokrb5.v5/messages"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/client"
+	"gopkg.in/jcmturner/gokrb5.v6/config"
+	"gopkg.in/jcmturner/gokrb5.v6/credentials"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/errorcode"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/flags"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/keytab"
+	"gopkg.in/jcmturner/gokrb5.v6/messages"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 func TestValidateAPREQ(t *testing.T) {

+ 5 - 5
service/authenticator.go

@@ -8,11 +8,11 @@ import (
 	"time"
 
 	goidentity "gopkg.in/jcmturner/goidentity.v3"
-	"gopkg.in/jcmturner/gokrb5.v5/client"
-	"gopkg.in/jcmturner/gokrb5.v5/config"
-	"gopkg.in/jcmturner/gokrb5.v5/credentials"
-	"gopkg.in/jcmturner/gokrb5.v5/gssapi"
-	"gopkg.in/jcmturner/gokrb5.v5/keytab"
+	"gopkg.in/jcmturner/gokrb5.v6/client"
+	"gopkg.in/jcmturner/gokrb5.v6/config"
+	"gopkg.in/jcmturner/gokrb5.v6/credentials"
+	"gopkg.in/jcmturner/gokrb5.v6/gssapi"
+	"gopkg.in/jcmturner/gokrb5.v6/keytab"
 )
 
 // SPNEGOAuthenticator implements gopkg.in/jcmturner/goidentity.v3.Authenticator interface

+ 1 - 1
service/cache.go

@@ -2,7 +2,7 @@
 package service
 
 import (
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 	"sync"
 	"time"
 )

+ 6 - 6
service/http_test.go

@@ -13,12 +13,12 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/goidentity.v3"
-	"gopkg.in/jcmturner/gokrb5.v5/client"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v5/keytab"
-	"gopkg.in/jcmturner/gokrb5.v5/messages"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
-	"gopkg.in/jcmturner/gokrb5.v5/types"
+	"gopkg.in/jcmturner/gokrb5.v6/client"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/keytab"
+	"gopkg.in/jcmturner/gokrb5.v6/messages"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/types"
 )
 
 func TestService_SPNEGOKRB_NoAuthHeader(t *testing.T) {

+ 3 - 3
types/Authenticator.go

@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v5/asn1tools"
-	"gopkg.in/jcmturner/gokrb5.v5/iana"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/asnAppTag"
+	"gopkg.in/jcmturner/gokrb5.v6/asn1tools"
+	"gopkg.in/jcmturner/gokrb5.v6/iana"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/asnAppTag"
 )
 
 /*Authenticator   ::= [APPLICATION 2] SEQUENCE  {

+ 4 - 4
types/Authenticator_test.go

@@ -7,10 +7,10 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/adtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/iana"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/adtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 func unmarshalAuthenticatorTest(t *testing.T, v string) Authenticator {

+ 3 - 3
types/AuthorizationData_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/adtype"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/adtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 func TestUnmarshalAuthorizationData(t *testing.T) {

+ 2 - 2
types/Cryptosystem_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/iana"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 func TestUnmarshalEncryptedData(t *testing.T) {

+ 1 - 1
types/HostAddress.go

@@ -9,7 +9,7 @@ import (
 	"net"
 
 	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/addrtype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/addrtype"
 )
 
 /*

+ 1 - 1
types/KerberosFlags_test.go

@@ -3,7 +3,7 @@ package types
 import (
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/flags"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/flags"
 	"testing"
 )
 

+ 1 - 1
types/PAData.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/patype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/patype"
 )
 
 // PAData implements RFC 4120 types: https://tools.ietf.org/html/rfc4120#section-5.2.7

+ 2 - 2
types/PAData_test.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/patype"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/patype"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 func TestUnmarshalPADataSequence(t *testing.T) {

+ 1 - 1
types/PrincipalName.go

@@ -3,7 +3,7 @@ package types
 import (
 	"strings"
 
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
 )
 
 // Reference: https://www.ietf.org/rfc/rfc4120.txt

+ 1 - 1
types/PrincipalName_test.go

@@ -2,7 +2,7 @@ package types
 
 import (
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/nametype"
 
 	"testing"
 )

+ 2 - 2
types/TypedData_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v5/iana/patype"
-	"gopkg.in/jcmturner/gokrb5.v5/testdata"
+	"gopkg.in/jcmturner/gokrb5.v6/iana/patype"
+	"gopkg.in/jcmturner/gokrb5.v6/testdata"
 )
 
 func TestUnmarshalTypedData(t *testing.T) {