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-keysign.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'ssh-keysign.c')

diff --git a/ssh-keysign.c b/ssh-keysign.c
index 1deb7e141..9a6653c7c 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keysign.c,v 1.36 2011/02/16 00:31:14 djm Exp $ */
+/* $OpenBSD: ssh-keysign.c,v 1.37 2013/05/17 00:13:14 djm Exp $ */
 /*
  * Copyright (c) 2002 Markus Friedl.  All rights reserved.
  *
@@ -78,7 +78,7 @@ valid_request(struct passwd *pw, char *host, Key **ret, u_char *data,
 	p = buffer_get_string(&b, &len);
 	if (len != 20 && len != 32)
 		fail++;
-	xfree(p);
+	free(p);
 
 	if (buffer_get_char(&b) != SSH2_MSG_USERAUTH_REQUEST)
 		fail++;
@@ -90,13 +90,13 @@ valid_request(struct passwd *pw, char *host, Key **ret, u_char *data,
 	p = buffer_get_string(&b, NULL);
 	if (strcmp("ssh-connection", p) != 0)
 		fail++;
-	xfree(p);
+	free(p);
 
 	/* method */
 	p = buffer_get_string(&b, NULL);
 	if (strcmp("hostbased", p) != 0)
 		fail++;
-	xfree(p);
+	free(p);
 
 	/* pubkey */
 	pkalg = buffer_get_string(&b, NULL);
@@ -109,8 +109,8 @@ valid_request(struct passwd *pw, char *host, Key **ret, u_char *data,
 		fail++;
 	else if (key->type != pktype)
 		fail++;
-	xfree(pkalg);
-	xfree(pkblob);
+	free(pkalg);
+	free(pkblob);
 
 	/* client host name, handle trailing dot */
 	p = buffer_get_string(&b, &len);
@@ -121,14 +121,14 @@ valid_request(struct passwd *pw, char *host, Key **ret, u_char *data,
 		fail++;
 	else if (strncasecmp(host, p, len - 1) != 0)
 		fail++;
-	xfree(p);
+	free(p);
 
 	/* local user */
 	p = buffer_get_string(&b, NULL);
 
 	if (strcmp(pw->pw_name, p) != 0)
 		fail++;
-	xfree(p);
+	free(p);
 
 	/* end of message */
 	if (buffer_len(&b) != 0)
@@ -233,7 +233,7 @@ main(int argc, char **argv)
 	data = buffer_get_string(&b, &dlen);
 	if (valid_request(pw, host, &key, data, dlen) < 0)
 		fatal("not a valid request");
-	xfree(host);
+	free(host);
 
 	found = 0;
 	for (i = 0; i < NUM_KEYTYPES; i++) {
@@ -248,7 +248,7 @@ main(int argc, char **argv)
 
 	if (key_sign(keys[i], &signature, &slen, data, dlen) != 0)
 		fatal("key_sign failed");
-	xfree(data);
+	free(data);
 
 	/* send reply */
 	buffer_clear(&b);
-- 
cgit v1.2.3