summaryrefslogtreecommitdiff
path: root/ssh-agent.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-07-01 13:50:45 +0000
committerDamien Miller <djm@mindrot.org>2017-07-21 14:17:32 +1000
commit83fa3a044891887369ce8b487ce88d713a04df48 (patch)
treef5d227629414d0a30ef14141a5613ed31fd1985c /ssh-agent.c
parent738c73dca2c99ee78c531b4cbeefc2008fe438f0 (diff)
upstream commit
remove post-SSHv1 removal dead code from rsa.c and merge the remaining bit that it still used into ssh-rsa.c; ok markus Upstream-ID: ac8a048d24dcd89594b0052ea5e3404b473bfa2f
Diffstat (limited to 'ssh-agent.c')
-rw-r--r--ssh-agent.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ssh-agent.c b/ssh-agent.c
index 2ef8367b9..eb8c2043d 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.221 2017/04/30 23:29:10 djm Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.222 2017/07/01 13:50:45 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -73,7 +73,6 @@
73 73
74#include "xmalloc.h" 74#include "xmalloc.h"
75#include "ssh.h" 75#include "ssh.h"
76#include "rsa.h"
77#include "sshbuf.h" 76#include "sshbuf.h"
78#include "sshkey.h" 77#include "sshkey.h"
79#include "authfd.h" 78#include "authfd.h"