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 /sshd.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 'sshd.c')
-rw-r--r-- | sshd.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.401 2013/05/16 09:08:41 dtucker Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.402 2013/05/17 00:13:14 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -973,7 +973,7 @@ recv_rexec_state(int fd, Buffer *conf) | |||
973 | cp = buffer_get_string(&m, &len); | 973 | cp = buffer_get_string(&m, &len); |
974 | if (conf != NULL) | 974 | if (conf != NULL) |
975 | buffer_append(conf, cp, len + 1); | 975 | buffer_append(conf, cp, len + 1); |
976 | xfree(cp); | 976 | free(cp); |
977 | 977 | ||
978 | if (buffer_get_int(&m)) { | 978 | if (buffer_get_int(&m)) { |
979 | if (sensitive_data.server_key != NULL) | 979 | if (sensitive_data.server_key != NULL) |
@@ -1135,7 +1135,7 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s) | |||
1135 | if (received_sighup) | 1135 | if (received_sighup) |
1136 | sighup_restart(); | 1136 | sighup_restart(); |
1137 | if (fdset != NULL) | 1137 | if (fdset != NULL) |
1138 | xfree(fdset); | 1138 | free(fdset); |
1139 | fdset = (fd_set *)xcalloc(howmany(maxfd + 1, NFDBITS), | 1139 | fdset = (fd_set *)xcalloc(howmany(maxfd + 1, NFDBITS), |
1140 | sizeof(fd_mask)); | 1140 | sizeof(fd_mask)); |
1141 | 1141 | ||
@@ -1484,7 +1484,7 @@ main(int ac, char **av) | |||
1484 | if (process_server_config_line(&options, line, | 1484 | if (process_server_config_line(&options, line, |
1485 | "command-line", 0, NULL, NULL) != 0) | 1485 | "command-line", 0, NULL, NULL) != 0) |
1486 | exit(1); | 1486 | exit(1); |
1487 | xfree(line); | 1487 | free(line); |
1488 | break; | 1488 | break; |
1489 | case '?': | 1489 | case '?': |
1490 | default: | 1490 | default: |
@@ -1506,7 +1506,7 @@ main(int ac, char **av) | |||
1506 | /* If requested, redirect the logs to the specified logfile. */ | 1506 | /* If requested, redirect the logs to the specified logfile. */ |
1507 | if (logfile != NULL) { | 1507 | if (logfile != NULL) { |
1508 | log_redirect_stderr_to(logfile); | 1508 | log_redirect_stderr_to(logfile); |
1509 | xfree(logfile); | 1509 | free(logfile); |
1510 | } | 1510 | } |
1511 | /* | 1511 | /* |
1512 | * Force logging to stderr until we have loaded the private host | 1512 | * Force logging to stderr until we have loaded the private host |
@@ -2307,7 +2307,7 @@ do_ssh1_kex(void) | |||
2307 | MD5_Update(&md, sensitive_data.ssh1_cookie, SSH_SESSION_KEY_LENGTH); | 2307 | MD5_Update(&md, sensitive_data.ssh1_cookie, SSH_SESSION_KEY_LENGTH); |
2308 | MD5_Final(session_key + 16, &md); | 2308 | MD5_Final(session_key + 16, &md); |
2309 | memset(buf, 0, bytes); | 2309 | memset(buf, 0, bytes); |
2310 | xfree(buf); | 2310 | free(buf); |
2311 | for (i = 0; i < 16; i++) | 2311 | for (i = 0; i < 16; i++) |
2312 | session_id[i] = session_key[i] ^ session_key[i + 16]; | 2312 | session_id[i] = session_key[i] ^ session_key[i + 16]; |
2313 | } | 2313 | } |