aboutsummaryrefslogtreecommitdiff
path: root/crypto/openssh/kexgexc.c
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2013-09-21 21:36:09 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2013-09-21 21:36:09 +0000
commite4a9863fb76a1f6b16ecbcbd31e88f4ad9a9565e (patch)
treea72d0647ecce54e017341118e11204ee4ba0de68 /crypto/openssh/kexgexc.c
parent284c68d92b8cf2cfa4d67e6198706f744e64016d (diff)
parent0dddc34c88de4b0421dbb5279ad265a3615cc0bf (diff)
downloadsrc-e4a9863fb76a1f6b16ecbcbd31e88f4ad9a9565e.tar.gz
src-e4a9863fb76a1f6b16ecbcbd31e88f4ad9a9565e.zip
Upgrade to 6.3p1.
Approved by: re (gjb)
Notes
Notes: svn path=/head/; revision=255767
Diffstat (limited to 'crypto/openssh/kexgexc.c')
-rw-r--r--crypto/openssh/kexgexc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/openssh/kexgexc.c b/crypto/openssh/kexgexc.c
index 79552d70983a..5a3be200523e 100644
--- a/crypto/openssh/kexgexc.c
+++ b/crypto/openssh/kexgexc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexc.c,v 1.12 2010/11/10 01:33:07 djm Exp $ */
+/* $OpenBSD: kexgexc.c,v 1.13 2013/05/17 00:13:13 djm Exp $ */
/*
* Copyright (c) 2000 Niels Provos. All rights reserved.
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -163,7 +163,7 @@ kexgex_client(Kex *kex)
if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
fatal("kexgex_client: BN_bin2bn failed");
memset(kbuf, 0, klen);
- xfree(kbuf);
+ free(kbuf);
if (datafellows & SSH_OLD_DHGEX)
min = max = -1;
@@ -186,13 +186,13 @@ kexgex_client(Kex *kex)
/* have keys, free DH */
DH_free(dh);
- xfree(server_host_key_blob);
+ free(server_host_key_blob);
BN_clear_free(dh_server_pub);
if (key_verify(server_host_key, signature, slen, hash, hashlen) != 1)
fatal("key_verify failed for server_host_key");
key_free(server_host_key);
- xfree(signature);
+ free(signature);
/* save session id */
if (kex->session_id == NULL) {