upstream: convert sshconnect.c to new packet API

with & ok markus@

OpenBSD-Commit-ID: 222337cf6c96c347f1022d976fac74b4257c061f

diff --git a/sshconnect.c b/sshconnect.c
index 346f979d13a39997e3843d9adb378e6499400745..1a5f6a4c8e161ad7e32fce38992209c82c669452 100644 (file)
--- 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)

diff --git a/sshconnect.h b/sshconnect.h
index 44a5071c7197a6640f3c104967e07b3df894a2bc..6e8989b27b80400f7a16ba082fbe44e4f0ad96ca 100644 (file)
--- a/sshconnect.h
+++ b/sshconnect.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.h,v 1.36 2018/12/27 03:25:25 djm Exp $ */
+/* $OpenBSD: sshconnect.h,v 1.37 2019/01/19 21:36:38 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -50,7 +50,6 @@ void   ssh_kex2(struct ssh *ssh, char *, struct sockaddr *, u_short);
 void    ssh_userauth2(struct ssh *ssh, const char *, const char *,
     char *, Sensitive *);
 
-void    ssh_put_password(char *);
 int     ssh_local_cmd(const char *);
 
 void    maybe_add_key_to_agent(char *, const struct sshkey *, char *, char *);