Commit 7d9c38f3 authored by Ben Lindstrom's avatar Ben Lindstrom

- 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__

NOTE: This includes all portable references also.
parent 3dca4f55
......@@ -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);
......
This diff is collapsed.
......@@ -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
}
......@@ -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
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment