* New upstream release (http://www.openssh.com/txt/release-6.3).

  - sftp(1): add support for resuming partial downloads using the "reget"
    command and on the sftp commandline or on the "get" commandline using
    the "-a" (append) option (closes: #158590).
  - ssh(1): add an "IgnoreUnknown" configuration option to selectively
    suppress errors arising from unknown configuration directives (closes:
    #436052).
  - sftp(1): update progressmeter when data is acknowledged, not when it's
    sent (partially addresses #708372).
  - ssh(1): do not fatally exit when attempting to cleanup multiplexing-
    created channels that are incompletely opened (closes: #651357).

1 files changed, 4 insertions, 5 deletions

diff --git a/kexgssc.c b/kexgssc.c
index 39be40531..616893c7e 100644
--- a/kexgssc.c
+++ b/kexgssc.c
@@ -144,7 +144,7 @@ kexgss_client(Kex *kex) {
 
                 /* If we've got an old receive buffer get rid of it */
                 if (token_ptr != GSS_C_NO_BUFFER)
-                        xfree(recv_tok.value);
+                        free(recv_tok.value);
 
                 if (maj_status == GSS_S_COMPLETE) {
                         /* If mutual state flag is not true, kex fails */
@@ -261,7 +261,7 @@ kexgss_client(Kex *kex) {
                 fatal("kexdh_client: BN_bin2bn failed");
 
         memset(kbuf, 0, klen);
-        xfree(kbuf);
+        free(kbuf);
 
         switch (kex->kex_type) {
         case KEX_GSS_GRP1_SHA1:
@@ -304,11 +304,10 @@ kexgss_client(Kex *kex) {
         if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok)))
                 packet_disconnect("Hash's MIC didn't verify");
 
-        xfree(msg_tok.value);
+        free(msg_tok.value);
 
         DH_free(dh);
-        if (serverhostkey)
-                xfree(serverhostkey);
+        free(serverhostkey);
         BN_clear_free(dh_server_pub);
 
         /* save session id */