- (bal) auth1.c minor resync while looking at the code.

[openssh.git] / sshconnect2.c

diff --git a/sshconnect2.c b/sshconnect2.c
index 5859199d71acfcfa5d84de2ad7a4ef28f614168f..90b884a398d261f78aaa35c6358f9a5dfefbc6f7 100644 (file)
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.109 2002/12/13 10:03:15 markus Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.115 2003/04/02 09:48:07 markus Exp $");
 
 #include "ssh.h"
 #include "ssh2.h"
@@ -82,7 +82,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
        xxx_hostaddr = hostaddr;
 
        if (options.ciphers == (char *)-1) {
-               log("No valid ciphers for protocol version 2 given, using defaults.");
+               logit("No valid ciphers for protocol version 2 given, using defaults.");
                options.ciphers = NULL;
        }
        if (options.ciphers != NULL) {
@@ -108,8 +108,13 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
                myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
                    options.hostkeyalgorithms;
 
+       if (options.rekey_limit)
+               packet_set_rekey_limit(options.rekey_limit);
+
        /* start key exchange */
        kex = kex_setup(myproposal);
+       kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client;
+       kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
        kex->client_version_string=client_version_string;
        kex->server_version_string=server_version_string;
        kex->verify_host_key=&verify_host_key_callback;
@@ -344,7 +349,7 @@ input_userauth_failure(int type, u_int32_t seq, void *ctxt)
        packet_check_eom();
 
        if (partial != 0)
-               log("Authenticated with partial success.");
+               logit("Authenticated with partial success.");
        debug("Authentications that can continue: %s", authlist);
 
        clear_auth_state(authctxt);
@@ -489,7 +494,7 @@ input_userauth_passwd_changereq(int type, u_int32_t seqnr, void *ctxt)
        info = packet_get_string(NULL);
        lang = packet_get_string(NULL);
        if (strlen(info) > 0)
-               log("%s", info);
+               logit("%s", info);
        xfree(info);
        xfree(lang);
        packet_start(SSH2_MSG_USERAUTH_REQUEST);
@@ -521,7 +526,7 @@ input_userauth_passwd_changereq(int type, u_int32_t seqnr, void *ctxt)
                if (strcmp(password, retype) != 0) {
                        memset(password, 0, strlen(password));
                        xfree(password);
-                       log("Mismatch; try again, EOF to quit.");
+                       logit("Mismatch; try again, EOF to quit.");
                        password = NULL;
                }
                memset(retype, 0, strlen(retype));
@@ -860,9 +865,9 @@ input_userauth_info_req(int type, u_int32_t seq, void *ctxt)
        inst = packet_get_string(NULL);
        lang = packet_get_string(NULL);
        if (strlen(name) > 0)
-               log("%s", name);
+               logit("%s", name);
        if (strlen(inst) > 0)
-               log("%s", inst);
+               logit("%s", inst);
        xfree(name);
        xfree(inst);
        xfree(lang);
@@ -1012,6 +1017,7 @@ userauth_hostbased(Authctxt *authctxt)
        strlcpy(chost, p, len);
        strlcat(chost, ".", len);
        debug2("userauth_hostbased: chost %s", chost);
+       xfree(p);
 
        service = datafellows & SSH_BUG_HBSERVICE ? "ssh-userauth" :
            authctxt->service;