update to new major version

jcmturner · Oct 30, 2017 · f6e17ea · f6e17ea
1 parent a0dde5e
commit f6e17ea
Show file tree

Hide file tree

Showing 102 changed files with 323 additions and 323 deletions.
diff --git a/README.md b/README.md
@@ -3,11 +3,11 @@
 
 To get the package, execute:
 ```
-go get gopkg.in/jcmturner/gokrb5.v1
+go get gopkg.in/jcmturner/gokrb5.v2
 ```
 To import this package, add the following line to your code:
 ```go
-import "gopkg.in/jcmturner/gokrb5.v1/<sub package>"
+import "gopkg.in/jcmturner/gokrb5.v2/<sub package>"
 
 ```
 
@@ -51,7 +51,7 @@ Currently the following is working/tested:
 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.v1/config"
+import "gopkg.in/jcmturner/gokrb5.v2/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)
@@ -60,7 +60,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.v1/keytab"
+import 	"gopkg.in/jcmturner/gokrb5.v2/keytab"
 ktFromFile, err := keytab.Load("/path/to/file.keytab")
 ktFromBytes, err := keytab.Parse(b)
 
@@ -71,7 +71,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.v1/client"
+import 	"gopkg.in/jcmturner/gokrb5.v2/client"
 cl := client.NewClientWithPassword("username", "REALM.COM", "password")
 cl := client.NewClientWithKeytab("username", "REALM.COM", kt)
 
