diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
commit | 1b816ea846aca3ee89e7995373ace609e9518424 (patch) | |
tree | b41cdc8495cae7fa9c2e0f98a5f2e71656b61f9a /misc.h | |
parent | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
import openssh-4.6p1-gsskex-20070312.patch
Diffstat (limited to 'misc.h')
-rw-r--r-- | misc.h | 47 |
1 files changed, 34 insertions, 13 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.h,v 1.29 2006/01/31 10:19:02 djm Exp $ */ | 1 | /* $OpenBSD: misc.h,v 1.36 2006/08/18 10:27:16 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -12,6 +12,9 @@ | |||
12 | * called by a name other than "ssh" or "Secure Shell". | 12 | * called by a name other than "ssh" or "Secure Shell". |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #ifndef _MISC_H | ||
16 | #define _MISC_H | ||
17 | |||
15 | /* misc.c */ | 18 | /* misc.c */ |
16 | 19 | ||
17 | char *chop(char *); | 20 | char *chop(char *); |
@@ -21,13 +24,14 @@ int unset_nonblock(int); | |||
21 | void set_nodelay(int); | 24 | void set_nodelay(int); |
22 | int a2port(const char *); | 25 | int a2port(const char *); |
23 | int a2tun(const char *, int *); | 26 | int a2tun(const char *, int *); |
27 | char *put_host_port(const char *, u_short); | ||
24 | char *hpdelim(char **); | 28 | char *hpdelim(char **); |
25 | char *cleanhostname(char *); | 29 | char *cleanhostname(char *); |
26 | char *colon(char *); | 30 | char *colon(char *); |
27 | long convtime(const char *); | 31 | long convtime(const char *); |
28 | char *tilde_expand_filename(const char *, uid_t); | 32 | char *tilde_expand_filename(const char *, uid_t); |
29 | char *percent_expand(const char *, ...) __attribute__((__sentinel__)); | 33 | char *percent_expand(const char *, ...) __attribute__((__sentinel__)); |
30 | char *tohex(const u_char *, u_int); | 34 | char *tohex(const void *, size_t); |
31 | void sanitise_stdfd(void); | 35 | void sanitise_stdfd(void); |
32 | 36 | ||
33 | struct passwd *pwcopy(struct passwd *); | 37 | struct passwd *pwcopy(struct passwd *); |
@@ -44,17 +48,6 @@ void replacearg(arglist *, u_int, char *, ...) | |||
44 | __attribute__((format(printf, 3, 4))); | 48 | __attribute__((format(printf, 3, 4))); |
45 | void freeargs(arglist *); | 49 | void freeargs(arglist *); |
46 | 50 | ||
47 | /* readpass.c */ | ||
48 | |||
49 | #define RP_ECHO 0x0001 | ||
50 | #define RP_ALLOW_STDIN 0x0002 | ||
51 | #define RP_ALLOW_EOF 0x0004 | ||
52 | #define RP_USE_ASKPASS 0x0008 | ||
53 | |||
54 | char *read_passphrase(const char *, int); | ||
55 | int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2))); | ||
56 | int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *); | ||
57 | |||
58 | int tun_open(int, int); | 51 | int tun_open(int, int); |
59 | 52 | ||
60 | /* Common definitions for ssh tunnel device forwarding */ | 53 | /* Common definitions for ssh tunnel device forwarding */ |
@@ -67,3 +60,31 @@ int tun_open(int, int); | |||
67 | #define SSH_TUNID_ANY 0x7fffffff | 60 | #define SSH_TUNID_ANY 0x7fffffff |
68 | #define SSH_TUNID_ERR (SSH_TUNID_ANY - 1) | 61 | #define SSH_TUNID_ERR (SSH_TUNID_ANY - 1) |
69 | #define SSH_TUNID_MAX (SSH_TUNID_ANY - 2) | 62 | #define SSH_TUNID_MAX (SSH_TUNID_ANY - 2) |
63 | |||
64 | /* Functions to extract or store big-endian words of various sizes */ | ||
65 | u_int64_t get_u64(const void *) | ||
66 | __attribute__((__bounded__( __minbytes__, 1, 8))); | ||
67 | u_int32_t get_u32(const void *) | ||
68 | __attribute__((__bounded__( __minbytes__, 1, 4))); | ||
69 | u_int16_t get_u16(const void *) | ||
70 | __attribute__((__bounded__( __minbytes__, 1, 2))); | ||
71 | void put_u64(void *, u_int64_t) | ||
72 | __attribute__((__bounded__( __minbytes__, 1, 8))); | ||
73 | void put_u32(void *, u_int32_t) | ||
74 | __attribute__((__bounded__( __minbytes__, 1, 4))); | ||
75 | void put_u16(void *, u_int16_t) | ||
76 | __attribute__((__bounded__( __minbytes__, 1, 2))); | ||
77 | |||
78 | |||
79 | /* readpass.c */ | ||
80 | |||
81 | #define RP_ECHO 0x0001 | ||
82 | #define RP_ALLOW_STDIN 0x0002 | ||
83 | #define RP_ALLOW_EOF 0x0004 | ||
84 | #define RP_USE_ASKPASS 0x0008 | ||
85 | |||
86 | char *read_passphrase(const char *, int); | ||
87 | int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2))); | ||
88 | int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *); | ||
89 | |||
90 | #endif /* _MISC_H */ | ||