diff options
| author | djm <djm> | 2006-03-31 12:13:02 +0000 |
|---|---|---|
| committer | djm <djm> | 2006-03-31 12:13:02 +0000 |
| commit | fc2eb2b55b30b849dd54510c8f54a1ee9a3fd0fb (patch) | |
| tree | 1594b74ce075a8c339f9d7c41b3ce8f0399a2954 /misc.h | |
| parent | a3567315845b2b508ef0419d2215cf36a8107535 (diff) | |
| download | openssh-fc2eb2b55b30b849dd54510c8f54a1ee9a3fd0fb.tar.gz | |
- djm@cvs.openbsd.org 2006/03/30 09:58:16
[authfd.c bufaux.c deattack.c gss-serv.c mac.c misc.c misc.h]
[monitor_wrap.c msg.c packet.c sftp-client.c sftp-server.c ssh-agent.c]
replace {GET,PUT}_XXBIT macros with functionally similar functions,
silencing a heap of lint warnings. also allows them to use
__bounded__ checking which can't be applied to macros; requested
by and feedback from deraadt@
Diffstat (limited to 'misc.h')
| -rw-r--r-- | misc.h | 24 |
1 files changed, 22 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.30 2006/03/25 22:22:43 djm Exp $ */ +/* $OpenBSD: misc.h,v 1.31 2006/03/30 09:58:15 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -12,6 +12,9 @@ * called by a name other than "ssh" or "Secure Shell". */ +#ifndef _MISC_H +#define _MISC_H + /* misc.c */ char *chop(char *); @@ -27,7 +30,7 @@ char *colon(char *); long convtime(const char *); char *tilde_expand_filename(const char *, uid_t); char *percent_expand(const char *, ...) __attribute__((__sentinel__)); -char *tohex(const u_char *, u_int); +char *tohex(const void *, size_t); void sanitise_stdfd(void); struct passwd *pwcopy(struct passwd *); @@ -67,3 +70,20 @@ int tun_open(int, int); #define SSH_TUNID_ANY 0x7fffffff #define SSH_TUNID_ERR (SSH_TUNID_ANY - 1) #define SSH_TUNID_MAX (SSH_TUNID_ANY - 2) + +/* Functions to extract or store big-endian words of various sizes */ +u_int64_t get_u64(const void *) + __attribute__((__bounded__( __minbytes__, 1, 8))); +u_int32_t get_u32(const void *) + __attribute__((__bounded__( __minbytes__, 1, 4))); +u_int16_t get_u16(const void *) + __attribute__((__bounded__( __minbytes__, 1, 2))); +void put_u64(void *, u_int64_t) + __attribute__((__bounded__( __minbytes__, 1, 8))); +void put_u32(void *, u_int32_t) + __attribute__((__bounded__( __minbytes__, 1, 4))); +void put_u16(void *, u_int16_t) + __attribute__((__bounded__( __minbytes__, 1, 2))); + +#endif /* _MISC_H */ + |