RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-28 21:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge both that broke --without-ssh1 compile

Browse Source
This commit is contained in:
Damien Miller 2015-03-03 13:48:48 -08:00
parent 111dfb2254
commit 6c2039286f
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssh-agent.c
View File

@ -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