summaryrefslogtreecommitdiffstats
path: root/sshconnect.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-01-19 21:36:38 +0000
committerDamien Miller <djm@mindrot.org>2019-01-20 09:02:36 +1100
commit06232038c794c7dfcb087be0ab0b3e65b09fd396 (patch)
tree94d9de6fc04514e4eb83dc80a36b03d7184385a1 /sshconnect.c
parent25b2ed667216314471bb66752442c55b95792dc3 (diff)
upstream: convert sshconnect.c to new packet API
with & ok markus@ OpenBSD-Commit-ID: 222337cf6c96c347f1022d976fac74b4257c061f
Diffstat (limited to 'sshconnect.c')
-rw-r--r--sshconnect.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/sshconnect.c b/sshconnect.c
index 346f979d..1a5f6a4c 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.310 2019/01/19 21:31:32 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.311 2019/01/19 21:36:38 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -70,9 +70,6 @@
#include "authfd.h"
#include "kex.h"
-#include "opacket.h" /* XXX */
-extern struct ssh *active_state; /* XXX */
-
struct sshkey *previous_host_key = NULL;
static int matching_host_key_dns = 0;
@@ -1285,24 +1282,6 @@ ssh_login(struct ssh *ssh, Sensitive *sensitive, const char *orighost,
free(local_user);
}
-void
-ssh_put_password(char *password)
-{
- int size;
- char *padded;
-
- if (datafellows & SSH_BUG_PASSWORDPAD) {
- packet_put_cstring(password);
- return;
- }
- size = ROUNDUP(strlen(password) + 1, 32);
- padded = xcalloc(1, size);
- strlcpy(padded, password, size);
- packet_put_string(padded, size);
- explicit_bzero(padded, size);
- free(padded);
-}
-
/* print all known host keys for a given host, but skip keys of given type */
static int
show_other_keys(struct hostkeys *hostkeys, struct sshkey *key)