diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-06-02 07:31:17 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-06-02 07:31:17 +1000 |
commit | a627d42e51ffa71e014d7b2d2c07118122fd3ec3 (patch) | |
tree | 7bda769de81f509e28d800916fa20abd37906d79 /kexecdhs.c | |
parent | c7aad0058c957afeb26a3f703e8cb0eddeb62365 (diff) |
- 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@
Diffstat (limited to 'kexecdhs.c')
-rw-r--r-- | kexecdhs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kexecdhs.c b/kexecdhs.c index 6519abbef..c42dcf448 100644 --- a/kexecdhs.c +++ b/kexecdhs.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexecdhs.c,v 1.3 2013/04/19 01:06:50 djm Exp $ */ | 1 | /* $OpenBSD: kexecdhs.c,v 1.4 2013/05/17 00:13:13 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2010 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2010 Damien Miller. All rights reserved. |
@@ -112,7 +112,7 @@ kexecdh_server(Kex *kex) | |||
112 | if (BN_bin2bn(kbuf, klen, shared_secret) == NULL) | 112 | if (BN_bin2bn(kbuf, klen, shared_secret) == NULL) |
113 | fatal("%s: BN_bin2bn failed", __func__); | 113 | fatal("%s: BN_bin2bn failed", __func__); |
114 | memset(kbuf, 0, klen); | 114 | memset(kbuf, 0, klen); |
115 | xfree(kbuf); | 115 | free(kbuf); |
116 | 116 | ||
117 | /* calc H */ | 117 | /* calc H */ |
118 | key_to_blob(server_host_public, &server_host_key_blob, &sbloblen); | 118 | key_to_blob(server_host_public, &server_host_key_blob, &sbloblen); |
@@ -152,8 +152,8 @@ kexecdh_server(Kex *kex) | |||
152 | packet_put_string(signature, slen); | 152 | packet_put_string(signature, slen); |
153 | packet_send(); | 153 | packet_send(); |
154 | 154 | ||
155 | xfree(signature); | 155 | free(signature); |
156 | xfree(server_host_key_blob); | 156 | free(server_host_key_blob); |
157 | /* have keys, free server key */ | 157 | /* have keys, free server key */ |
158 | EC_KEY_free(server_key); | 158 | EC_KEY_free(server_key); |
159 | 159 | ||