diff options
| author | Niall Sheridan <nsheridan@gmail.com> | 2017-01-09 10:07:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-09 10:07:56 +0000 |
| commit | fc190076448ebf1710910a89b584857cbc89d159 (patch) | |
| tree | b82061b8a2af25fbc13f6f9792d42ed7a2ed9d54 /client | |
| parent | a4b5776500b1250b61c3dafd17e464fdf3f3aae8 (diff) | |
| parent | 6dfe350cb5eefde3a99374d14c083d1906717ddd (diff) | |
Merge branch 'master' into opts2
Diffstat (limited to 'client')
| -rw-r--r-- | client/client.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/client/client.go b/client/client.go index e69f353..b13c4cb 100644 --- a/client/client.go +++ b/client/client.go @@ -79,11 +79,8 @@ func Sign(pub ssh.PublicKey, token string, conf *Config) (*ssh.Certificate, erro if err != nil { return nil, err } - marshaled := ssh.MarshalAuthorizedKey(pub) - // Remove the trailing newline. - marshaled = marshaled[:len(marshaled)-1] s, err := json.Marshal(&lib.SignRequest{ - Key: string(marshaled), + Key: lib.GetPublicKey(pub), ValidUntil: time.Now().Add(validity), }) if err != nil { |