merge 6.3p1

1 files changed, 5 insertions, 5 deletions

diff --git a/authfd.c b/authfd.c
index f037e838b..775786bee 100644
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfd.c,v 1.86 2011/07/06 18:09:21 tedu Exp $ */
+/* $OpenBSD: authfd.c,v 1.87 2013/05/17 00:13:13 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -224,7 +224,7 @@ ssh_close_authentication_connection(AuthenticationConnection *auth)
 {
         buffer_free(&auth->identities);
         close(auth->fd);
-        xfree(auth);
+        free(auth);
 }
 
 /* Lock/unlock agent */
@@ -343,7 +343,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
                 blob = buffer_get_string(&auth->identities, &blen);
                 *comment = buffer_get_string(&auth->identities, NULL);
                 key = key_from_blob(blob, blen);
-                xfree(blob);
+                free(blob);
                 break;
         default:
                 return NULL;
@@ -436,7 +436,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
         buffer_put_string(&msg, blob, blen);
         buffer_put_string(&msg, data, datalen);
         buffer_put_int(&msg, flags);
-        xfree(blob);
+        free(blob);
 
         if (ssh_request_reply(auth, &msg, &msg) == 0) {
                 buffer_free(&msg);
@@ -612,7 +612,7 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
                 key_to_blob(key, &blob, &blen);
                 buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
                 buffer_put_string(&msg, blob, blen);
-                xfree(blob);
+                free(blob);
         } else {
                 buffer_free(&msg);
                 return 0;