- 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, 9 insertions, 9 deletions

diff --git a/bufbn.c b/bufbn.c
index 251cd0951..1fbfbbcc9 100644
--- a/bufbn.c
+++ b/bufbn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bufbn.c,v 1.6 2007/06/02 09:04:58 djm Exp $*/
+/* $OpenBSD: bufbn.c,v 1.7 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
@@ -69,7 +69,7 @@ buffer_put_bignum_ret(Buffer *buffer, const BIGNUM *value)
         if (oi != bin_size) {
                 error("buffer_put_bignum_ret: BN_bn2bin() failed: oi %d != bin_size %d",
                     oi, bin_size);
-                xfree(buf);
+                free(buf);
                 return (-1);
         }
 
@@ -80,7 +80,7 @@ buffer_put_bignum_ret(Buffer *buffer, const BIGNUM *value)
         buffer_append(buffer, buf, oi);
 
         memset(buf, 0, bin_size);
-        xfree(buf);
+        free(buf);
 
         return (0);
 }
@@ -167,13 +167,13 @@ buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
         if (oi < 0 || (u_int)oi != bytes - 1) {
                 error("buffer_put_bignum2_ret: BN_bn2bin() failed: "
                     "oi %d != bin_size %d", oi, bytes);
-                xfree(buf);
+                free(buf);
                 return (-1);
         }
         hasnohigh = (buf[1] & 0x80) ? 0 : 1;
         buffer_put_string(buffer, buf+hasnohigh, bytes-hasnohigh);
         memset(buf, 0, bytes);
-        xfree(buf);
+        free(buf);
         return (0);
 }
 
@@ -197,21 +197,21 @@ buffer_get_bignum2_ret(Buffer *buffer, BIGNUM *value)
 
         if (len > 0 && (bin[0] & 0x80)) {
                 error("buffer_get_bignum2_ret: negative numbers not supported");
-                xfree(bin);
+                free(bin);
                 return (-1);
         }
         if (len > 8 * 1024) {
                 error("buffer_get_bignum2_ret: cannot handle BN of size %d",
                     len);
-                xfree(bin);
+                free(bin);
                 return (-1);
         }
         if (BN_bin2bn(bin, len, value) == NULL) {
                 error("buffer_get_bignum2_ret: BN_bin2bn failed");
-                xfree(bin);
+                free(bin);
                 return (-1);
         }
-        xfree(bin);
+        free(bin);
         return (0);
 }