Fixed key storage.
authorAndrey Petrov <andrey.petrov@shazow.net>
Sun, 11 Jan 2015 01:27:55 +0000 (17:27 -0800)
committerAndrey Petrov <andrey.petrov@shazow.net>
Sun, 11 Jan 2015 01:27:55 +0000 (17:27 -0800)
sshd/auth.go

index 339d158a0e11168a9b569e5bed9b239a10ee6c49..3cf085568a4be2fb1cf3e84d3ce2fcf3e14b42ac 100644 (file)
@@ -27,7 +27,7 @@ func MakeAuth(auth Auth) *ssh.ServerConfig {
                                return nil, err
                        }
                        perm := &ssh.Permissions{Extensions: map[string]string{
-                               "pubkey": string(ssh.MarshalAuthorizedKey(key)),
+                               "pubkey": string(key.Marshal()),
                        }}
                        return perm, nil
                },
@@ -50,7 +50,7 @@ func MakeNoAuth() *ssh.ServerConfig {
                // Auth-related things should be constant-time to avoid timing attacks.
                PublicKeyCallback: func(conn ssh.ConnMetadata, key ssh.PublicKey) (*ssh.Permissions, error) {
                        perm := &ssh.Permissions{Extensions: map[string]string{
-                               "pubkey": string(ssh.MarshalAuthorizedKey(key)),
+                               "pubkey": string(key.Marshal()),
                        }}
                        return perm, nil
                },