diff options
| author | Damien Miller <djm@mindrot.org> | 2015-03-03 13:48:48 -0800 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-03-03 13:48:48 -0800 |
| commit | 6c2039286f503e2012a58a1d109e389016e7a99b (patch) | |
| tree | 013b71a77321df285ef5f030f91202cd34f2a78a | |
| parent | 111dfb225478a76f89ecbcd31e96eaf1311b59d3 (diff) | |
fix merge both that broke --without-ssh1 compile
| -rw-r--r-- | ssh-agent.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index cff859ff..49241052 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -536,7 +536,6 @@ reaper(void) return (deadline - now); } -#ifdef WITH_SSH1 /* * XXX this and the corresponding serialisation function probably belongs * in key.c @@ -579,7 +578,7 @@ agent_decode_rsa1(struct sshbuf *m, struct sshkey **kp) sshkey_free(k); return r; } -#endif +#endif /* WITH_SSH1 */ static void process_add_identity(SocketEntry *e, int version) @@ -656,7 +655,6 @@ process_add_identity(SocketEntry *e, int version) send: send_status(e, success); } -#endif /* WITH_SSH1 */ /* XXX todo: encrypt sensitive data with passphrase */ static void |