merge 6.3p1

1 files changed, 3 insertions, 3 deletions

diff --git a/compat.c b/compat.c
index f680f4fe3..ac353a706 100644
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat.c,v 1.80 2012/08/17 01:30:00 djm Exp $ */
+/* $OpenBSD: compat.c,v 1.81 2013/05/17 00:13:13 djm Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
@@ -204,7 +204,7 @@ proto_spec(const char *spec)
                         break;
                 }
         }
-        xfree(s);
+        free(s);
         return ret;
 }
 
@@ -230,7 +230,7 @@ compat_cipher_proposal(char *cipher_prop)
         buffer_append(&b, "\0", 1);
         fix_ciphers = xstrdup(buffer_ptr(&b));
         buffer_free(&b);
-        xfree(orig_prop);
+        free(orig_prop);
         debug2("Original cipher proposal: %s", cipher_prop);
         debug2("Compat cipher proposal: %s", fix_ciphers);
         if (!*fix_ciphers)