- djm@cvs.openbsd.org 2013/05/17 00:13:13

     [xmalloc.h cipher.c sftp-glob.c ssh-keyscan.c ssh.c sftp-common.c
     ssh-ecdsa.c auth2-chall.c compat.c readconf.c kexgexs.c monitor.c
     gss-genr.c cipher-3des1.c kex.c monitor_wrap.c ssh-pkcs11-client.c
     auth-options.c rsa.c auth2-pubkey.c sftp.c hostfile.c auth2.c
     servconf.c auth.c authfile.c xmalloc.c uuencode.c sftp-client.c
     auth2-gss.c sftp-server.c bufaux.c mac.c session.c jpake.c kexgexc.c
     sshconnect.c auth-chall.c auth2-passwd.c sshconnect1.c buffer.c
     kexecdhs.c kexdhs.c ssh-rsa.c auth1.c ssh-pkcs11.c auth2-kbdint.c
     kexdhc.c sshd.c umac.c ssh-dss.c auth2-jpake.c bufbn.c clientloop.c
     monitor_mm.c scp.c roaming_client.c serverloop.c key.c auth-rsa.c
     ssh-pkcs11-helper.c ssh-keysign.c ssh-keygen.c match.c channels.c
     sshconnect2.c addrmatch.c mux.c canohost.c kexecdhc.c schnorr.c
     ssh-add.c misc.c auth2-hostbased.c ssh-agent.c bufec.c groupaccess.c
     dns.c packet.c readpass.c authfd.c moduli.c]
     bye, bye xfree(); ok markus@

1 files changed, 20 insertions, 21 deletions

diff --git a/sshconnect.c b/sshconnect.c
index cf0711285..483eb85ac 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.237 2013/02/22 19:13:56 markus Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.238 2013/05/17 00:13:14 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -112,7 +112,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command)
         xasprintf(&tmp, "exec %s", proxy_command);
         command_string = percent_expand(tmp, "h", host, "p", strport,
             "r", options.user, (char *)NULL);
-        xfree(tmp);
+        free(tmp);
 
         /* Create pipes for communicating with the proxy. */
         if (pipe(pin) < 0 || pipe(pout) < 0)
@@ -166,7 +166,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command)
         close(pout[1]);
 
         /* Free the command name. */
-        xfree(command_string);
+        free(command_string);
 
         /* Set the connection file descriptors. */
         packet_set_connection(pout[0], pin[1]);
@@ -315,7 +315,7 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr,
                 fatal("Bogus return (%d) from select()", rc);
         }
 
-        xfree(fdset);
+        free(fdset);
 
  done:
         if (result == 0 && *timeoutp > 0) {
@@ -534,7 +534,7 @@ ssh_exchange_identification(int timeout_ms)
                 debug("ssh_exchange_identification: %s", buf);
         }
         server_version_string = xstrdup(buf);
-        xfree(fdset);
+        free(fdset);
 
         /*
          * Check that the versions match.  In future this might accept
@@ -610,8 +610,7 @@ confirm(const char *prompt)
                         ret = 0;
                 if (p && strncasecmp(p, "yes", 3) == 0)
                         ret = 1;
-                if (p)
-                        xfree(p);
+                free(p);
                 if (ret != -1)
                         return ret;
         }
@@ -835,8 +834,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
                         ra = key_fingerprint(host_key, SSH_FP_MD5,
                             SSH_FP_RANDOMART);
                         logit("Host key fingerprint is %s\n%s\n", fp, ra);
-                        xfree(ra);
-                        xfree(fp);
+                        free(ra);
+                        free(fp);
                 }
                 break;
         case HOST_NEW:
@@ -896,8 +895,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
                             options.visual_host_key ? "\n" : "",
                             options.visual_host_key ? ra : "",
                             msg2);
-                        xfree(ra);
-                        xfree(fp);
+                        free(ra);
+                        free(fp);
                         if (!confirm(msg))
                                 goto fail;
                 }
@@ -1098,8 +1097,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
                 }
         }
 
-        xfree(ip);
-        xfree(host);
+        free(ip);
+        free(host);
         if (host_hostkeys != NULL)
                 free_hostkeys(host_hostkeys);
         if (ip_hostkeys != NULL)
@@ -1121,8 +1120,8 @@ fail:
         }
         if (raw_key != NULL)
                 key_free(raw_key);
-        xfree(ip);
-        xfree(host);
+        free(ip);
+        free(host);
         if (host_hostkeys != NULL)
                 free_hostkeys(host_hostkeys);
         if (ip_hostkeys != NULL)
@@ -1139,7 +1138,7 @@ verify_host_key(char *host, struct sockaddr *hostaddr, Key *host_key)
 
         fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX);
         debug("Server host key: %s %s", key_type(host_key), fp);
-        xfree(fp);
+        free(fp);
 
         /* XXX certs are not yet supported for DNS */
         if (!key_is_cert(host_key) && options.verify_host_key_dns &&
@@ -1204,7 +1203,7 @@ ssh_login(Sensitive *sensitive, const char *orighost,
                 ssh_kex(host, hostaddr);
                 ssh_userauth1(local_user, server_user, host, sensitive);
         }
-        xfree(local_user);
+        free(local_user);
 }
 
 void
@@ -1222,7 +1221,7 @@ ssh_put_password(char *password)
         strlcpy(padded, password, size);
         packet_put_string(padded, size);
         memset(padded, 0, size);
-        xfree(padded);
+        free(padded);
 }
 
 /* print all known host keys for a given host, but skip keys of given type */
@@ -1249,8 +1248,8 @@ show_other_keys(struct hostkeys *hostkeys, Key *key)
                     key_type(found->key), fp);
                 if (options.visual_host_key)
                         logit("%s", ra);
-                xfree(ra);
-                xfree(fp);
+                free(ra);
+                free(fp);
                 ret = 1;
         }
         return ret;
@@ -1273,7 +1272,7 @@ warn_changed_key(Key *host_key)
             key_type(host_key), fp);
         error("Please contact your system administrator.");
 
-        xfree(fp);
+        free(fp);
 }
 
 /*