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 /jpake.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 'jpake.c')
-rw-r--r-- | jpake.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: jpake.c,v 1.7 2012/06/18 11:43:53 dtucker Exp $ */ | 1 | /* $OpenBSD: jpake.c,v 1.8 2013/05/17 00:13:13 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 3 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
4 | * | 4 | * |
@@ -106,7 +106,7 @@ jpake_free(struct jpake_ctx *pctx) | |||
106 | do { \ | 106 | do { \ |
107 | if ((v) != NULL) { \ | 107 | if ((v) != NULL) { \ |
108 | bzero((v), (l)); \ | 108 | bzero((v), (l)); \ |
109 | xfree(v); \ | 109 | free(v); \ |
110 | (v) = NULL; \ | 110 | (v) = NULL; \ |
111 | (l) = 0; \ | 111 | (l) = 0; \ |
112 | } \ | 112 | } \ |
@@ -134,7 +134,7 @@ jpake_free(struct jpake_ctx *pctx) | |||
134 | #undef JPAKE_BUF_CLEAR_FREE | 134 | #undef JPAKE_BUF_CLEAR_FREE |
135 | 135 | ||
136 | bzero(pctx, sizeof(*pctx)); | 136 | bzero(pctx, sizeof(*pctx)); |
137 | xfree(pctx); | 137 | free(pctx); |
138 | } | 138 | } |
139 | 139 | ||
140 | /* dump entire jpake_ctx. NB. includes private values! */ | 140 | /* dump entire jpake_ctx. NB. includes private values! */ |
@@ -445,7 +445,7 @@ jpake_check_confirm(const BIGNUM *k, | |||
445 | expected_confirm_hash_len) == 0) | 445 | expected_confirm_hash_len) == 0) |
446 | success = 1; | 446 | success = 1; |
447 | bzero(expected_confirm_hash, expected_confirm_hash_len); | 447 | bzero(expected_confirm_hash, expected_confirm_hash_len); |
448 | xfree(expected_confirm_hash); | 448 | free(expected_confirm_hash); |
449 | debug3("%s: success = %d", __func__, success); | 449 | debug3("%s: success = %d", __func__, success); |
450 | return success; | 450 | return success; |
451 | } | 451 | } |