summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-03-03 21:21:13 +0000
committerDamien Miller <djm@mindrot.org>2015-03-04 08:24:11 +1100
commit111dfb225478a76f89ecbcd31e96eaf1311b59d3 (patch)
tree40b840a362d666ca7ea60e8fd148bb7fb02d3ec8
parent3f7f5e6c5d2aa3f6710289c1a30119e534e56c5c (diff)
upstream commit
add SSH1 Makefile knob to make it easier to build without SSH1 support; ok markus@
-rw-r--r--ssh-agent.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ssh-agent.c b/ssh-agent.c
index 41e12acc..cff859ff 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.197 2015/01/28 22:36:00 djm Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.198 2015/03/03 21:21:13 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -541,6 +541,7 @@ reaper(void)
* XXX this and the corresponding serialisation function probably belongs
* in key.c
*/
+#ifdef WITH_SSH1
static int
agent_decode_rsa1(struct sshbuf *m, struct sshkey **kp)
{
@@ -655,6 +656,7 @@ process_add_identity(SocketEntry *e, int version)
send:
send_status(e, success);
}
+#endif /* WITH_SSH1 */
/* XXX todo: encrypt sensitive data with passphrase */
static void