tidy

client/http.go

@@ -3,8 +3,8 @@ package client
 import (
 	"encoding/base64"
 	"fmt"
-	"github.com/jcmturner/gokrb5/GSSAPI"
 	"github.com/jcmturner/gokrb5/credentials"
+	"github.com/jcmturner/gokrb5/gssapi"
 	"github.com/jcmturner/gokrb5/messages"
 	"github.com/jcmturner/gokrb5/types"
 	"net/http"
@@ -29,7 +29,7 @@ func (cl *Client) SetSPNEGOHeader(r *http.Request, spn string) error {
 }
 
 func SetSPNEGOHeader(creds credentials.Credentials, tkt messages.Ticket, sessionKey types.EncryptionKey, r *http.Request) error {
-	SPNEGOToken, err := GSSAPI.GetSPNEGOKrbNegTokenInit(creds, tkt, sessionKey)
+	SPNEGOToken, err := gssapi.GetSPNEGOKrbNegTokenInit(creds, tkt, sessionKey)
 	nb, err := SPNEGOToken.Marshal()
 	if err != nil {
 		return fmt.Errorf("Could marshal SPNEGO: %v", err)

GSSAPI/ContextFlags.go → gssapi/ContextFlags.go

@@ -1,4 +1,4 @@
-package GSSAPI
+package gssapi
 
 import "github.com/jcmturner/asn1"
 

GSSAPI/MechType.go → gssapi/MechType.go

@@ -1,4 +1,4 @@
-package GSSAPI
+package gssapi
 
 import "github.com/jcmturner/asn1"
 

GSSAPI/NegotiationToken.go → gssapi/NegotiationToken.go

@@ -1,4 +1,4 @@
-package GSSAPI
+package gssapi
 
 import (
 	"errors"

GSSAPI/NegotiationToken_test.go → gssapi/NegotiationToken_test.go

@@ -1,4 +1,4 @@
-package GSSAPI
+package gssapi
 
 import (
 	"encoding/hex"

GSSAPI/gssapi.go → gssapi/gssapi.go

@@ -1,5 +1,5 @@
 // Generic Security Services Application Program Interface implementation required for SPNEGO kerberos authentication.
-package GSSAPI
+package gssapi
 
 import (
 	"errors"

GSSAPI/gssapi_test.go → gssapi/gssapi_test.go

@@ -1,4 +1,4 @@
-package GSSAPI
+package gssapi
 
 import (
 	"encoding/hex"

GSSAPI/krb5Token.go → gssapi/krb5Token.go

@@ -1,4 +1,4 @@
-package GSSAPI
+package gssapi
 
 import (
 	"encoding/binary"

GSSAPI/krb5Token_test.go → gssapi/krb5Token_test.go

@@ -1,4 +1,4 @@
-package GSSAPI
+package gssapi
 
 import (
 	"encoding/hex"

service/http.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
-	"github.com/jcmturner/gokrb5/GSSAPI"
+	"github.com/jcmturner/gokrb5/gssapi"
 	"github.com/jcmturner/gokrb5/keytab"
 	"log"
 	"net/http"
@@ -33,17 +33,17 @@ func SPNEGOKRB5Authenticate(f http.Handler, kt keytab.Keytab, l *log.Logger) htt
 			rejectSPNEGO(w, l, fmt.Sprintf("%v - SPNEGO error in base64 decoding negotiation header: %v", r.RemoteAddr, err))
 			return
 		}
-		var spnego GSSAPI.SPNEGO
+		var spnego gssapi.SPNEGO
 		err = spnego.Unmarshal(b)
 		if !spnego.Init {
 			rejectSPNEGO(w, l, fmt.Sprintf("%v - SPNEGO negotiation token is not a NegTokenInit: %v", r.RemoteAddr, err))
 			return
 		}
-		if !spnego.NegTokenInit.MechTypes[0].Equal(GSSAPI.MechTypeOID_Krb5) {
+		if !spnego.NegTokenInit.MechTypes[0].Equal(gssapi.MechTypeOID_Krb5) {
 			rejectSPNEGO(w, l, fmt.Sprintf("%v - SPNEGO OID of MechToken is not of type KRB5", r.RemoteAddr))
 			return
 		}
-		var mt GSSAPI.MechToken
+		var mt gssapi.MechToken
 		err = mt.Unmarshal(spnego.NegTokenInit.MechToken)
 		if err != nil {
 			rejectSPNEGO(w, l, fmt.Sprintf("%v - SPNEGO error unmarshaling MechToken: %v", r.RemoteAddr, err))