diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-07-01 13:50:45 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-07-21 14:17:32 +1000 |
commit | 83fa3a044891887369ce8b487ce88d713a04df48 (patch) | |
tree | f5d227629414d0a30ef14141a5613ed31fd1985c /sshd.c | |
parent | 738c73dca2c99ee78c531b4cbeefc2008fe438f0 (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 'sshd.c')
-rw-r--r-- | sshd.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.490 2017/05/31 08:09:45 markus Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.491 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 |
@@ -88,7 +88,6 @@ | |||
88 | #include "xmalloc.h" | 88 | #include "xmalloc.h" |
89 | #include "ssh.h" | 89 | #include "ssh.h" |
90 | #include "ssh2.h" | 90 | #include "ssh2.h" |
91 | #include "rsa.h" | ||
92 | #include "sshpty.h" | 91 | #include "sshpty.h" |
93 | #include "packet.h" | 92 | #include "packet.h" |
94 | #include "log.h" | 93 | #include "log.h" |