Update for nkey changes

Signed-off-by: Derek Collison <derek@nats.io>

server/auth.go

@@ -251,7 +251,7 @@ func (s *Server) isClientAuthorized(c *client) bool {
 		if c.opts.Sig == "" {
 			return false
 		}
-		sig, err := base64.RawURLEncoding.DecodeString(c.opts.Sig)
+		sig, err := base64.StdEncoding.DecodeString(c.opts.Sig)
 		if err != nil {
 			return false
 		}

server/nkey.go

@@ -19,8 +19,8 @@ import (
 
 // Raw length of the nonce challenge
 const (
-	nonceRawLen = 16
-	nonceLen    = 22 // base64.RawURLEncoding.EncodedLen(nonceRawLen)
+	nonceRawLen = 11
+	nonceLen    = 16 // base64.StdEncoding.EncodedLen(nonceRawLen)
 )
 
 // nonceRequired tells us if we should send a nonce.
@@ -35,5 +35,5 @@ func (s *Server) generateNonce(n []byte) {
 	var raw [nonceRawLen]byte
 	data := raw[:]
 	s.prand.Read(data)
-	base64.RawURLEncoding.Encode(n, data)
+	base64.StdEncoding.Encode(n, data)
 }

server/nkey_test.go

@@ -37,7 +37,7 @@ type nonceInfo struct {
 }
 
 // This is a seed for a user. We can extract public and private keys from this for testing.
-const seed = "SUAOB32VQGYIOM622XYNXN4Q6GQR5I6DFZPPYZMNI5MMNVAQZDAL3OLH554ISOUTJM4EC6NWS5UHMS4CMONVVRW3VXXEQULMR6MDLPOEUVFPU"
+const seed = "SUAKYRHVIOREXV7EUZTBHUHL7NUMHPMAS7QMDU3GTIUWEI5LDNOXD43IZY"
 
 func nkeyBasicSetup() (*Server, *client, *bufio.Reader, string) {
 	kp, _ := nkeys.FromSeed(seed)
@@ -161,7 +161,7 @@ func TestNkeyClientConnect(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed signing nonce: %v", err)
 	}
-	sig := base64.RawURLEncoding.EncodeToString(sigraw)
+	sig := base64.StdEncoding.EncodeToString(sigraw)
 
 	// PING needed to flush the +OK to us.
 	cs = fmt.Sprintf("CONNECT {\"nkey\":%q,\"sig\":\"%s\",\"verbose\":true,\"pedantic\":true}\r\nPING\r\n", pubKey, sig)
@@ -199,7 +199,7 @@ func TestMixedClientConnect(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed signing nonce: %v", err)
 	}
-	sig := base64.RawURLEncoding.EncodeToString(sigraw)
+	sig := base64.StdEncoding.EncodeToString(sigraw)
 
 	// PING needed to flush the +OK to us.
 	cs := fmt.Sprintf("CONNECT {\"nkey\":%q,\"sig\":\"%s\",\"verbose\":true,\"pedantic\":true}\r\nPING\r\n", pubKey, sig)
@@ -252,17 +252,17 @@ func BenchmarkNonceGeneration(b *testing.B) {
 	prand := mrand.New(mrand.NewSource(time.Now().UnixNano()))
 	for i := 0; i < b.N; i++ {
 		prand.Read(data)
-		base64.RawURLEncoding.Encode(b64, data)
+		base64.StdEncoding.Encode(b64, data)
 	}
 }
 
 func BenchmarkPublicVerify(b *testing.B) {
 	data := make([]byte, nonceRawLen)
 	nonce := make([]byte, nonceLen)
 	mrand.Read(data)
-	base64.RawURLEncoding.Encode(nonce, data)
+	base64.StdEncoding.Encode(nonce, data)
 
-	user, err := nkeys.CreateUser(nil)
+	user, err := nkeys.CreateUser()
 	if err != nil {
 		b.Fatalf("Error creating User Nkey: %v", err)
 	}

vendor/manifest

@@ -5,7 +5,7 @@
 			"importpath": "github.com/nats-io/nkeys",
 			"repository": "https://github.com/nats-io/nkeys",
 			"vcs": "git",
-			"revision": "b1c20ce69b6a01afa42403ea6f7b408d6cbc8e4e",
+			"revision": "9206fa847ab4dfdf7378fb1965717f32978852e2",
 			"branch": "master",
 			"notests": true
 		},