diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | cipher.c | 26 | ||||
| -rw-r--r-- | monitor.c | 144 | ||||
| -rw-r--r-- | monitor_fdpass.c | 18 | ||||
| -rw-r--r-- | monitor_mm.c | 12 | ||||
| -rw-r--r-- | monitor_wrap.c | 126 |
6 files changed, 167 insertions, 164 deletions
@@ -95,6 +95,9 @@ - markus@cvs.openbsd.org 2002/06/04 23:02:06 [packet.c] remove __FUNCTION__ + - markus@cvs.openbsd.org 2002/06/04 23:05:49 + [cipher.c monitor.c monitor_fdpass.c monitor_mm.c monitor_wrap.c] + __FUNCTION__ -> __func__ 20020604 - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed @@ -779,4 +782,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2169 2002/06/06 20:59:25 mouring Exp $ +$Id: ChangeLog,v 1.2170 2002/06/06 21:40:51 mouring Exp $ @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: cipher.c,v 1.57 2002/05/30 08:07:31 markus Exp $"); +RCSID("$OpenBSD: cipher.c,v 1.58 2002/06/04 23:05:49 markus Exp $"); #include "xmalloc.h" #include "log.h" @@ -595,7 +595,7 @@ cipher_get_keyiv(CipherContext *cc, u_char *iv, u_int len) if (evplen == 0) return; if (evplen != len) - fatal("%s: wrong iv length %d != %d", __FUNCTION__, + fatal("%s: wrong iv length %d != %d", __func__, evplen, len); #if OPENSSL_VERSION_NUMBER < 0x00907000L @@ -604,7 +604,7 @@ cipher_get_keyiv(CipherContext *cc, u_char *iv, u_int len) aesc = EVP_CIPHER_CTX_get_app_data(&cc->evp); if (aesc == NULL) - fatal("%s: no rijndael context", __FUNCTION__); + fatal("%s: no rijndael context", __func__); civ = aesc->r_iv; } else #endif @@ -615,18 +615,18 @@ cipher_get_keyiv(CipherContext *cc, u_char *iv, u_int len) case SSH_CIPHER_3DES: { struct ssh1_3des_ctx *desc; if (len != 24) - fatal("%s: bad 3des iv length: %d", __FUNCTION__, len); + fatal("%s: bad 3des iv length: %d", __func__, len); desc = EVP_CIPHER_CTX_get_app_data(&cc->evp); if (desc == NULL) - fatal("%s: no 3des context", __FUNCTION__); - debug3("%s: Copying 3DES IV", __FUNCTION__); + fatal("%s: no 3des context", __func__); + debug3("%s: Copying 3DES IV", __func__); memcpy(iv, desc->k1.iv, 8); memcpy(iv + 8, desc->k2.iv, 8); memcpy(iv + 16, desc->k3.iv, 8); return; } default: - fatal("%s: bad cipher %d", __FUNCTION__, c->number); + fatal("%s: bad cipher %d", __func__, c->number); } memcpy(iv, civ, len); } @@ -652,7 +652,7 @@ cipher_set_keyiv(CipherContext *cc, u_char *iv) aesc = EVP_CIPHER_CTX_get_app_data(&cc->evp); if (aesc == NULL) - fatal("%s: no rijndael context", __FUNCTION__); + fatal("%s: no rijndael context", __func__); div = aesc->r_iv; } else #endif @@ -664,15 +664,15 @@ cipher_set_keyiv(CipherContext *cc, u_char *iv) struct ssh1_3des_ctx *desc; desc = EVP_CIPHER_CTX_get_app_data(&cc->evp); if (desc == NULL) - fatal("%s: no 3des context", __FUNCTION__); - debug3("%s: Installed 3DES IV", __FUNCTION__); + fatal("%s: no 3des context", __func__); + debug3("%s: Installed 3DES IV", __func__); memcpy(desc->k1.iv, iv, 8); memcpy(desc->k2.iv, iv + 8, 8); memcpy(desc->k3.iv, iv + 16, 8); return; } default: - fatal("%s: bad cipher %d", __FUNCTION__, c->number); + fatal("%s: bad cipher %d", __func__, c->number); } memcpy(div, iv, evplen); } @@ -695,7 +695,7 @@ cipher_get_keycontext(CipherContext *cc, u_char *dat) struct ssh1_3des_ctx *desc; desc = EVP_CIPHER_CTX_get_app_data(&cc->evp); if (desc == NULL) - fatal("%s: no 3des context", __FUNCTION__); + fatal("%s: no 3des context", __func__); plen = EVP_X_STATE_LEN(desc->k1); if (dat == NULL) return (3*plen); @@ -724,7 +724,7 @@ cipher_set_keycontext(CipherContext *cc, u_char *dat) struct ssh1_3des_ctx *desc; desc = EVP_CIPHER_CTX_get_app_data(&cc->evp); if (desc == NULL) - fatal("%s: no 3des context", __FUNCTION__); + fatal("%s: no 3des context", __func__); plen = EVP_X_STATE_LEN(desc->k1); memcpy(EVP_X_STATE(desc->k1), dat, plen); memcpy(EVP_X_STATE(desc->k2), dat + plen, plen); @@ -25,7 +25,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: monitor.c,v 1.13 2002/06/04 19:53:40 markus Exp $"); +RCSID("$OpenBSD: monitor.c,v 1.14 2002/06/04 23:05:49 markus Exp $"); #include <openssl/dh.h> @@ -269,7 +269,7 @@ monitor_child_preauth(struct monitor *pmonitor) if (authenticated) { if (!(ent->flags & MON_AUTHDECIDE)) fatal("%s: unexpected authentication from %d", - __FUNCTION__, ent->type); + __func__, ent->type); if (authctxt->pw->pw_uid == 0 && !auth_root_allowed(auth_method)) authenticated = 0; @@ -288,10 +288,10 @@ monitor_child_preauth(struct monitor *pmonitor) } if (!authctxt->valid) - fatal("%s: authenticated invalid user", __FUNCTION__); + fatal("%s: authenticated invalid user", __func__); debug("%s: %s has been authenticated by privileged process", - __FUNCTION__, authctxt->user); + __func__, authctxt->user); mm_get_keystate(pmonitor); @@ -342,7 +342,7 @@ monitor_read(struct monitor *pmonitor, struct mon_table *ent, mm_request_receive(pmonitor->m_sendfd, &m); type = buffer_get_char(&m); - debug3("%s: checking request %d", __FUNCTION__, type); + debug3("%s: checking request %d", __func__, type); while (ent->f != NULL) { if (ent->type == type) @@ -352,14 +352,14 @@ monitor_read(struct monitor *pmonitor, struct mon_table *ent, if (ent->f != NULL) { if (!(ent->flags & MON_PERMIT)) - fatal("%s: unpermitted request %d", __FUNCTION__, + fatal("%s: unpermitted request %d", __func__, type); ret = (*ent->f)(pmonitor->m_sendfd, &m); buffer_free(&m); /* The child may use this request only once, disable it */ if (ent->flags & MON_ONCE) { - debug2("%s: %d used once, disabling now", __FUNCTION__, + debug2("%s: %d used once, disabling now", __func__, type); ent->flags &= ~MON_PERMIT; } @@ -370,7 +370,7 @@ monitor_read(struct monitor *pmonitor, struct mon_table *ent, return ret; } - fatal("%s: unsupported request: %d", __FUNCTION__, type); + fatal("%s: unsupported request: %d", __func__, type); /* NOTREACHED */ return (-1); @@ -415,11 +415,11 @@ mm_answer_moduli(int socket, Buffer *m) max = buffer_get_int(m); debug3("%s: got parameters: %d %d %d", - __FUNCTION__, min, want, max); + __func__, min, want, max); /* We need to check here, too, in case the child got corrupted */ if (max < min || want < min || max < want) fatal("%s: bad parameters: %d %d %d", - __FUNCTION__, min, want, max); + __func__, min, want, max); buffer_clear(m); @@ -448,13 +448,13 @@ mm_answer_sign(int socket, Buffer *m) u_int siglen, datlen; int keyid; - debug3("%s", __FUNCTION__); + debug3("%s", __func__); keyid = buffer_get_int(m); p = buffer_get_string(m, &datlen); if (datlen != 20) - fatal("%s: data length incorrect: %d", __FUNCTION__, datlen); + fatal("%s: data length incorrect: %d", __func__, datlen); /* save session id, it will be passed on the first call */ if (session_id2_len == 0) { @@ -464,11 +464,11 @@ mm_answer_sign(int socket, Buffer *m) } if ((key = get_hostkey_by_index(keyid)) == NULL) - fatal("%s: no hostkey from index %d", __FUNCTION__, keyid); + fatal("%s: no hostkey from index %d", __func__, keyid); if (key_sign(key, &signature, &siglen, p, datlen) < 0) - fatal("%s: key_sign failed", __FUNCTION__); + fatal("%s: key_sign failed", __func__); - debug3("%s: signature %p(%d)", __FUNCTION__, signature, siglen); + debug3("%s: signature %p(%d)", __func__, signature, siglen); buffer_clear(m); buffer_put_string(m, signature, siglen); @@ -493,10 +493,10 @@ mm_answer_pwnamallow(int socket, Buffer *m) struct passwd *pwent; int allowed = 0; - debug3("%s", __FUNCTION__); + debug3("%s", __func__); if (authctxt->attempt++ != 0) - fatal("%s: multiple attempts for getpwnam", __FUNCTION__); + fatal("%s: multiple attempts for getpwnam", __func__); login = buffer_get_string(m, NULL); @@ -529,7 +529,7 @@ mm_answer_pwnamallow(int socket, Buffer *m) buffer_put_cstring(m, pwent->pw_shell); out: - debug3("%s: sending MONITOR_ANS_PWNAM: %d", __FUNCTION__, allowed); + debug3("%s: sending MONITOR_ANS_PWNAM: %d", __func__, allowed); mm_request_send(socket, MONITOR_ANS_PWNAM, m); /* For SSHv1 allow authentication now */ @@ -571,7 +571,7 @@ mm_answer_authserv(int socket, Buffer *m) authctxt->service = buffer_get_string(m, NULL); authctxt->style = buffer_get_string(m, NULL); debug3("%s: service=%s, style=%s", - __FUNCTION__, authctxt->service, authctxt->style); + __func__, authctxt->service, authctxt->style); if (strlen(authctxt->style) == 0) { xfree(authctxt->style); @@ -598,7 +598,7 @@ mm_answer_authpassword(int socket, Buffer *m) buffer_clear(m); buffer_put_int(m, authenticated); - debug3("%s: sending result %d", __FUNCTION__, authenticated); + debug3("%s: sending result %d", __func__, authenticated); mm_request_send(socket, MONITOR_ANS_AUTHPASSWORD, m); call_count++; @@ -629,7 +629,7 @@ mm_answer_bsdauthquery(int socket, Buffer *m) if (res != -1) buffer_put_cstring(m, prompts[0]); - debug3("%s: sending challenge res: %d", __FUNCTION__, res); + debug3("%s: sending challenge res: %d", __func__, res); mm_request_send(socket, MONITOR_ANS_BSDAUTHQUERY, m); if (res != -1) { @@ -649,19 +649,19 @@ mm_answer_bsdauthrespond(int socket, Buffer *m) int authok; if (authctxt->as == 0) - fatal("%s: no bsd auth session", __FUNCTION__); + fatal("%s: no bsd auth session", __func__); response = buffer_get_string(m, NULL); authok = options.challenge_response_authentication && auth_userresponse(authctxt->as, response, 0); authctxt->as = NULL; - debug3("%s: <%s> = <%d>", __FUNCTION__, response, authok); + debug3("%s: <%s> = <%d>", __func__, response, authok); xfree(response); buffer_clear(m); buffer_put_int(m, authok); - debug3("%s: sending authenticated: %d", __FUNCTION__, authok); + debug3("%s: sending authenticated: %d", __func__, authok); mm_request_send(socket, MONITOR_ANS_BSDAUTHRESPOND, m); auth_method = "bsdauth"; @@ -685,7 +685,7 @@ mm_answer_skeyquery(int socket, Buffer *m) if (res != -1) buffer_put_cstring(m, challenge); - debug3("%s: sending challenge res: %d", __FUNCTION__, res); + debug3("%s: sending challenge res: %d", __func__, res); mm_request_send(socket, MONITOR_ANS_SKEYQUERY, m); return (0); @@ -709,7 +709,7 @@ mm_answer_skeyrespond(int socket, Buffer *m) buffer_clear(m); buffer_put_int(m, authok); - debug3("%s: sending authenticated: %d", __FUNCTION__, authok); + debug3("%s: sending authenticated: %d", __func__, authok); mm_request_send(socket, MONITOR_ANS_SKEYRESPOND, m); auth_method = "skey"; @@ -738,7 +738,7 @@ static void mm_append_debug(Buffer *m) { if (auth_debug_init && buffer_len(&auth_debug)) { - debug3("%s: Appending debug messages for child", __FUNCTION__); + debug3("%s: Appending debug messages for child", __func__); buffer_append(m, buffer_ptr(&auth_debug), buffer_len(&auth_debug)); buffer_clear(&auth_debug); @@ -754,7 +754,7 @@ mm_answer_keyallowed(int socket, Buffer *m) enum mm_keytype type = 0; int allowed = 0; - debug3("%s entering", __FUNCTION__); + debug3("%s entering", __func__); type = buffer_get_int(m); cuser = buffer_get_string(m, NULL); @@ -765,9 +765,9 @@ mm_answer_keyallowed(int socket, Buffer *m) if ((compat20 && type == MM_RSAHOSTKEY) || (!compat20 && type != MM_RSAHOSTKEY)) - fatal("%s: key type and protocol mismatch", __FUNCTION__); + fatal("%s: key type and protocol mismatch", __func__); - debug3("%s: key_from_blob: %p", __FUNCTION__, key); + debug3("%s: key_from_blob: %p", __func__, key); if (key != NULL && authctxt->pw != NULL) { switch(type) { @@ -787,7 +787,7 @@ mm_answer_keyallowed(int socket, Buffer *m) cuser, chost, key); break; default: - fatal("%s: unknown key type %d", __FUNCTION__, type); + fatal("%s: unknown key type %d", __func__, type); break; } key_free(key); @@ -806,7 +806,7 @@ mm_answer_keyallowed(int socket, Buffer *m) } debug3("%s: key %p is %s", - __FUNCTION__, key, allowed ? "allowed" : "disallowed"); + __func__, key, allowed ? "allowed" : "disallowed"); buffer_clear(m); buffer_put_int(m, allowed); @@ -948,11 +948,11 @@ mm_answer_keyverify(int socket, Buffer *m) if (hostbased_cuser == NULL || hostbased_chost == NULL || !monitor_allowed_key(blob, bloblen)) - fatal("%s: bad key, not previously allowed", __FUNCTION__); + fatal("%s: bad key, not previously allowed", __func__); key = key_from_blob(blob, bloblen); if (key == NULL) - fatal("%s: bad public key blob", __FUNCTION__); + fatal("%s: bad public key blob", __func__); switch (key_blobtype) { case MM_USERKEY: @@ -967,11 +967,11 @@ mm_answer_keyverify(int socket, Buffer *m) break; } if (!valid_data) - fatal("%s: bad signature data blob", __FUNCTION__); + fatal("%s: bad signature data blob", __func__); verified = key_verify(key, signature, signaturelen, data, datalen); debug3("%s: key %p signature %s", - __FUNCTION__, key, verified ? "verified" : "unverified"); + __func__, key, verified ? "verified" : "unverified"); key_free(key); xfree(blob); @@ -1017,9 +1017,9 @@ mm_record_login(Session *s, struct passwd *pw) static void mm_session_close(Session *s) { - debug3("%s: session %d pid %d", __FUNCTION__, s->self, s->pid); + debug3("%s: session %d pid %d", __func__, s->self, s->pid); if (s->ttyfd != -1) { - debug3("%s: tty %s ptyfd %d", __FUNCTION__, s->tty, s->ptyfd); + debug3("%s: tty %s ptyfd %d", __func__, s->tty, s->ptyfd); fatal_remove_cleanup(session_pty_cleanup2, (void *)s); session_pty_cleanup2(s); } @@ -1033,7 +1033,7 @@ mm_answer_pty(int socket, Buffer *m) Session *s; int res, fd0; - debug3("%s entering", __FUNCTION__); + debug3("%s entering", __func__); buffer_clear(m); s = session_new(); @@ -1057,7 +1057,7 @@ mm_answer_pty(int socket, Buffer *m) /* We need to trick ttyslot */ if (dup2(s->ttyfd, 0) == -1) - fatal("%s: dup2", __FUNCTION__); + fatal("%s: dup2", __func__); mm_record_login(s, authctxt->pw); @@ -1066,9 +1066,9 @@ mm_answer_pty(int socket, Buffer *m) /* make sure nothing uses fd 0 */ if ((fd0 = open(_PATH_DEVNULL, O_RDONLY)) < 0) - fatal("%s: open(/dev/null): %s", __FUNCTION__, strerror(errno)); + fatal("%s: open(/dev/null): %s", __func__, strerror(errno)); if (fd0 != 0) - error("%s: fd0 %d != 0", __FUNCTION__, fd0); + error("%s: fd0 %d != 0", __func__, fd0); /* slave is not needed */ close(s->ttyfd); @@ -1076,7 +1076,7 @@ mm_answer_pty(int socket, Buffer *m) /* no need to dup() because nobody closes ptyfd */ s->ptymaster = s->ptyfd; - debug3("%s: tty %s ptyfd %d", __FUNCTION__, s->tty, s->ttyfd); + debug3("%s: tty %s ptyfd %d", __func__, s->tty, s->ttyfd); return (0); @@ -1094,7 +1094,7 @@ mm_answer_pty_cleanup(int socket, Buffer *m) Session *s; char *tty; - debug3("%s entering", __FUNCTION__); + debug3("%s entering", __func__); tty = buffer_get_string(m, NULL); if ((s = session_by_tty(tty)) != NULL) @@ -1114,7 +1114,7 @@ mm_answer_sesskey(int socket, Buffer *m) monitor_permit(mon_dispatch, MONITOR_REQ_SESSKEY, 1); if ((p = BN_new()) == NULL) - fatal("%s: BN_new", __FUNCTION__); + fatal("%s: BN_new", __func__); buffer_get_bignum2(m, p); @@ -1139,10 +1139,10 @@ mm_answer_sessid(int socket, Buffer *m) { int i; - debug3("%s entering", __FUNCTION__); + debug3("%s entering", __func__); if (buffer_len(m) != 16) - fatal("%s: bad ssh1 session id", __FUNCTION__); + fatal("%s: bad ssh1 session id", __func__); for (i = 0; i < 16; i++) session_id[i] = buffer_get_char(m); @@ -1161,11 +1161,11 @@ mm_answer_rsa_keyallowed(int socket, Buffer *m) u_int blen = 0; int allowed = 0; - debug3("%s entering", __FUNCTION__); + debug3("%s entering", __func__); if (options.rsa_authentication && authctxt->valid) { if ((client_n = BN_new()) == NULL) - fatal("%s: BN_new", __FUNCTION__); + fatal("%s: BN_new", __func__); buffer_get_bignum2(m, client_n); allowed = auth_rsa_key_allowed(authctxt->pw, client_n, &key); BN_clear_free(client_n); @@ -1179,7 +1179,7 @@ mm_answer_rsa_keyallowed(int socket, Buffer *m) if (allowed && key != NULL) { key->type = KEY_RSA; /* cheat for key_to_blob */ if (key_to_blob(key, &blob, &blen) == 0) - fatal("%s: key_to_blob failed", __FUNCTION__); + fatal("%s: key_to_blob failed", __func__); buffer_put_string(m, blob, blen); /* Save temporarily for comparison in verify */ @@ -1205,17 +1205,17 @@ mm_answer_rsa_challenge(int socket, Buffer *m) u_char *blob; u_int blen; - debug3("%s entering", __FUNCTION__); + debug3("%s entering", __func__); if (!authctxt->valid) - fatal("%s: authctxt not valid", __FUNCTION__); + fatal("%s: authctxt not valid", __func__); blob = buffer_get_string(m, &blen); if (!monitor_allowed_key(blob, blen)) - fatal("%s: bad key, not previously allowed", __FUNCTION__); + fatal("%s: bad key, not previously allowed", __func__); if (key_blobtype != MM_RSAUSERKEY && key_blobtype != MM_RSAHOSTKEY) - fatal("%s: key type mismatch", __FUNCTION__); + fatal("%s: key type mismatch", __func__); if ((key = key_from_blob(blob, blen)) == NULL) - fatal("%s: received bad key", __FUNCTION__); + fatal("%s: received bad key", __func__); if (ssh1_challenge) BN_clear_free(ssh1_challenge); @@ -1224,7 +1224,7 @@ mm_answer_rsa_challenge(int socket, Buffer *m) buffer_clear(m); buffer_put_bignum2(m, ssh1_challenge); - debug3("%s sending reply", __FUNCTION__); + debug3("%s sending reply", __func__); mm_request_send(socket, MONITOR_ANS_RSACHALLENGE, m); monitor_permit(mon_dispatch, MONITOR_REQ_RSARESPONSE, 1); @@ -1239,23 +1239,23 @@ mm_answer_rsa_response(int socket, Buffer *m) u_int blen, len; int success; - debug3("%s entering", __FUNCTION__); + debug3("%s entering", __func__); if (!authctxt->valid) - fatal("%s: authctxt not valid", __FUNCTION__); + fatal("%s: authctxt not valid", __func__); if (ssh1_challenge == NULL) - fatal("%s: no ssh1_challenge", __FUNCTION__); + fatal("%s: no ssh1_challenge", __func__); blob = buffer_get_string(m, &blen); if (!monitor_allowed_key(blob, blen)) - fatal("%s: bad key, not previously allowed", __FUNCTION__); + fatal("%s: bad key, not previously allowed", __func__); if (key_blobtype != MM_RSAUSERKEY && key_blobtype != MM_RSAHOSTKEY) - fatal("%s: key type mismatch: %d", __FUNCTION__, key_blobtype); + fatal("%s: key type mismatch: %d", __func__, key_blobtype); if ((key = key_from_blob(blob, blen)) == NULL) - fatal("%s: received bad key", __FUNCTION__); + fatal("%s: received bad key", __func__); response = buffer_get_string(m, &len); if (len != 16) - fatal("%s: received bad response to challenge", __FUNCTION__); + fatal("%s: received bad response to challenge", __func__); success = auth_rsa_verify_response(key, ssh1_challenge, response); key_free(key); @@ -1281,7 +1281,7 @@ mm_answer_term(int socket, Buffer *req) extern struct monitor *pmonitor; int res, status; - debug3("%s: tearing down sessions", __FUNCTION__); + debug3("%s: tearing down sessions", __func__); /* The child is terminating */ session_destroy_all(&mm_session_close); @@ -1389,7 +1389,7 @@ mm_get_keystate(struct monitor *pmonitor) u_char *blob, *p; u_int bloblen, plen; - debug3("%s: Waiting for new keys", __FUNCTION__); + debug3("%s: Waiting for new keys", __func__); buffer_init(&m); mm_request_receive_expect(pmonitor->m_sendfd, MONITOR_REQ_KEYEXPORT, &m); @@ -1409,7 +1409,7 @@ mm_get_keystate(struct monitor *pmonitor) current_keys[MODE_OUT] = mm_newkeys_from_blob(blob, bloblen); xfree(blob); - debug3("%s: Waiting for second key", __FUNCTION__); + debug3("%s: Waiting for second key", __func__); blob = buffer_get_string(&m, &bloblen); current_keys[MODE_IN] = mm_newkeys_from_blob(blob, bloblen); xfree(blob); @@ -1423,22 +1423,22 @@ mm_get_keystate(struct monitor *pmonitor) child_state.keyout = buffer_get_string(&m, &child_state.keyoutlen); child_state.keyin = buffer_get_string(&m, &child_state.keyinlen); - debug3("%s: Getting compression state", __FUNCTION__); + debug3("%s: Getting compression state", __func__); /* Get compression state */ p = buffer_get_string(&m, &plen); if (plen != sizeof(child_state.outgoing)) - fatal("%s: bad request size", __FUNCTION__); + fatal("%s: bad request size", __func__); memcpy(&child_state.outgoing, p, sizeof(child_state.outgoing)); xfree(p); p = buffer_get_string(&m, &plen); if (plen != sizeof(child_state.incoming)) - fatal("%s: bad request size", __FUNCTION__); + fatal("%s: bad request size", __func__); memcpy(&child_state.incoming, p, sizeof(child_state.incoming)); xfree(p); /* Network I/O buffers */ - debug3("%s: Getting Network I/O buffers", __FUNCTION__); + debug3("%s: Getting Network I/O buffers", __func__); child_state.input = buffer_get_string(&m, &child_state.ilen); child_state.output = buffer_get_string(&m, &child_state.olen); @@ -1487,10 +1487,10 @@ monitor_socketpair(int *pair) { #ifdef HAVE_SOCKETPAIR if (socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1) - fatal("%s: socketpair", __FUNCTION__); + fatal("%s: socketpair", __func__); #else fatal("%s: UsePrivilegeSeparation=yes not supported", - __FUNCTION__); + __func__); #endif FD_CLOSEONEXEC(pair[0]); FD_CLOSEONEXEC(pair[1]); diff --git a/monitor_fdpass.c b/monitor_fdpass.c index 5401ea46..0d7628fa 100644 --- a/monitor_fdpass.c +++ b/monitor_fdpass.c @@ -24,7 +24,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: monitor_fdpass.c,v 1.2 2002/03/24 17:53:16 stevesk Exp $"); +RCSID("$OpenBSD: monitor_fdpass.c,v 1.3 2002/06/04 23:05:49 markus Exp $"); #include <sys/uio.h> @@ -64,14 +64,14 @@ mm_send_fd(int socket, int fd) msg.msg_iovlen = 1; if ((n = sendmsg(socket, &msg, 0)) == -1) - fatal("%s: sendmsg(%d): %s", __FUNCTION__, fd, + fatal("%s: sendmsg(%d): %s", __func__, fd, strerror(errno)); if (n != 1) fatal("%s: sendmsg: expected sent 1 got %d", - __FUNCTION__, n); + __func__, n); #else fatal("%s: UsePrivilegeSeparation=yes not supported", - __FUNCTION__); + __func__); #endif } @@ -102,24 +102,24 @@ mm_receive_fd(int socket) #endif if ((n = recvmsg(socket, &msg, 0)) == -1) - fatal("%s: recvmsg: %s", __FUNCTION__, strerror(errno)); + fatal("%s: recvmsg: %s", __func__, strerror(errno)); if (n != 1) fatal("%s: recvmsg: expected received 1 got %d", - __FUNCTION__, n); + __func__, n); #ifdef HAVE_ACCRIGHTS_IN_MSGHDR if (msg.msg_accrightslen != sizeof(fd)) - fatal("%s: no fd", __FUNCTION__); + fatal("%s: no fd", __func__); #else cmsg = CMSG_FIRSTHDR(&msg); if (cmsg->cmsg_type != SCM_RIGHTS) - fatal("%s: expected type %d got %d", __FUNCTION__, + fatal("%s: expected type %d got %d", __func__, SCM_RIGHTS, cmsg->cmsg_type); fd = (*(int *)CMSG_DATA(cmsg)); #endif return fd; #else fatal("%s: UsePrivilegeSeparation=yes not supported", - __FUNCTION__); + __func__); #endif } diff --git a/monitor_mm.c b/monitor_mm.c index 17b319cc..30c9825e 100644 --- a/monitor_mm.c +++ b/monitor_mm.c @@ -24,7 +24,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: monitor_mm.c,v 1.5 2002/05/28 16:45:27 stevesk Exp $"); +RCSID("$OpenBSD: monitor_mm.c,v 1.6 2002/06/04 23:05:49 markus Exp $"); #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> @@ -91,7 +91,7 @@ mm_create(struct mm_master *mmalloc, size_t size) fatal("mmap(%lu): %s", (u_long)size, strerror(errnor)); #else fatal("%s: UsePrivilegeSeparation=yes not supported", - __FUNCTION__); + __func__); #endif mm->address = address; @@ -136,7 +136,7 @@ mm_destroy(struct mm_master *mm) strerror(errno)); #else fatal("%s: UsePrivilegeSeparation=yes not supported", - __FUNCTION__); + __func__); #endif if (mm->mmalloc == NULL) xfree(mm); @@ -151,7 +151,7 @@ mm_xmalloc(struct mm_master *mm, size_t size) address = mm_malloc(mm, size); if (address == NULL) - fatal("%s: mm_malloc(%lu)", __FUNCTION__, (u_long)size); + fatal("%s: mm_malloc(%lu)", __func__, (u_long)size); return (address); } @@ -300,7 +300,7 @@ mm_share_sync(struct mm_master **pmm, struct mm_master **pmmalloc) struct mm_master *mmold; struct mmtree rb_free, rb_allocated; - debug3("%s: Share sync", __FUNCTION__); + debug3("%s: Share sync", __func__); mm = *pmm; mmold = mm->mmalloc; @@ -325,7 +325,7 @@ mm_share_sync(struct mm_master **pmm, struct mm_master **pmmalloc) *pmm = mm; *pmmalloc = mmalloc; - debug3("%s: Share sync end", __FUNCTION__); + debug3("%s: Share sync end", __func__); } void diff --git a/monitor_wrap.c b/monitor_wrap.c index c5e3fb98..fca5ffe5 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -25,7 +25,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: monitor_wrap.c,v 1.7 2002/05/15 15:47:49 mouring Exp $"); +RCSID("$OpenBSD: monitor_wrap.c,v 1.8 2002/06/04 23:05:49 markus Exp $"); #include <openssl/bn.h> #include <openssl/dh.h> @@ -65,14 +65,14 @@ mm_request_send(int socket, enum monitor_reqtype type, Buffer *m) u_char buf[5]; u_int mlen = buffer_len(m); - debug3("%s entering: type %d", __FUNCTION__, type); + debug3("%s entering: type %d", __func__, type); PUT_32BIT(buf, mlen + 1); buf[4] = (u_char) type; /* 1st byte of payload is mesg-type */ if (atomicio(write, socket, buf, sizeof(buf)) != sizeof(buf)) - fatal("%s: write", __FUNCTION__); + fatal("%s: write", __func__); if (atomicio(write, socket, buffer_ptr(m), mlen) != mlen) - fatal("%s: write", __FUNCTION__); + fatal("%s: write", __func__); } void @@ -82,22 +82,22 @@ mm_request_receive(int socket, Buffer *m) ssize_t res; u_int msg_len; - debug3("%s entering", __FUNCTION__); + debug3("%s entering", __func__); res = atomicio(read, socket, buf, sizeof(buf)); if (res != sizeof(buf)) { if (res == 0) fatal_cleanup(); - fatal("%s: read: %ld", __FUNCTION__, (long)res); + fatal("%s: read: %ld", __func__, (long)res); } msg_len = GET_32BIT(buf); if (msg_len > 256 * 1024) - fatal("%s: read: bad msg_len %d", __FUNCTION__, msg_len); + fatal("%s: read: bad msg_len %d", __func__, msg_len); buffer_clear(m); buffer_append_space(m, msg_len); res = atomicio(read, socket, buffer_ptr(m), msg_len); if (res != msg_len) - fatal("%s: read: %ld != msg_len", __FUNCTION__, (long)res); + fatal("%s: read: %ld != msg_len", __func__, (long)res); } void @@ -105,12 +105,12 @@ mm_request_receive_expect(int socket, enum monitor_reqtype type, Buffer *m) { u_char rtype; - debug3("%s entering: type %d", __FUNCTION__, type); + debug3("%s entering: type %d", __func__, type); mm_request_receive(socket, m); rtype = buffer_get_char(m); if (rtype != type) - fatal("%s: read: rtype %d != type %d", __FUNCTION__, + fatal("%s: read: rtype %d != type %d", __func__, rtype, type); } @@ -128,21 +128,21 @@ mm_choose_dh(int min, int nbits, int max) mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_MODULI, &m); - debug3("%s: waiting for MONITOR_ANS_MODULI", __FUNCTION__); + debug3("%s: waiting for MONITOR_ANS_MODULI", __func__); mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_MODULI, &m); success = buffer_get_char(&m); if (success == 0) - fatal("%s: MONITOR_ANS_MODULI failed", __FUNCTION__); + fatal("%s: MONITOR_ANS_MODULI failed", __func__); if ((p = BN_new()) == NULL) - fatal("%s: BN_new failed", __FUNCTION__); + fatal("%s: BN_new failed", __func__); if ((g = BN_new()) == NULL) - fatal("%s: BN_new failed", __FUNCTION__); + fatal("%s: BN_new failed", __func__); buffer_get_bignum2(&m, p); buffer_get_bignum2(&m, g); - debug3("%s: remaining %d", __FUNCTION__, buffer_len(&m)); + debug3("%s: remaining %d", __func__, buffer_len(&m)); buffer_free(&m); return (dh_new_group(g, p)); @@ -154,7 +154,7 @@ mm_key_sign(Key *key, u_char **sigp, u_int *lenp, u_char *data, u_int datalen) Kex *kex = *pmonitor->m_pkex; Buffer m; - debug3("%s entering", __FUNCTION__); + debug3("%s entering", __func__); buffer_init(&m); buffer_put_int(&m, kex->host_key_index(key)); @@ -162,7 +162,7 @@ mm_key_sign(Key *key, u_char **sigp, u_int *lenp, u_char *data, u_int datalen) mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SIGN, &m); - debug3("%s: waiting for MONITOR_ANS_SIGN", __FUNCTION__); + debug3("%s: waiting for MONITOR_ANS_SIGN", __func__); mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_SIGN, &m); *sigp = buffer_get_string(&m, lenp); buffer_free(&m); @@ -177,14 +177,14 @@ mm_getpwnamallow(const char *login) struct passwd *pw; u_int pwlen; - debug3("%s entering", __FUNCTION__); + debug3("%s entering", __func__); buffer_init(&m); buffer_put_cstring(&m, login); mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PWNAM, &m); - debug3("%s: waiting for MONITOR_ANS_PWNAM", __FUNCTION__); + debug3("%s: waiting for MONITOR_ANS_PWNAM", __func__); mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PWNAM, &m); if (buffer_get_char(&m) == 0) { @@ -193,7 +193,7 @@ mm_getpwnamallow(const char *login) } pw = buffer_get_string(&m, &pwlen); if (pwlen != sizeof(struct passwd)) - fatal("%s: struct passwd size mismatch", __FUNCTION__); + fatal("%s: struct passwd size mismatch", __func__); pw->pw_name = buffer_get_string(&m, NULL); pw->pw_passwd = buffer_get_string(&m, NULL); pw->pw_gecos = buffer_get_string(&m, NULL); @@ -212,7 +212,7 @@ char* mm_auth2_read_banner(void) Buffer m; char *banner; - debug3("%s entering", __FUNCTION__); + debug3("%s entering", __func__); buffer_init(&m); mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTH2_READ_BANNER, &m); @@ -232,7 +232,7 @@ mm_inform_authserv(char *service, char *style) { Buffer m; - debug3("%s entering", __FUNCTION__); + debug3("%s entering", __func__); buffer_init(&m); buffer_put_cstring(&m, service); @@ -250,13 +250,13 @@ mm_auth_password(Authctxt *authctxt, char *password) Buffer m; int authenticated = 0; - debug3("%s entering", __FUNCTION__); + debug3("%s entering", __func__); buffer_init(&m); buffer_put_cstring(&m, password); mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHPASSWORD, &m); - debug3("%s: waiting for MONITOR_ANS_AUTHPASSWORD", __FUNCTION__); + debug3("%s: waiting for MONITOR_ANS_AUTHPASSWORD", __func__); mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_AUTHPASSWORD, &m); authenticated = buffer_get_int(&m); @@ -264,7 +264,7 @@ mm_auth_password(Authctxt *authctxt, char *password) buffer_free(&m); debug3("%s: user %sauthenticated", - __FUNCTION__, authenticated ? "" : "not "); + __func__, authenticated ? "" : "not "); return (authenticated); } @@ -300,7 +300,7 @@ mm_send_debug(Buffer *m) while (buffer_len(m)) { msg = buffer_get_string(m, NULL); - debug3("%s: Sending debug: %s", __FUNCTION__, msg); + debug3("%s: Sending debug: %s", __func__, msg); packet_send_debug("%s", msg); xfree(msg); } @@ -314,7 +314,7 @@ mm_key_allowed(enum mm_keytype type, char *user, char *host, Key *key) u_int len; int allowed = 0; - debug3("%s entering", __FUNCTION__); + debug3("%s entering", __func__); /* Convert the key to a blob and the pass it over */ if (!key_to_blob(key, &blob, &len)) @@ -329,7 +329,7 @@ mm_key_allowed(enum mm_keytype type, char *user, char *host, Key *key) mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYALLOWED, &m); - debug3("%s: waiting for MONITOR_ANS_KEYALLOWED", __FUNCTION__); + debug3("%s: waiting for MONITOR_ANS_KEYALLOWED", __func__); mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_KEYALLOWED, &m); allowed = buffer_get_int(&m); @@ -356,7 +356,7 @@ mm_key_verify(Key *key, u_char *sig, u_int siglen, u_char *data, u_int datalen) u_int len; int verified = 0; - debug3("%s entering", __FUNCTION__); + debug3("%s entering", __func__); /* Convert the key to a blob and the pass it over */ if (!key_to_blob(key, &blob, &len)) @@ -370,7 +370,7 @@ mm_key_verify(Key *key, u_char *sig, u_int siglen, u_char *data, u_int datalen) mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYVERIFY, &m); - debug3("%s: waiting for MONITOR_ANS_KEYVERIFY", __FUNCTION__); + debug3("%s: waiting for MONITOR_ANS_KEYVERIFY", __func__); mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_KEYVERIFY, &m); |