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 /monitor_wrap.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 'monitor_wrap.c')
-rw-r--r-- | monitor_wrap.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index 3304f5bf2..b1870fcba 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.c,v 1.75 2013/01/08 18:49:04 markus Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.c,v 1.76 2013/05/17 00:13:13 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -288,7 +288,7 @@ out: | |||
288 | #undef M_CP_STRARRAYOPT | 288 | #undef M_CP_STRARRAYOPT |
289 | 289 | ||
290 | copy_set_server_options(&options, newopts, 1); | 290 | copy_set_server_options(&options, newopts, 1); |
291 | xfree(newopts); | 291 | free(newopts); |
292 | 292 | ||
293 | buffer_free(&m); | 293 | buffer_free(&m); |
294 | 294 | ||
@@ -314,7 +314,7 @@ mm_auth2_read_banner(void) | |||
314 | 314 | ||
315 | /* treat empty banner as missing banner */ | 315 | /* treat empty banner as missing banner */ |
316 | if (strlen(banner) == 0) { | 316 | if (strlen(banner) == 0) { |
317 | xfree(banner); | 317 | free(banner); |
318 | banner = NULL; | 318 | banner = NULL; |
319 | } | 319 | } |
320 | return (banner); | 320 | return (banner); |
@@ -407,7 +407,7 @@ mm_key_allowed(enum mm_keytype type, char *user, char *host, Key *key) | |||
407 | buffer_put_cstring(&m, user ? user : ""); | 407 | buffer_put_cstring(&m, user ? user : ""); |
408 | buffer_put_cstring(&m, host ? host : ""); | 408 | buffer_put_cstring(&m, host ? host : ""); |
409 | buffer_put_string(&m, blob, len); | 409 | buffer_put_string(&m, blob, len); |
410 | xfree(blob); | 410 | free(blob); |
411 | 411 | ||
412 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYALLOWED, &m); | 412 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYALLOWED, &m); |
413 | 413 | ||
@@ -450,7 +450,7 @@ mm_key_verify(Key *key, u_char *sig, u_int siglen, u_char *data, u_int datalen) | |||
450 | buffer_put_string(&m, blob, len); | 450 | buffer_put_string(&m, blob, len); |
451 | buffer_put_string(&m, sig, siglen); | 451 | buffer_put_string(&m, sig, siglen); |
452 | buffer_put_string(&m, data, datalen); | 452 | buffer_put_string(&m, data, datalen); |
453 | xfree(blob); | 453 | free(blob); |
454 | 454 | ||
455 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYVERIFY, &m); | 455 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYVERIFY, &m); |
456 | 456 | ||
@@ -619,7 +619,7 @@ mm_send_keystate(struct monitor *monitor) | |||
619 | keylen = packet_get_encryption_key(key); | 619 | keylen = packet_get_encryption_key(key); |
620 | buffer_put_string(&m, key, keylen); | 620 | buffer_put_string(&m, key, keylen); |
621 | memset(key, 0, keylen); | 621 | memset(key, 0, keylen); |
622 | xfree(key); | 622 | free(key); |
623 | 623 | ||
624 | ivlen = packet_get_keyiv_len(MODE_OUT); | 624 | ivlen = packet_get_keyiv_len(MODE_OUT); |
625 | packet_get_keyiv(MODE_OUT, iv, ivlen); | 625 | packet_get_keyiv(MODE_OUT, iv, ivlen); |
@@ -642,13 +642,13 @@ mm_send_keystate(struct monitor *monitor) | |||
642 | fatal("%s: conversion of newkeys failed", __func__); | 642 | fatal("%s: conversion of newkeys failed", __func__); |
643 | 643 | ||
644 | buffer_put_string(&m, blob, bloblen); | 644 | buffer_put_string(&m, blob, bloblen); |
645 | xfree(blob); | 645 | free(blob); |
646 | 646 | ||
647 | if (!mm_newkeys_to_blob(MODE_IN, &blob, &bloblen)) | 647 | if (!mm_newkeys_to_blob(MODE_IN, &blob, &bloblen)) |
648 | fatal("%s: conversion of newkeys failed", __func__); | 648 | fatal("%s: conversion of newkeys failed", __func__); |
649 | 649 | ||
650 | buffer_put_string(&m, blob, bloblen); | 650 | buffer_put_string(&m, blob, bloblen); |
651 | xfree(blob); | 651 | free(blob); |
652 | 652 | ||
653 | packet_get_state(MODE_OUT, &seqnr, &blocks, &packets, &bytes); | 653 | packet_get_state(MODE_OUT, &seqnr, &blocks, &packets, &bytes); |
654 | buffer_put_int(&m, seqnr); | 654 | buffer_put_int(&m, seqnr); |
@@ -668,13 +668,13 @@ mm_send_keystate(struct monitor *monitor) | |||
668 | p = xmalloc(plen+1); | 668 | p = xmalloc(plen+1); |
669 | packet_get_keycontext(MODE_OUT, p); | 669 | packet_get_keycontext(MODE_OUT, p); |
670 | buffer_put_string(&m, p, plen); | 670 | buffer_put_string(&m, p, plen); |
671 | xfree(p); | 671 | free(p); |
672 | 672 | ||
673 | plen = packet_get_keycontext(MODE_IN, NULL); | 673 | plen = packet_get_keycontext(MODE_IN, NULL); |
674 | p = xmalloc(plen+1); | 674 | p = xmalloc(plen+1); |
675 | packet_get_keycontext(MODE_IN, p); | 675 | packet_get_keycontext(MODE_IN, p); |
676 | buffer_put_string(&m, p, plen); | 676 | buffer_put_string(&m, p, plen); |
677 | xfree(p); | 677 | free(p); |
678 | 678 | ||
679 | /* Compression state */ | 679 | /* Compression state */ |
680 | debug3("%s: Sending compression state", __func__); | 680 | debug3("%s: Sending compression state", __func__); |
@@ -736,10 +736,10 @@ mm_pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, size_t namebuflen) | |||
736 | buffer_free(&m); | 736 | buffer_free(&m); |
737 | 737 | ||
738 | strlcpy(namebuf, p, namebuflen); /* Possible truncation */ | 738 | strlcpy(namebuf, p, namebuflen); /* Possible truncation */ |
739 | xfree(p); | 739 | free(p); |
740 | 740 | ||
741 | buffer_append(&loginmsg, msg, strlen(msg)); | 741 | buffer_append(&loginmsg, msg, strlen(msg)); |
742 | xfree(msg); | 742 | free(msg); |
743 | 743 | ||
744 | if ((*ptyfd = mm_receive_fd(pmonitor->m_recvfd)) == -1 || | 744 | if ((*ptyfd = mm_receive_fd(pmonitor->m_recvfd)) == -1 || |
745 | (*ttyfd = mm_receive_fd(pmonitor->m_recvfd)) == -1) | 745 | (*ttyfd = mm_receive_fd(pmonitor->m_recvfd)) == -1) |
@@ -1109,7 +1109,7 @@ mm_auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) | |||
1109 | if ((key = key_from_blob(blob, blen)) == NULL) | 1109 | if ((key = key_from_blob(blob, blen)) == NULL) |
1110 | fatal("%s: key_from_blob failed", __func__); | 1110 | fatal("%s: key_from_blob failed", __func__); |
1111 | *rkey = key; | 1111 | *rkey = key; |
1112 | xfree(blob); | 1112 | free(blob); |
1113 | } | 1113 | } |
1114 | buffer_free(&m); | 1114 | buffer_free(&m); |
1115 | 1115 | ||
@@ -1136,7 +1136,7 @@ mm_auth_rsa_generate_challenge(Key *key) | |||
1136 | 1136 | ||
1137 | buffer_init(&m); | 1137 | buffer_init(&m); |
1138 | buffer_put_string(&m, blob, blen); | 1138 | buffer_put_string(&m, blob, blen); |
1139 | xfree(blob); | 1139 | free(blob); |
1140 | 1140 | ||
1141 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_RSACHALLENGE, &m); | 1141 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_RSACHALLENGE, &m); |
1142 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_RSACHALLENGE, &m); | 1142 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_RSACHALLENGE, &m); |
@@ -1165,7 +1165,7 @@ mm_auth_rsa_verify_response(Key *key, BIGNUM *p, u_char response[16]) | |||
1165 | buffer_init(&m); | 1165 | buffer_init(&m); |
1166 | buffer_put_string(&m, blob, blen); | 1166 | buffer_put_string(&m, blob, blen); |
1167 | buffer_put_string(&m, response, 16); | 1167 | buffer_put_string(&m, response, 16); |
1168 | xfree(blob); | 1168 | free(blob); |
1169 | 1169 | ||
1170 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_RSARESPONSE, &m); | 1170 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_RSARESPONSE, &m); |
1171 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_RSARESPONSE, &m); | 1171 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_RSARESPONSE, &m); |