From a627d42e51ffa71e014d7b2d2c07118122fd3ec3 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sun, 2 Jun 2013 07:31:17 +1000
Subject:    - 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@

---
 ssh-pkcs11-helper.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'ssh-pkcs11-helper.c')

diff --git a/ssh-pkcs11-helper.c b/ssh-pkcs11-helper.c
index 5c09f122..39b2e7c5 100644
--- a/ssh-pkcs11-helper.c
+++ b/ssh-pkcs11-helper.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-pkcs11-helper.c,v 1.5 2013/05/10 10:13:50 dtucker Exp $ */
+/* $OpenBSD: ssh-pkcs11-helper.c,v 1.6 2013/05/17 00:13:14 djm Exp $ */
 /*
  * Copyright (c) 2010 Markus Friedl.  All rights reserved.
  *
@@ -79,7 +79,7 @@ del_keys_by_name(char *name)
 		nxt = TAILQ_NEXT(ki, next);
 		if (!strcmp(ki->providername, name)) {
 			TAILQ_REMOVE(&pkcs11_keylist, ki, next);
-			xfree(ki->providername);
+			free(ki->providername);
 			key_free(ki->key);
 			free(ki);
 		}
@@ -130,15 +130,15 @@ process_add(void)
 			key_to_blob(keys[i], &blob, &blen);
 			buffer_put_string(&msg, blob, blen);
 			buffer_put_cstring(&msg, name);
-			xfree(blob);
+			free(blob);
 			add_key(keys[i], name);
 		}
-		xfree(keys);
+		free(keys);
 	} else {
 		buffer_put_char(&msg, SSH_AGENT_FAILURE);
 	}
-	xfree(pin);
-	xfree(name);
+	free(pin);
+	free(name);
 	send_msg(&msg);
 	buffer_free(&msg);
 }
@@ -157,8 +157,8 @@ process_del(void)
 		 buffer_put_char(&msg, SSH_AGENT_SUCCESS);
 	else
 		 buffer_put_char(&msg, SSH_AGENT_FAILURE);
-	xfree(pin);
-	xfree(name);
+	free(pin);
+	free(name);
 	send_msg(&msg);
 	buffer_free(&msg);
 }
@@ -195,10 +195,9 @@ process_sign(void)
 	} else {
 		buffer_put_char(&msg, SSH_AGENT_FAILURE);
 	}
-	xfree(data);
-	xfree(blob);
-	if (signature != NULL)
-		xfree(signature);
+	free(data);
+	free(blob);
+	free(signature);
 	send_msg(&msg);
 	buffer_free(&msg);
 }
-- 
cgit v1.2.1