gofmt

client/http.go

@@ -3,13 +3,14 @@ package client
 import (
 	"encoding/base64"
 	"fmt"
+	"net/http"
+	"strings"
+
 	"gopkg.in/jcmturner/gokrb5.v4/credentials"
 	"gopkg.in/jcmturner/gokrb5.v4/gssapi"
 	"gopkg.in/jcmturner/gokrb5.v4/krberror"
 	"gopkg.in/jcmturner/gokrb5.v4/messages"
 	"gopkg.in/jcmturner/gokrb5.v4/types"
-	"net/http"
-	"strings"
 )
 
 // SetSPNEGOHeader gets the service ticket and sets it as the SPNEGO authorization header on HTTP request object.

client/network.go

@@ -5,15 +5,16 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"gopkg.in/jcmturner/dnsutils.v1"
-	"gopkg.in/jcmturner/gokrb5.v4/iana/errorcode"
-	"gopkg.in/jcmturner/gokrb5.v4/messages"
 	"io"
 	"math/rand"
 	"net"
 	"strconv"
 	"strings"
 	"time"
+
+	"gopkg.in/jcmturner/dnsutils.v1"
+	"gopkg.in/jcmturner/gokrb5.v4/iana/errorcode"
+	"gopkg.in/jcmturner/gokrb5.v4/messages"
 )
 
 func (cl *Client) resolveKDC(realm string, tcp bool) (int, map[int]string, error) {

config/krb5conf.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"net"
 	"os"
 	"os/user"
 	"regexp"
@@ -16,7 +17,6 @@ import (
 
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/etypeID"
-	"net"
 )
 
 // Config represents the KRB5 configuration.

credentials/ccache.go

@@ -4,12 +4,13 @@ import (
 	"bytes"
 	"encoding/binary"
 	"errors"
-	"github.com/jcmturner/gofork/encoding/asn1"
-	"gopkg.in/jcmturner/gokrb5.v4/types"
 	"io/ioutil"
 	"strings"
 	"time"
 	"unsafe"
+
+	"github.com/jcmturner/gofork/encoding/asn1"
+	"gopkg.in/jcmturner/gokrb5.v4/types"
 )
 
 const (

credentials/ccache_test.go

@@ -2,11 +2,12 @@ package credentials
 
 import (
 	"encoding/hex"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/nametype"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
 	"gopkg.in/jcmturner/gokrb5.v4/types"
-	"testing"
 )
 
 func TestParse(t *testing.T) {

credentials/credentials_test.go

@@ -2,7 +2,7 @@ package credentials
 
 import (
 	"github.com/stretchr/testify/assert"
-	goidentity "gopkg.in/jcmturner/goidentity.v1"
+	"gopkg.in/jcmturner/goidentity.v1"
 	"testing"
 )
 

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

@@ -4,12 +4,13 @@ import (
 	"crypto/aes"
 	"crypto/hmac"
 	"crypto/sha1"
+	"hash"
+
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/common"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/rfc3961"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/rfc3962"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/chksumtype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/etypeID"
-	"hash"
 )
 
 // RFC 3962

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

@@ -2,10 +2,11 @@ package crypto
 
 import (
 	"encoding/hex"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/common"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/rfc3962"
-	"testing"
 )
 
 func TestAes128CtsHmacSha196_StringToKey(t *testing.T) {

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

@@ -4,11 +4,12 @@ import (
 	"crypto/aes"
 	"crypto/hmac"
 	"crypto/sha256"
+	"hash"
+
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/common"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/rfc8009"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/chksumtype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/etypeID"
-	"hash"
 )
 
 // RFC https://tools.ietf.org/html/rfc8009

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

@@ -2,10 +2,11 @@ package crypto
 
 import (
 	"encoding/hex"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/common"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/rfc8009"
-	"testing"
 )
 
 func TestAes128CtsHmacSha256128_StringToKey(t *testing.T) {
@@ -25,7 +26,7 @@ func TestAes128CtsHmacSha256128_StringToKey(t *testing.T) {
 	var e Aes128CtsHmacSha256128
 	for _, test := range tests {
 		saltp := rfc8009.GetSaltP(test.salt, "aes128-cts-hmac-sha256-128")
-		assert.Equal(t, test.saltp, hex.EncodeToString(([]byte(saltp))), "SaltP not as expected")
+		assert.Equal(t, test.saltp, hex.EncodeToString([]byte(saltp)), "SaltP not as expected")
 
 		k, _ := e.StringToKey(test.phrase, test.salt, common.IterationsToS2Kparams(test.iterations))
 		assert.Equal(t, test.key, hex.EncodeToString(k), "String to Key not as expected")

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

@@ -4,12 +4,13 @@ import (
 	"crypto/aes"
 	"crypto/hmac"
 	"crypto/sha1"
+	"hash"
+
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/common"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/rfc3961"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/rfc3962"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/chksumtype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/etypeID"
-	"hash"
 )
 
 // RFC 3962

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

@@ -2,10 +2,11 @@ package crypto
 
 import (
 	"encoding/hex"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/common"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/rfc3962"
-	"testing"
 )
 
 func TestAes256CtsHmacSha196_StringToKey(t *testing.T) {

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

@@ -4,11 +4,12 @@ import (
 	"crypto/aes"
 	"crypto/hmac"
 	"crypto/sha512"
+	"hash"
+
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/common"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/rfc8009"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/chksumtype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/etypeID"
-	"hash"
 )
 
 // RFC https://tools.ietf.org/html/rfc8009

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

@@ -2,10 +2,11 @@ package crypto
 
 import (
 	"encoding/hex"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/common"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/rfc8009"
-	"testing"
 )
 
 func TestAes256CtsHmacSha384192_StringToKey(t *testing.T) {
@@ -25,7 +26,7 @@ func TestAes256CtsHmacSha384192_StringToKey(t *testing.T) {
 	var e Aes256CtsHmacSha384192
 	for _, test := range tests {
 		saltp := rfc8009.GetSaltP(test.salt, "aes256-cts-hmac-sha384-192")
-		assert.Equal(t, test.saltp, hex.EncodeToString(([]byte(saltp))), "SaltP not as expected")
+		assert.Equal(t, test.saltp, hex.EncodeToString([]byte(saltp)), "SaltP not as expected")
 
 		k, _ := e.StringToKey(test.phrase, test.salt, common.IterationsToS2Kparams(test.iterations))
 		assert.Equal(t, test.key, hex.EncodeToString(k), "String to Key not as expected")

crypto/common/common.go

@@ -8,6 +8,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/etype"
 )
 

crypto/crypto.go

@@ -4,6 +4,7 @@ package crypto
 import (
 	"encoding/hex"
 	"fmt"
+
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/etype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/chksumtype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/etypeID"

crypto/des3-cbc-sha1-kd.go

@@ -5,11 +5,12 @@ import (
 	"crypto/hmac"
 	"crypto/sha1"
 	"errors"
+	"hash"
+
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/common"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/rfc3961"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/chksumtype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/etypeID"
-	"hash"
 )
 
 //RFC: 3961 Section 6.3

crypto/des3-cbc-sha1-kd_test.go

@@ -3,8 +3,9 @@ package crypto
 import (
 	"encoding/hex"
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestDes3CbcSha1Kd_DR_DK(t *testing.T) {

crypto/rc4-hmac.go

@@ -3,13 +3,14 @@ package crypto
 import (
 	"bytes"
 	"crypto/md5"
+	"hash"
+	"io"
+
 	"golang.org/x/crypto/md4"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/rfc3961"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/rfc4757"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/chksumtype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/etypeID"
-	"hash"
-	"io"
 )
 
 //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

crypto/rfc3961/encryption.go

@@ -8,6 +8,7 @@ import (
 	"crypto/rand"
 	"errors"
 	"fmt"
+
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/common"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/etype"
 )

crypto/rfc3961/nfold.go

@@ -123,6 +123,6 @@ func setBit(b *[]byte, p, v int) {
 	pBit := uint(p % 8)
 	oldByte := (*b)[pByte]
 	var newByte byte
-	newByte = (byte((v << (8 - (pBit + 1)))) | oldByte)
+	newByte = byte(v<<(8-(pBit+1))) | oldByte
 	(*b)[pByte] = newByte
 }

crypto/rfc3961/nfold_test.go

@@ -2,8 +2,9 @@ package rfc3961
 
 import (
 	"encoding/hex"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func Test_nfold(t *testing.T) {

crypto/rfc3962/encryption.go

@@ -5,7 +5,8 @@ import (
 	"crypto/rand"
 	"errors"
 	"fmt"
-	aescts "gopkg.in/jcmturner/aescts.v1"
+
+	"gopkg.in/jcmturner/aescts.v1"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/common"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/etype"
 )

crypto/rfc3962/keyDerivation.go

@@ -4,6 +4,7 @@ import (
 	"encoding/binary"
 	"encoding/hex"
 	"errors"
+
 	"github.com/jcmturner/gofork/x/crypto/pbkdf2"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/etype"
 )

crypto/rfc4757/encryption.go

@@ -7,6 +7,7 @@ import (
 	"crypto/rc4"
 	"errors"
 	"fmt"
+
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/etype"
 )
 

crypto/rfc4757/keyDerivation.go

@@ -5,8 +5,9 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"golang.org/x/crypto/md4"
 	"io"
+
+	"golang.org/x/crypto/md4"
 )
 
 // StringToKey returns a key derived from the string provided according to the definition in RFC 4757.

crypto/rfc4757/keyDerivation_test.go

@@ -2,8 +2,9 @@ package rfc4757
 
 import (
 	"encoding/hex"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 const (

crypto/rfc8009/encryption.go

@@ -7,7 +7,8 @@ import (
 	"crypto/rand"
 	"errors"
 	"fmt"
-	aescts "gopkg.in/jcmturner/aescts.v1"
+
+	"gopkg.in/jcmturner/aescts.v1"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/common"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/etype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/etypeID"

crypto/rfc8009/keyDerivation.go

@@ -5,6 +5,7 @@ import (
 	"encoding/binary"
 	"encoding/hex"
 	"errors"
+
 	"golang.org/x/crypto/pbkdf2"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto/etype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/etypeID"

gssapi/NegotiationToken.go

@@ -3,6 +3,7 @@ package gssapi
 import (
 	"errors"
 	"fmt"
+
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"gopkg.in/jcmturner/gokrb5.v4/credentials"
 	"gopkg.in/jcmturner/gokrb5.v4/messages"

gssapi/NegotiationToken_test.go

@@ -2,9 +2,10 @@ package gssapi
 
 import (
 	"encoding/hex"
+	"testing"
+
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 const (

gssapi/WrapToken.go

@@ -6,6 +6,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+
 	"gopkg.in/jcmturner/gokrb5.v4/crypto"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/keyusage"
 	"gopkg.in/jcmturner/gokrb5.v4/types"

gssapi/WrapToken_test.go

@@ -3,10 +3,11 @@ package gssapi
 import (
 	"encoding/binary"
 	"encoding/hex"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/keyusage"
 	"gopkg.in/jcmturner/gokrb5.v4/types"
-	"testing"
 )
 
 const (

gssapi/gssapi.go

@@ -4,6 +4,7 @@ package gssapi
 import (
 	"errors"
 	"fmt"
+
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"gopkg.in/jcmturner/gokrb5.v4/asn1tools"
 	"gopkg.in/jcmturner/gokrb5.v4/credentials"

gssapi/gssapi_test.go

@@ -2,9 +2,10 @@ package gssapi
 
 import (
 	"encoding/hex"
+	"testing"
+
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 const (

gssapi/krb5Token.go

@@ -5,6 +5,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"gopkg.in/jcmturner/gokrb5.v4/asn1tools"
 	"gopkg.in/jcmturner/gokrb5.v4/credentials"

gssapi/krb5Token_test.go

@@ -2,14 +2,15 @@ package gssapi
 
 import (
 	"encoding/hex"
+	"math"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/credentials"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/msgtype"
 	"gopkg.in/jcmturner/gokrb5.v4/messages"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
 	"gopkg.in/jcmturner/gokrb5.v4/types"
-	"math"
-	"testing"
 )
 
 const (

keytab/keytab.go

@@ -6,11 +6,12 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"gopkg.in/jcmturner/gokrb5.v4/types"
 	"io"
 	"io/ioutil"
 	"time"
 	"unsafe"
+
+	"gopkg.in/jcmturner/gokrb5.v4/types"
 )
 
 const (

keytab/keytab_test.go

@@ -2,10 +2,11 @@ package keytab
 
 import (
 	"encoding/hex"
-	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v4/testdata"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
+	"gopkg.in/jcmturner/gokrb5.v4/testdata"
 )
 
 func TestParse(t *testing.T) {

messages/APRep.go

@@ -2,12 +2,13 @@ package messages
 
 import (
 	"fmt"
+	"time"
+
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/asnAppTag"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/msgtype"
 	"gopkg.in/jcmturner/gokrb5.v4/krberror"
 	"gopkg.in/jcmturner/gokrb5.v4/types"
-	"time"
 )
 
 /*

messages/APRep_test.go

@@ -2,12 +2,13 @@ package messages
 
 import (
 	"encoding/hex"
+	"testing"
+	"time"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/iana"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/msgtype"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
-	"testing"
-	"time"
 )
 
 func TestUnmarshalAPRep(t *testing.T) {

messages/APReq.go

@@ -2,6 +2,7 @@ package messages
 
 import (
 	"fmt"
+
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"gopkg.in/jcmturner/gokrb5.v4/asn1tools"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto"

messages/APReq_test.go

@@ -2,12 +2,13 @@ package messages
 
 import (
 	"encoding/hex"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/iana"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/msgtype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/nametype"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
-	"testing"
 )
 
 func TestUnmarshalAPReq(t *testing.T) {

messages/KDCRep.go

@@ -5,6 +5,8 @@ package messages
 
 import (
 	"fmt"
+	"time"
+
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"gopkg.in/jcmturner/gokrb5.v4/config"
 	"gopkg.in/jcmturner/gokrb5.v4/credentials"
@@ -16,7 +18,6 @@ import (
 	"gopkg.in/jcmturner/gokrb5.v4/iana/patype"
 	"gopkg.in/jcmturner/gokrb5.v4/krberror"
 	"gopkg.in/jcmturner/gokrb5.v4/types"
-	"time"
 )
 
 type marshalKDCRep struct {

messages/KDCRep_test.go

@@ -3,6 +3,9 @@ package messages
 import (
 	"encoding/hex"
 	"fmt"
+	"testing"
+	"time"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/credentials"
 	"gopkg.in/jcmturner/gokrb5.v4/iana"
@@ -12,8 +15,6 @@ import (
 	"gopkg.in/jcmturner/gokrb5.v4/iana/patype"
 	"gopkg.in/jcmturner/gokrb5.v4/keytab"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
-	"testing"
-	"time"
 )
 
 const (

messages/KDCReq_test.go

@@ -3,6 +3,9 @@ package messages
 import (
 	"encoding/hex"
 	"fmt"
+	"testing"
+	"time"
+
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/iana"
@@ -11,8 +14,6 @@ import (
 	"gopkg.in/jcmturner/gokrb5.v4/iana/nametype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/patype"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
-	"testing"
-	"time"
 )
 
 func TestUnmarshalKDCReqBody(t *testing.T) {

messages/KRBCred.go

@@ -2,6 +2,8 @@ package messages
 
 import (
 	"fmt"
+	"time"
+
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/asnAppTag"
@@ -9,7 +11,6 @@ import (
 	"gopkg.in/jcmturner/gokrb5.v4/iana/msgtype"
 	"gopkg.in/jcmturner/gokrb5.v4/krberror"
 	"gopkg.in/jcmturner/gokrb5.v4/types"
-	"time"
 )
 
 type marshalKRBCred struct {

messages/KRBCred_test.go

@@ -3,14 +3,15 @@ package messages
 import (
 	"encoding/hex"
 	"fmt"
+	"testing"
+	"time"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/iana"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/addrtype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/msgtype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/nametype"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
-	"testing"
-	"time"
 )
 
 func TestUnmarshalKRBCred(t *testing.T) {

messages/KRBError.go

@@ -3,6 +3,8 @@ package messages
 
 import (
 	"fmt"
+	"time"
+
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"gopkg.in/jcmturner/gokrb5.v4/iana"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/asnAppTag"
@@ -10,7 +12,6 @@ import (
 	"gopkg.in/jcmturner/gokrb5.v4/iana/msgtype"
 	"gopkg.in/jcmturner/gokrb5.v4/krberror"
 	"gopkg.in/jcmturner/gokrb5.v4/types"
-	"time"
 )
 
 // KRBError implements RFC 4120 KRB_ERROR: https://tools.ietf.org/html/rfc4120#section-5.9.1.

messages/KRBError_test.go

@@ -2,14 +2,15 @@ package messages
 
 import (
 	"encoding/hex"
+	"testing"
+	"time"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/iana"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/errorcode"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/msgtype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/nametype"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
-	"testing"
-	"time"
 )
 
 func TestUnmarshalKRBError(t *testing.T) {

messages/KRBPriv.go

@@ -2,12 +2,13 @@ package messages
 
 import (
 	"fmt"
+	"time"
+
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/asnAppTag"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/msgtype"
 	"gopkg.in/jcmturner/gokrb5.v4/krberror"
 	"gopkg.in/jcmturner/gokrb5.v4/types"
-	"time"
 )
 
 // KRBPriv implements RFC 4120 type: https://tools.ietf.org/html/rfc4120#section-5.7.1.

messages/KRBPriv_test.go

@@ -2,13 +2,14 @@ package messages
 
 import (
 	"encoding/hex"
+	"testing"
+	"time"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/iana"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/addrtype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/msgtype"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
-	"testing"
-	"time"
 )
 
 func TestUnmarshalKRBPriv(t *testing.T) {

messages/KRBSafe.go

@@ -2,12 +2,13 @@ package messages
 
 import (
 	"fmt"
+	"time"
+
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/asnAppTag"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/msgtype"
 	"gopkg.in/jcmturner/gokrb5.v4/krberror"
 	"gopkg.in/jcmturner/gokrb5.v4/types"
-	"time"
 )
 
 /*

messages/KRBSafe_test.go

@@ -2,13 +2,14 @@ package messages
 
 import (
 	"encoding/hex"
+	"testing"
+	"time"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/iana"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/addrtype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/msgtype"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
-	"testing"
-	"time"
 )
 
 func TestUnmarshalKRBSafe(t *testing.T) {

messages/Ticket.go

@@ -3,6 +3,8 @@ package messages
 import (
 	"crypto/rand"
 	"fmt"
+	"time"
+
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"gopkg.in/jcmturner/gokrb5.v4/asn1tools"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto"
@@ -15,7 +17,6 @@ import (
 	"gopkg.in/jcmturner/gokrb5.v4/krberror"
 	"gopkg.in/jcmturner/gokrb5.v4/pac"
 	"gopkg.in/jcmturner/gokrb5.v4/types"
-	"time"
 )
 
 // Reference: https://www.ietf.org/rfc/rfc4120.txt

messages/Ticket_test.go

@@ -3,6 +3,9 @@ package messages
 import (
 	"encoding/hex"
 	"fmt"
+	"testing"
+	"time"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/iana"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/addrtype"
@@ -12,8 +15,6 @@ import (
 	"gopkg.in/jcmturner/gokrb5.v4/keytab"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
 	"gopkg.in/jcmturner/gokrb5.v4/types"
-	"testing"
-	"time"
 )
 
 func TestUnmarshalTicket(t *testing.T) {

mstypes/claims_set_metadata.go

@@ -2,6 +2,7 @@ package mstypes
 
 import (
 	"encoding/binary"
+
 	"gopkg.in/jcmturner/gokrb5.v4/ndr"
 )
 

mstypes/filetime.go

@@ -3,8 +3,9 @@ package mstypes
 
 import (
 	"encoding/binary"
-	"gopkg.in/jcmturner/gokrb5.v4/ndr"
 	"time"
+
+	"gopkg.in/jcmturner/gokrb5.v4/ndr"
 )
 
 /*

mstypes/group_membership.go

@@ -2,6 +2,7 @@ package mstypes
 
 import (
 	"encoding/binary"
+
 	"gopkg.in/jcmturner/gokrb5.v4/ndr"
 )
 

mstypes/kerb_sid_and_attributes.go

@@ -2,6 +2,7 @@ package mstypes
 
 import (
 	"encoding/binary"
+
 	"gopkg.in/jcmturner/gokrb5.v4/ndr"
 )
 

mstypes/rpc_unicode_string.go

@@ -2,6 +2,7 @@ package mstypes
 
 import (
 	"encoding/binary"
+
 	"gopkg.in/jcmturner/gokrb5.v4/ndr"
 )
 

mstypes/sid.go

@@ -4,6 +4,7 @@ import (
 	"encoding/binary"
 	"encoding/hex"
 	"fmt"
+
 	"gopkg.in/jcmturner/gokrb5.v4/ndr"
 )
 

mstypes/user_session_key.go

@@ -2,6 +2,7 @@ package mstypes
 
 import (
 	"encoding/binary"
+
 	"gopkg.in/jcmturner/gokrb5.v4/ndr"
 )
 

pac/client_claims.go

@@ -2,6 +2,7 @@ package pac
 
 import (
 	"fmt"
+
 	"gopkg.in/jcmturner/gokrb5.v4/mstypes"
 	"gopkg.in/jcmturner/gokrb5.v4/ndr"
 )

pac/client_info.go

@@ -2,6 +2,7 @@ package pac
 
 import (
 	"encoding/binary"
+
 	"gopkg.in/jcmturner/gokrb5.v4/mstypes"
 	"gopkg.in/jcmturner/gokrb5.v4/ndr"
 )

pac/client_info_test.go

@@ -2,10 +2,11 @@ package pac
 
 import (
 	"encoding/hex"
-	"github.com/stretchr/testify/assert"
-	"gopkg.in/jcmturner/gokrb5.v4/testdata"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
+	"gopkg.in/jcmturner/gokrb5.v4/testdata"
 )
 
 func TestPAC_ClientInfo_Unmarshal(t *testing.T) {

pac/credentials_info.go

@@ -3,6 +3,7 @@ package pac
 import (
 	"encoding/binary"
 	"fmt"
+
 	"gopkg.in/jcmturner/gokrb5.v4/crypto"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/keyusage"
 	"gopkg.in/jcmturner/gokrb5.v4/mstypes"

pac/device_claims.go

@@ -2,6 +2,7 @@ package pac
 
 import (
 	"fmt"
+
 	"gopkg.in/jcmturner/gokrb5.v4/mstypes"
 	"gopkg.in/jcmturner/gokrb5.v4/ndr"
 )

pac/device_info.go

@@ -2,6 +2,7 @@ package pac
 
 import (
 	"fmt"
+
 	"gopkg.in/jcmturner/gokrb5.v4/mstypes"
 	"gopkg.in/jcmturner/gokrb5.v4/ndr"
 )

pac/kerb_validation_info.go

@@ -4,6 +4,7 @@ package pac
 import (
 	"errors"
 	"fmt"
+
 	"gopkg.in/jcmturner/gokrb5.v4/mstypes"
 	"gopkg.in/jcmturner/gokrb5.v4/ndr"
 )

pac/kerb_validation_info_test.go

@@ -2,11 +2,12 @@ package pac
 
 import (
 	"encoding/hex"
+	"testing"
+	"time"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/mstypes"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
-	"testing"
-	"time"
 )
 
 func TestKerbValidationInfo_Unmarshal(t *testing.T) {

pac/pac_info_buffer.go

@@ -2,6 +2,7 @@ package pac
 
 import (
 	"encoding/binary"
+
 	"gopkg.in/jcmturner/gokrb5.v4/ndr"
 )
 

pac/pac_type.go

@@ -4,6 +4,7 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
+
 	"gopkg.in/jcmturner/gokrb5.v4/crypto"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/keyusage"
 	"gopkg.in/jcmturner/gokrb5.v4/ndr"

pac/pac_type_test.go

@@ -3,10 +3,11 @@ package pac
 import (
 	"encoding/hex"
 	"fmt"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/keytab"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
-	"testing"
 )
 
 func TestPACTypeValidate(t *testing.T) {

pac/s4u_delegation_info.go

@@ -2,6 +2,7 @@ package pac
 
 import (
 	"fmt"
+
 	"gopkg.in/jcmturner/gokrb5.v4/mstypes"
 	"gopkg.in/jcmturner/gokrb5.v4/ndr"
 )

pac/signature_data.go

@@ -2,6 +2,7 @@ package pac
 
 import (
 	"encoding/binary"
+
 	"gopkg.in/jcmturner/gokrb5.v4/iana/chksumtype"
 	"gopkg.in/jcmturner/gokrb5.v4/ndr"
 )

pac/signature_data_test.go

@@ -2,10 +2,11 @@ package pac
 
 import (
 	"encoding/hex"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/chksumtype"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
-	"testing"
 )
 
 func TestPAC_SignatureData_Unmarshal_Server_Signature(t *testing.T) {

pac/upn_dns_info.go

@@ -2,8 +2,9 @@ package pac
 
 import (
 	"encoding/binary"
-	"gopkg.in/jcmturner/gokrb5.v4/ndr"
 	"sort"
+
+	"gopkg.in/jcmturner/gokrb5.v4/ndr"
 )
 
 // UPNDNSInfo implements https://msdn.microsoft.com/en-us/library/dd240468.aspx

pac/upn_dns_info_test.go

@@ -2,9 +2,10 @@ package pac
 
 import (
 	"encoding/hex"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
-	"testing"
 )
 
 func TestUPN_DNSInfo_Unmarshal(t *testing.T) {

service/APExchange.go

@@ -2,6 +2,8 @@ package service
 
 import (
 	"fmt"
+	"time"
+
 	"gopkg.in/jcmturner/gokrb5.v4/credentials"
 	"gopkg.in/jcmturner/gokrb5.v4/crypto"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/errorcode"
@@ -11,7 +13,6 @@ import (
 	"gopkg.in/jcmturner/gokrb5.v4/krberror"
 	"gopkg.in/jcmturner/gokrb5.v4/messages"
 	"gopkg.in/jcmturner/gokrb5.v4/types"
-	"time"
 )
 
 // 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.

service/APExchange_test.go

@@ -2,6 +2,9 @@ package service
 
 import (
 	"encoding/hex"
+	"testing"
+	"time"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/client"
 	"gopkg.in/jcmturner/gokrb5.v4/config"
@@ -13,8 +16,6 @@ import (
 	"gopkg.in/jcmturner/gokrb5.v4/messages"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
 	"gopkg.in/jcmturner/gokrb5.v4/types"
-	"testing"
-	"time"
 )
 
 func TestValidateAPREQ(t *testing.T) {

service/authenticator.go

@@ -4,14 +4,15 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
+	"strings"
+	"time"
+
 	goidentity "gopkg.in/jcmturner/goidentity.v1"
 	"gopkg.in/jcmturner/gokrb5.v4/client"
 	"gopkg.in/jcmturner/gokrb5.v4/config"
 	"gopkg.in/jcmturner/gokrb5.v4/credentials"
 	"gopkg.in/jcmturner/gokrb5.v4/gssapi"
 	"gopkg.in/jcmturner/gokrb5.v4/keytab"
-	"strings"
-	"time"
 )
 
 // SPNEGOAuthenticator implements gopkg.in/jcmturner/goidentity.v1.Authenticator interface

service/authenticator_test.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"github.com/stretchr/testify/assert"
-	goidentity "gopkg.in/jcmturner/goidentity.v1"
+	"gopkg.in/jcmturner/goidentity.v1"
 	"testing"
 )
 

service/http.go

@@ -4,11 +4,12 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
-	"gopkg.in/jcmturner/gokrb5.v4/gssapi"
-	"gopkg.in/jcmturner/gokrb5.v4/keytab"
 	"log"
 	"net/http"
 	"strings"
+
+	"gopkg.in/jcmturner/gokrb5.v4/gssapi"
+	"gopkg.in/jcmturner/gokrb5.v4/keytab"
 )
 
 type ctxKey int

service/http_test.go

@@ -3,6 +3,14 @@ package service
 import (
 	"encoding/hex"
 	"fmt"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"net/http/httptest"
+	"sync"
+	"testing"
+	"time"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/client"
 	"gopkg.in/jcmturner/gokrb5.v4/credentials"
@@ -11,13 +19,6 @@ import (
 	"gopkg.in/jcmturner/gokrb5.v4/messages"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
 	"gopkg.in/jcmturner/gokrb5.v4/types"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"net/http/httptest"
-	"sync"
-	"testing"
-	"time"
 )
 
 func TestService_SPNEGOKRB_NoAuthHeader(t *testing.T) {

types/Authenticator.go

@@ -4,13 +4,14 @@ package types
 import (
 	"crypto/rand"
 	"fmt"
+	"math"
+	"math/big"
+	"time"
+
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"gopkg.in/jcmturner/gokrb5.v4/asn1tools"
 	"gopkg.in/jcmturner/gokrb5.v4/iana"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/asnAppTag"
-	"math"
-	"math/big"
-	"time"
 )
 
 /*Authenticator   ::= [APPLICATION 2] SEQUENCE  {

types/Authenticator_test.go

@@ -3,13 +3,14 @@ package types
 import (
 	"encoding/hex"
 	"fmt"
+	"testing"
+	"time"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/iana"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/adtype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/nametype"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
-	"testing"
-	"time"
 )
 
 func unmarshalAuthenticatorTest(t *testing.T, v string) Authenticator {

types/AuthorizationData_test.go

@@ -3,11 +3,12 @@ package types
 import (
 	"encoding/hex"
 	"fmt"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/adtype"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/nametype"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
-	"testing"
 )
 
 func TestUnmarshalAuthorizationData(t *testing.T) {

types/Cryptosystem_test.go

@@ -2,10 +2,11 @@ package types
 
 import (
 	"encoding/hex"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/iana"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
-	"testing"
 )
 
 func TestUnmarshalEncryptedData(t *testing.T) {

types/HostAddress.go

@@ -6,9 +6,10 @@ package types
 import (
 	"bytes"
 	"fmt"
+	"net"
+
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/addrtype"
-	"net"
 )
 
 /*

types/PAData.go

@@ -4,9 +4,10 @@ package types
 // Section: 5.2.7
 import (
 	"fmt"
+	"time"
+
 	"github.com/jcmturner/gofork/encoding/asn1"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/patype"
-	"time"
 )
 
 // PAData implements RFC 4120 types: https://tools.ietf.org/html/rfc4120#section-5.2.7

types/PAData_test.go

@@ -3,11 +3,12 @@ package types
 import (
 	"encoding/hex"
 	"fmt"
+	"testing"
+	"time"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/patype"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
-	"testing"
-	"time"
 )
 
 func TestUnmarshalPADataSequence(t *testing.T) {

types/TypedData_test.go

@@ -3,10 +3,11 @@ package types
 import (
 	"encoding/hex"
 	"fmt"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/gokrb5.v4/iana/patype"
 	"gopkg.in/jcmturner/gokrb5.v4/testdata"
-	"testing"
 )
 
 func TestUnmarshalTypedData(t *testing.T) {