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 /sshconnect.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 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sshconnect.c b/sshconnect.c index 8f527aa43..aaae5fc9f 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.282 2017/06/24 05:37:44 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.283 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 |
@@ -48,7 +48,6 @@ | |||
48 | #include "key.h" | 48 | #include "key.h" |
49 | #include "hostfile.h" | 49 | #include "hostfile.h" |
50 | #include "ssh.h" | 50 | #include "ssh.h" |
51 | #include "rsa.h" | ||
52 | #include "buffer.h" | 51 | #include "buffer.h" |
53 | #include "packet.h" | 52 | #include "packet.h" |
54 | #include "uidswap.h" | 53 | #include "uidswap.h" |