- millert@cvs.openbsd.org 2001/03/04 17:42:28

[openssh.git] / sshconnect1.c

diff --git a/sshconnect1.c b/sshconnect1.c
index 80b769b47deeb471705dc986c9bf177dfa67ce69..c5ff7213a01e7dfeda64f41c6061808f7d7ca5c5 100644 (file)
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect1.c,v 1.22 2001/02/03 10:08:37 markus Exp $");
+RCSID("$OpenBSD: sshconnect1.c,v 1.27 2001/02/15 23:19:59 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/evp.h>
@@ -56,7 +56,7 @@ extern char *__progname;
  * authenticate using the agent.
  */
 int
-try_agent_authentication()
+try_agent_authentication(void)
 {
        int type;
        char *comment;
@@ -380,7 +380,7 @@ try_rhosts_rsa_authentication(const char *local_user, RSA * host_key)
 
 #ifdef KRB4
 int
-try_kerberos_authentication()
+try_kerberos_authentication(void)
 {
        KTEXT_ST auth;          /* Kerberos data */
        char *reply;
@@ -497,7 +497,7 @@ try_kerberos_authentication()
 
 #ifdef AFS
 int
-send_kerberos_tgt()
+send_kerberos_tgt(void)
 {
        CREDENTIALS *creds;
        char pname[ANAME_SZ], pinst[INST_SZ], prealm[REALM_SZ];
@@ -616,7 +616,7 @@ send_afs_tokens(void)
  * Note that the client code is not tied to s/key or TIS.
  */
 int
-try_challenge_reponse_authentication()
+try_challenge_reponse_authentication(void)
 {
        int type, i;
        int payload_len;
@@ -658,7 +658,7 @@ try_challenge_reponse_authentication()
                        break;
                }
                packet_start(SSH_CMSG_AUTH_TIS_RESPONSE);
-               packet_put_string(response, strlen(response));
+               ssh_put_password(response);
                memset(response, 0, strlen(response));
                xfree(response);
                packet_send();
@@ -691,7 +691,7 @@ try_password_authentication(char *prompt)
                        error("Permission denied, please try again.");
                password = read_passphrase(prompt, 0);
                packet_start(SSH_CMSG_AUTH_PASSWORD);
-               packet_put_string(password, strlen(password));
+               ssh_put_password(password);
                memset(password, 0, strlen(password));
                xfree(password);
                packet_send();
@@ -1032,7 +1032,7 @@ ssh_userauth(
            options.password_authentication && !options.batch_mode) {
                char prompt[80];
 
-               snprintf(prompt, sizeof(prompt), "%.30s@%.40s's password: ",
+               snprintf(prompt, sizeof(prompt), "%.30s@%.128s's password: ",
                    server_user, host);
                if (try_password_authentication(prompt))
                        return;