@@ -177,7 +177,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.v1/service"
+import 	"gopkg.in/jcmturner/gokrb5.v2/service"
 if ok, creds, err := serivce.ValidateAPREQ(mt.APReq, kt, r.RemoteAddr); ok {
         // Perform application specifc actions
         // creds object has details about the client identity

diff --git a/client/ASExchange.go b/client/ASExchange.go
@@ -1,13 +1,13 @@
 package client
 
 import (
-	"gopkg.in/jcmturner/gokrb5.v1/crypto"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/errorcode"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/keyusage"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/patype"
-	"gopkg.in/jcmturner/gokrb5.v1/krberror"
-	"gopkg.in/jcmturner/gokrb5.v1/messages"
-	"gopkg.in/jcmturner/gokrb5.v1/types"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/errorcode"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/keyusage"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/patype"
+	"gopkg.in/jcmturner/gokrb5.v2/krberror"
+	"gopkg.in/jcmturner/gokrb5.v2/messages"
+	"gopkg.in/jcmturner/gokrb5.v2/types"
 	"sort"
 )
 

diff --git a/client/TGSExchange.go b/client/TGSExchange.go
@@ -1,10 +1,10 @@
 package client
 
 import (
-	"gopkg.in/jcmturner/gokrb5.v1/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v1/krberror"
-	"gopkg.in/jcmturner/gokrb5.v1/messages"
-	"gopkg.in/jcmturner/gokrb5.v1/types"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v2/krberror"
+	"gopkg.in/jcmturner/gokrb5.v2/messages"
+	"gopkg.in/jcmturner/gokrb5.v2/types"
 	"strings"
 	"time"
 )

diff --git a/client/cache.go b/client/cache.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"gopkg.in/jcmturner/gokrb5.v1/messages"
-	"gopkg.in/jcmturner/gokrb5.v1/types"
+	"gopkg.in/jcmturner/gokrb5.v2/messages"
+	"gopkg.in/jcmturner/gokrb5.v2/types"
 	"strings"
 	"sync"
 	"time"

diff --git a/client/client.go b/client/client.go
@@ -4,15 +4,15 @@ package client
 import (
 	"errors"
 	"fmt"
-	"gopkg.in/jcmturner/gokrb5.v1/config"
-	"gopkg.in/jcmturner/gokrb5.v1/credentials"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/etype"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/errorcode"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v1/keytab"
-	"gopkg.in/jcmturner/gokrb5.v1/messages"
-	"gopkg.in/jcmturner/gokrb5.v1/types"
+	"gopkg.in/jcmturner/gokrb5.v2/config"
+	"gopkg.in/jcmturner/gokrb5.v2/credentials"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/etype"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/errorcode"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v2/keytab"
+	"gopkg.in/jcmturner/gokrb5.v2/messages"
+	"gopkg.in/jcmturner/gokrb5.v2/types"
 )
 
 // Client side configuration and state.

diff --git a/client/client_ad_integration_test.go b/client/client_ad_integration_test.go
@@ -6,10 +6,10 @@ package client
 import (
 	"encoding/hex"
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v1/config"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/etypeID"
-	"gopkg.in/jcmturner/gokrb5.v1/keytab"
-	"gopkg.in/jcmturner/gokrb5.v1/testdata"
+	"gopkg.in/jcmturner/gokrb5.v2/config"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v2/keytab"
+	"gopkg.in/jcmturner/gokrb5.v2/testdata"
 	"testing"
 )
 

diff --git a/client/client_integration_test.go b/client/client_integration_test.go
@@ -6,11 +6,11 @@ package client
 import (
 	"encoding/hex"
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v1/config"
-	"gopkg.in/jcmturner/gokrb5.v1/credentials"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/etypeID"
-	"gopkg.in/jcmturner/gokrb5.v1/keytab"
-	"gopkg.in/jcmturner/gokrb5.v1/testdata"
+	"gopkg.in/jcmturner/gokrb5.v2/config"
+	"gopkg.in/jcmturner/gokrb5.v2/credentials"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v2/keytab"
+	"gopkg.in/jcmturner/gokrb5.v2/testdata"
 	"net/http"
 	"os"
 	"testing"

diff --git a/client/http.go b/client/http.go
@@ -3,11 +3,11 @@ package client
 import (
 	"encoding/base64"
 	"fmt"
-	"gopkg.in/jcmturner/gokrb5.v1/credentials"
-	"gopkg.in/jcmturner/gokrb5.v1/gssapi"
-	"gopkg.in/jcmturner/gokrb5.v1/krberror"
-	"gopkg.in/jcmturner/gokrb5.v1/messages"
-	"gopkg.in/jcmturner/gokrb5.v1/types"
+	"gopkg.in/jcmturner/gokrb5.v2/credentials"
+	"gopkg.in/jcmturner/gokrb5.v2/gssapi"
+	"gopkg.in/jcmturner/gokrb5.v2/krberror"
+	"gopkg.in/jcmturner/gokrb5.v2/messages"
+	"gopkg.in/jcmturner/gokrb5.v2/types"
 	"net/http"
 	"strings"
 )

diff --git a/client/network.go b/client/network.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"encoding/binary"
 	"fmt"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/errorcode"
-	"gopkg.in/jcmturner/gokrb5.v1/messages"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/errorcode"
+	"gopkg.in/jcmturner/gokrb5.v2/messages"
 	"io"
 	"math/rand"
 	"net"

diff --git a/client/session.go b/client/session.go
@@ -2,10 +2,10 @@ package client
 
 import (
 	"fmt"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v1/krberror"
-	"gopkg.in/jcmturner/gokrb5.v1/messages"
-	"gopkg.in/jcmturner/gokrb5.v1/types"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v2/krberror"
+	"gopkg.in/jcmturner/gokrb5.v2/messages"
+	"gopkg.in/jcmturner/gokrb5.v2/types"
 	"sync"
 	"time"
 )

diff --git a/config/krb5conf.go b/config/krb5conf.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/jcmturner/asn1"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/etypeID"
 	"io"
 	"os"
 	"os/user"

diff --git a/credentials/ccache.go b/credentials/ccache.go
@@ -5,7 +5,7 @@ import (
 	"encoding/binary"
 	"errors"
 	"github.com/jcmturner/asn1"
-	"gopkg.in/jcmturner/gokrb5.v1/types"
+	"gopkg.in/jcmturner/gokrb5.v2/types"
 	"io/ioutil"
 	"strings"
 	"time"

diff --git a/credentials/ccache_test.go b/credentials/ccache_test.go
@@ -3,9 +3,9 @@ package credentials
 import (
 	"encoding/hex"
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v1/testdata"
-	"gopkg.in/jcmturner/gokrb5.v1/types"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v2/testdata"
+	"gopkg.in/jcmturner/gokrb5.v2/types"
 	"testing"
 )
 

diff --git a/credentials/credentials.go b/credentials/credentials.go
@@ -3,9 +3,9 @@ package credentials
 
 import (
 	"github.com/hashicorp/go-uuid"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/nametype"
-	"gopkg.in/jcmturner/gokrb5.v1/keytab"
-	"gopkg.in/jcmturner/gokrb5.v1/types"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/nametype"
+	"gopkg.in/jcmturner/gokrb5.v2/keytab"
+	"gopkg.in/jcmturner/gokrb5.v2/types"
 	"time"
 )
 

diff --git a/crypto/aes128-cts-hmac-sha1-96.go b/crypto/aes128-cts-hmac-sha1-96.go
@@ -4,11 +4,11 @@ import (
 	"crypto/aes"
 	"crypto/hmac"
 	"crypto/sha1"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/rfc3961"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/rfc3962"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/chksumtype"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/rfc3961"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/rfc3962"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/chksumtype"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/etypeID"
 	"hash"
 )
 

diff --git a/crypto/aes128-cts-hmac-sha1-96_test.go b/crypto/aes128-cts-hmac-sha1-96_test.go
@@ -3,8 +3,8 @@ package crypto
 import (
 	"encoding/hex"
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/rfc3962"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/rfc3962"
 	"testing"
 )
 

diff --git a/crypto/aes128-cts-hmac-sha256-128.go b/crypto/aes128-cts-hmac-sha256-128.go
@@ -4,10 +4,10 @@ import (
 	"crypto/aes"
 	"crypto/hmac"
 	"crypto/sha256"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/rfc8009"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/chksumtype"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/rfc8009"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/chksumtype"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/etypeID"
 	"hash"
 )
 

diff --git a/crypto/aes128-cts-hmac-sha256-128_test.go b/crypto/aes128-cts-hmac-sha256-128_test.go
@@ -3,8 +3,8 @@ package crypto
 import (
 	"encoding/hex"
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/rfc8009"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/rfc8009"
 	"testing"
 )
 

diff --git a/crypto/aes256-cts-hmac-sha1-96.go b/crypto/aes256-cts-hmac-sha1-96.go
@@ -4,11 +4,11 @@ import (
 	"crypto/aes"
 	"crypto/hmac"
 	"crypto/sha1"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/rfc3961"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/rfc3962"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/chksumtype"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/rfc3961"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/rfc3962"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/chksumtype"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/etypeID"
 	"hash"
 )
 

diff --git a/crypto/aes256-cts-hmac-sha1-96_test.go b/crypto/aes256-cts-hmac-sha1-96_test.go
@@ -3,8 +3,8 @@ package crypto
 import (
 	"encoding/hex"
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/rfc3962"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/rfc3962"
 	"testing"
 )
 

diff --git a/crypto/aes256-cts-hmac-sha384-192.go b/crypto/aes256-cts-hmac-sha384-192.go
@@ -4,10 +4,10 @@ import (
 	"crypto/aes"
 	"crypto/hmac"
 	"crypto/sha512"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/rfc8009"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/chksumtype"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/rfc8009"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/chksumtype"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/etypeID"
 	"hash"
 )
 

diff --git a/crypto/aes256-cts-hmac-sha384-192_test.go b/crypto/aes256-cts-hmac-sha384-192_test.go
@@ -3,8 +3,8 @@ package crypto
 import (
 	"encoding/hex"
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/rfc8009"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/rfc8009"
 	"testing"
 )
 

diff --git a/crypto/common/common.go b/crypto/common/common.go
@@ -8,7 +8,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/etype"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/etype"
 )
 
 const (

diff --git a/crypto/crypto.go b/crypto/crypto.go
@@ -4,11 +4,11 @@ package crypto
 import (
 	"encoding/hex"
 	"fmt"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/etype"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/chksumtype"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/etypeID"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/patype"
-	"gopkg.in/jcmturner/gokrb5.v1/types"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/etype"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/chksumtype"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/patype"
+	"gopkg.in/jcmturner/gokrb5.v2/types"
 	"os"
 )
 

diff --git a/crypto/des3-cbc-sha1-kd.go b/crypto/des3-cbc-sha1-kd.go
@@ -5,10 +5,10 @@ import (
 	"crypto/hmac"
 	"crypto/sha1"
 	"errors"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/common"
-	"gopkg.in/jcmturner/gokrb5.v1/crypto/rfc3961"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/chksumtype"
-	"gopkg.in/jcmturner/gokrb5.v1/iana/etypeID"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/common"
+	"gopkg.in/jcmturner/gokrb5.v2/crypto/rfc3961"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/chksumtype"
+	"gopkg.in/jcmturner/gokrb5.v2/iana/etypeID"
 	"hash"
 )