diff options
| -rw-r--r-- | auth.h | 54 | ||||
| -rw-r--r-- | channel.h | 28 | ||||
| -rw-r--r-- | chansession.h | 10 | ||||
| -rw-r--r-- | cli-chansession.c | 2 | ||||
| -rw-r--r-- | cli-runopts.c | 4 | ||||
| -rw-r--r-- | cli-session.c | 6 | ||||
| -rw-r--r-- | common-kex.c | 10 | ||||
| -rw-r--r-- | common-session.c | 6 | ||||
| -rw-r--r-- | compat.h | 6 | ||||
| -rw-r--r-- | crypto_desc.h | 2 | ||||
| -rw-r--r-- | dbrandom.h | 2 | ||||
| -rw-r--r-- | dbutil.h | 6 | ||||
| -rw-r--r-- | ecc.h | 2 | ||||
| -rw-r--r-- | kex.h | 26 | ||||
| -rw-r--r-- | list.h | 2 | ||||
| -rw-r--r-- | listener.h | 2 | ||||
| -rw-r--r-- | netio.h | 2 | ||||
| -rw-r--r-- | packet.c | 4 | ||||
| -rw-r--r-- | packet.h | 14 | ||||
| -rw-r--r-- | process-packet.c | 2 | ||||
| -rw-r--r-- | runopts.h | 6 | ||||
| -rw-r--r-- | service.h | 2 | ||||
| -rw-r--r-- | session.h | 20 | ||||
| -rw-r--r-- | signkey.h | 2 | ||||
| -rw-r--r-- | svr-auth.c | 2 | ||||
| -rw-r--r-- | svr-authpubkey.c | 2 | ||||
| -rw-r--r-- | svr-main.c | 6 | ||||
| -rw-r--r-- | svr-session.c | 2 | ||||
| -rw-r--r-- | svr-tcpfwd.c | 4 | ||||
| -rw-r--r-- | tcpfwd.h | 10 |
30 files changed, 123 insertions, 123 deletions
@@ -29,25 +29,25 @@ #include "signkey.h" #include "chansession.h" -void svr_authinitialise(); -void cli_authinitialise(); +void svr_authinitialise(void); +void cli_authinitialise(void); /* Server functions */ -void recv_msg_userauth_request(); +void recv_msg_userauth_request(void); void send_msg_userauth_failure(int partial, int incrfail); -void send_msg_userauth_success(); +void send_msg_userauth_success(void); void send_msg_userauth_banner(buffer *msg); -void svr_auth_password(); -void svr_auth_pubkey(); -void svr_auth_pam(); +void svr_auth_password(void); +void svr_auth_pubkey(void); +void svr_auth_pam(void); #ifdef ENABLE_SVR_PUBKEY_OPTIONS -int svr_pubkey_allows_agentfwd(); -int svr_pubkey_allows_tcpfwd(); -int svr_pubkey_allows_x11fwd(); -int svr_pubkey_allows_pty(); +int svr_pubkey_allows_agentfwd(void); +int svr_pubkey_allows_tcpfwd(void); +int svr_pubkey_allows_x11fwd(void); +int svr_pubkey_allows_pty(void); void svr_pubkey_set_forced_command(struct ChanSess *chansess); -void svr_pubkey_options_cleanup(); +void svr_pubkey_options_cleanup(void); int svr_add_pubkey_options(buffer *options_buf, int line_num, const char* filename); #else /* no option : success */ @@ -56,26 +56,26 @@ int svr_add_pubkey_options(buffer *options_buf, int line_num, const char* filena #define svr_pubkey_allows_x11fwd() 1 #define svr_pubkey_allows_pty() 1 static inline void svr_pubkey_set_forced_command(struct ChanSess *chansess) { } -static inline void svr_pubkey_options_cleanup() { } +static inline void svr_pubkey_options_cleanup(void) { } #define svr_add_pubkey_options(x,y,z) DROPBEAR_SUCCESS #endif /* Client functions */ -void recv_msg_userauth_failure(); -void recv_msg_userauth_success(); -void recv_msg_userauth_specific_60(); -void recv_msg_userauth_pk_ok(); -void recv_msg_userauth_info_request(); -void cli_get_user(); -void cli_auth_getmethods(); -int cli_auth_try(); -void recv_msg_userauth_banner(); -void cli_pubkeyfail(); -void cli_auth_password(); -int cli_auth_pubkey(); -void cli_auth_interactive(); +void recv_msg_userauth_failure(void); +void recv_msg_userauth_success(void); +void recv_msg_userauth_specific_60(void); +void recv_msg_userauth_pk_ok(void); +void recv_msg_userauth_info_request(void); +void cli_get_user(void); +void cli_auth_getmethods(void); +int cli_auth_try(void); +void recv_msg_userauth_banner(void); +void cli_pubkeyfail(void); +void cli_auth_password(void); +int cli_auth_pubkey(void); +void cli_auth_interactive(void); char* getpass_or_cancel(char* prompt); -void cli_auth_pubkey_cleanup(); +void cli_auth_pubkey_cleanup(void); #define MAX_USERNAME_LEN 25 /* arbitrary for the moment */ @@ -105,23 +105,23 @@ struct ChanType { void channel_connect_done(int result, int sock, void* user_data, const char* errstring); void chaninitialise(const struct ChanType *chantypes[]); -void chancleanup(); +void chancleanup(void); void setchannelfds(fd_set *readfds, fd_set *writefds, int allow_reads); void channelio(fd_set *readfd, fd_set *writefd); -struct Channel* getchannel(); +struct Channel* getchannel(void); /* Returns an arbitrary channel that is in a ready state - not being initialised and no EOF in either direction. NULL if none. */ -struct Channel* get_any_ready_channel(); +struct Channel* get_any_ready_channel(void); -void recv_msg_channel_open(); -void recv_msg_channel_request(); +void recv_msg_channel_open(void); +void recv_msg_channel_request(void); void send_msg_channel_failure(struct Channel *channel); void send_msg_channel_success(struct Channel *channel); -void recv_msg_channel_data(); -void recv_msg_channel_extended_data(); -void recv_msg_channel_window_adjust(); -void recv_msg_channel_close(); -void recv_msg_channel_eof(); +void recv_msg_channel_data(void); +void recv_msg_channel_extended_data(void); +void recv_msg_channel_window_adjust(void); +void recv_msg_channel_close(void); +void recv_msg_channel_eof(void); void common_recv_msg_channel_data(struct Channel *channel, int fd, circbuffer * buf); @@ -132,13 +132,13 @@ extern const struct ChanType clichansess; #if defined(USING_LISTENERS) || defined(DROPBEAR_CLIENT) int send_msg_channel_open_init(int fd, const struct ChanType *type); -void recv_msg_channel_open_confirmation(); -void recv_msg_channel_open_failure(); +void recv_msg_channel_open_confirmation(void); +void recv_msg_channel_open_failure(void); #endif void start_send_channel_request(struct Channel *channel, char *type); -void send_msg_request_success(); -void send_msg_request_failure(); +void send_msg_request_success(void); +void send_msg_request_failure(void); #endif /* DROPBEAR_CHANNEL_H_ */ diff --git a/chansession.h b/chansession.h index 6eb8c76..3b39fdc 100644 --- a/chansession.h +++ b/chansession.h @@ -86,14 +86,14 @@ struct ChildPid { void addnewvar(const char* param, const char* var); -void cli_send_chansess_request(); -void cli_tty_cleanup(); -void cli_chansess_winchange(); +void cli_send_chansess_request(void); +void cli_tty_cleanup(void); +void cli_chansess_winchange(void); #ifdef ENABLE_CLI_NETCAT -void cli_send_netcat_request(); +void cli_send_netcat_request(void); #endif -void svr_chansessinitialise(); +void svr_chansessinitialise(void); extern const struct ChanType svrchansess; struct SigMap { diff --git a/cli-chansession.c b/cli-chansession.c index cd53e85..0f92e8a 100644 --- a/cli-chansession.c +++ b/cli-chansession.c @@ -43,7 +43,7 @@ static void send_chansess_shell_req(struct Channel *channel); static void cli_escape_handler(struct Channel *channel, unsigned char* buf, int *len); static int cli_init_netcat(struct Channel *channel); -static void cli_tty_setup(); +static void cli_tty_setup(void); const struct ChanType clichansess = { 0, /* sepfds */ diff --git a/cli-runopts.c b/cli-runopts.c index 7c3a50c..24169c9 100644 --- a/cli-runopts.c +++ b/cli-runopts.c @@ -33,10 +33,10 @@ cli_runopts cli_opts; /* GLOBAL */ -static void printhelp(); +static void printhelp(void); static void parse_hostname(const char* orighostarg); static void parse_multihop_hostname(const char* orighostarg, const char* argv0); -static void fill_own_user(); +static void fill_own_user(void); #ifdef ENABLE_CLI_PUBKEY_AUTH static void loadidentityfile(const char* filename, int warnfail); #endif diff --git a/cli-session.c b/cli-session.c index a93d192..60f5518 100644 --- a/cli-session.c +++ b/cli-session.c @@ -39,10 +39,10 @@ #include "crypto_desc.h" #include "netio.h" -static void cli_remoteclosed() ATTRIB_NORETURN; -static void cli_sessionloop(); +static void cli_remoteclosed(void) ATTRIB_NORETURN; +static void cli_sessionloop(void); static void cli_session_init(pid_t proxy_cmd_pid); -static void cli_finished() ATTRIB_NORETURN; +static void cli_finished(void) ATTRIB_NORETURN; static void recv_msg_service_accept(void); static void cli_session_cleanup(void); static void recv_msg_global_request_cli(void); diff --git a/common-kex.c b/common-kex.c index c7004e6..5003d2f 100644 --- a/common-kex.c +++ b/common-kex.c @@ -38,13 +38,13 @@ #include "ecc.h" #include "crypto_desc.h" -static void kexinitialise(); -static void gen_new_keys(); +static void kexinitialise(void); +static void gen_new_keys(void); #ifndef DISABLE_ZLIB -static void gen_new_zstream_recv(); -static void gen_new_zstream_trans(); +static void gen_new_zstream_recv(void); +static void gen_new_zstream_trans(void); #endif -static void read_kex_algos(); +static void read_kex_algos(void); /* helper function for gen_new_keys */ static void hashkeys(unsigned char *out, unsigned int outlen, const hash_state * hs, const unsigned char X); diff --git a/common-session.c b/common-session.c index 874d539..20b6ba3 100644 --- a/common-session.c +++ b/common-session.c @@ -36,10 +36,10 @@ #include "runopts.h" #include "netio.h" -static void checktimeouts(); -static long select_timeout(); +static void checktimeouts(void); +static long select_timeout(void); static int ident_readln(int fd, char* buf, int count); -static void read_session_identification(); +static void read_session_identification(void); struct sshsession ses; /* GLOBAL */ @@ -44,9 +44,9 @@ char *basename(const char* path); #endif #ifndef HAVE_GETUSERSHELL -char *getusershell(); -void setusershell(); -void endusershell(); +char *getusershell(void); +void setusershell(void); +void endusershell(void); #endif #ifndef DROPBEAR_PATH_DEVNULL diff --git a/crypto_desc.h b/crypto_desc.h index 54da734..08a75d9 100644 --- a/crypto_desc.h +++ b/crypto_desc.h @@ -1,7 +1,7 @@ #ifndef DROPBEAR_CRYPTO_DESC_H #define DROPBEAR_CRYPTO_DESC_H -void crypto_init(); +void crypto_init(void); extern int dropbear_ltc_prng; @@ -27,7 +27,7 @@ #include "includes.h" -void seedrandom(); +void seedrandom(void); void genrandom(unsigned char* buf, unsigned int len); void addrandom(unsigned char * buf, unsigned int len); void gen_random_mpint(mp_int *max, mp_int *rand); @@ -59,7 +59,7 @@ void dropbear_trace(const char* format, ...) ATTRIB_PRINTF(1,2); void dropbear_trace2(const char* format, ...) ATTRIB_PRINTF(1,2); void printhex(const char * label, const unsigned char * buf, int len); void printmpint(const char *label, mp_int *mp); -void debug_start_net(); +void debug_start_net(void); extern int debug_trace; #endif @@ -81,7 +81,7 @@ void * m_realloc(void* ptr, size_t size); #define m_free(X) do {free(X); (X) = NULL;} while (0) void m_burn(void* data, unsigned int len); void setnonblocking(int fd); -void disallow_core(); +void disallow_core(void); int m_str_to_uint(const char* str, unsigned int *val); /* Used to force mp_ints to be initialised */ @@ -95,7 +95,7 @@ int constant_time_memcmp(const void* a, const void *b, size_t n); /* Returns a time in seconds that doesn't go backwards - does not correspond to a real-world clock */ -time_t monotonic_now(); +time_t monotonic_now(void); char * expand_homedir_path(const char *inpath); @@ -20,7 +20,7 @@ extern struct dropbear_ecc_curve ecc_curve_nistp384; extern struct dropbear_ecc_curve ecc_curve_nistp521; extern struct dropbear_ecc_curve *dropbear_ecc_curves[]; -void dropbear_ecc_fill_dp(); +void dropbear_ecc_fill_dp(void); struct dropbear_ecc_curve* curve_for_dp(const ltc_ecc_set_type *dp); /* "pubkey" refers to a point, but LTC uses ecc_key structure for both public @@ -29,40 +29,40 @@ #include "algo.h" #include "signkey.h" -void send_msg_kexinit(); -void recv_msg_kexinit(); -void send_msg_newkeys(); -void recv_msg_newkeys(); -void kexfirstinitialise(); +void send_msg_kexinit(void); +void recv_msg_kexinit(void); +void send_msg_newkeys(void); +void recv_msg_newkeys(void); +void kexfirstinitialise(void); -struct kex_dh_param *gen_kexdh_param(); +struct kex_dh_param *gen_kexdh_param(void); void free_kexdh_param(struct kex_dh_param *param); void kexdh_comb_key(struct kex_dh_param *param, mp_int *dh_pub_them, sign_key *hostkey); #ifdef DROPBEAR_ECDH -struct kex_ecdh_param *gen_kexecdh_param(); +struct kex_ecdh_param *gen_kexecdh_param(void); void free_kexecdh_param(struct kex_ecdh_param *param); void kexecdh_comb_key(struct kex_ecdh_param *param, buffer *pub_them, sign_key *hostkey); #endif #ifdef DROPBEAR_CURVE25519 -struct kex_curve25519_param *gen_kexcurve25519_param(); +struct kex_curve25519_param *gen_kexcurve25519_param(void); void free_kexcurve25519_param(struct kex_curve25519_param *param); void kexcurve25519_comb_key(struct kex_curve25519_param *param, buffer *pub_them, sign_key *hostkey); #endif #ifndef DISABLE_ZLIB -int is_compress_trans(); -int is_compress_recv(); +int is_compress_trans(void); +int is_compress_recv(void); #endif -void recv_msg_kexdh_init(); /* server */ +void recv_msg_kexdh_init(void); /* server */ -void send_msg_kexdh_init(); /* client */ -void recv_msg_kexdh_reply(); /* client */ +void send_msg_kexdh_init(void); /* client */ +void recv_msg_kexdh_reply(void); /* client */ struct KEXState { @@ -19,7 +19,7 @@ struct _m_list { typedef struct _m_list m_list; -m_list * list_new(); +m_list * list_new(void); void list_append(m_list *list, void *item); /* returns the item for the element removed */ void * list_remove(m_list_elem *elem); @@ -46,7 +46,7 @@ struct Listener { }; -void listeners_initialise(); +void listeners_initialise(void); void handle_listeners(fd_set * readfds); void set_listener_fds(fd_set * readfds); @@ -36,7 +36,7 @@ void set_connect_fds(fd_set *writefd); /* Handles ready sockets after select() */ void handle_connect_fds(fd_set *writefd); /* Cleanup */ -void remove_connect_pending(); +void remove_connect_pending(void); /* Doesn't actually stop the connect, but adds a dummy callback instead */ void cancel_connect(struct dropbear_progress_connection *c); @@ -36,11 +36,11 @@ #include "channel.h" #include "netio.h" -static int read_packet_init(); +static int read_packet_init(void); static void make_mac(unsigned int seqno, const struct key_context_directional * key_state, buffer * clear_buf, unsigned int clear_len, unsigned char *output_mac); -static int checkmac(); +static int checkmac(void); /* For exact details see http://www.zlib.net/zlib_tech.html * 5 bytes per 16kB block, plus 6 bytes for the stream. @@ -30,19 +30,19 @@ #include "queue.h" #include "buffer.h" -void write_packet(); -void read_packet(); -void decrypt_packet(); -void encrypt_packet(); +void write_packet(void); +void read_packet(void); +void decrypt_packet(void); +void encrypt_packet(void); void writebuf_enqueue(buffer * writebuf, unsigned char packet_type); -void process_packet(); +void process_packet(void); -void maybe_flush_reply_queue(); +void maybe_flush_reply_queue(void); typedef struct PacketType { unsigned char type; /* SSH_MSG_FOO */ - void (*handler)(); + void (*handler)(void); } packettype; #define PACKET_PADDING_OFF 4 diff --git a/process-packet.c b/process-packet.c index ddeb9ce..4953cf2 100644 --- a/process-packet.c +++ b/process-packet.c @@ -37,7 +37,7 @@ #define MAX_UNAUTH_PACKET_TYPE SSH_MSG_USERAUTH_PK_OK -static void recv_unimplemented(); +static void recv_unimplemented(void); /* process a decrypted packet, call the appropriate handler */ void process_packet() { @@ -64,7 +64,7 @@ extern runopts opts; int readhostkey(const char * filename, sign_key * hostkey, enum signkey_type *type); -void load_all_hostkeys(); +void load_all_hostkeys(void); typedef struct svr_runopts { @@ -119,7 +119,7 @@ typedef struct svr_runopts { extern svr_runopts svr_opts; void svr_getopts(int argc, char ** argv); -void loadhostkeys(); +void loadhostkeys(void); typedef struct cli_runopts { @@ -170,7 +170,7 @@ extern cli_runopts cli_opts; void cli_getopts(int argc, char ** argv); #ifdef ENABLE_USER_ALGO_LIST -void parse_ciphers_macs(); +void parse_ciphers_macs(void); #endif void print_version(void); @@ -25,6 +25,6 @@ #ifndef DROPBEAR_SERVICE_H_ #define DROPBEAR_SERVICE_H_ -void recv_msg_service_request(); /* Server */ +void recv_msg_service_request(void); /* Server */ #endif /* DROPBEAR_SERVICE_H_ */ @@ -45,14 +45,14 @@ extern int exitflag; void common_session_init(int sock_in, int sock_out); void session_loop(void(*loophandler)()) ATTRIB_NORETURN; -void session_cleanup(); -void send_session_identification(); -void send_msg_ignore(); -void ignore_recv_response(); +void session_cleanup(void); +void send_session_identification(void); +void send_msg_ignore(void); +void ignore_recv_response(void); -void update_channel_prio(); +void update_channel_prio(void); -const char* get_user_shell(); +const char* get_user_shell(void); void fill_passwd(const char* username); /* Server */ @@ -64,7 +64,7 @@ void svr_dropbear_log(int priority, const char* format, va_list param); void cli_session(int sock_in, int sock_out, struct dropbear_progress_connection *progress, pid_t proxy_cmd_pid) ATTRIB_NORETURN; void cli_connected(int result, int sock, void* userdata, const char *errstring); void cleantext(char* dirtytext); -void kill_proxy_command(); +void kill_proxy_command(void); /* crypto parameters that are stored individually for transmit and receive */ struct key_context_directional { @@ -189,11 +189,11 @@ struct sshsession { concluded (ie, while dataallowed was unset)*/ struct packetlist *reply_queue_head, *reply_queue_tail; - void(*remoteclosed)(); /* A callback to handle closure of the + void(*remoteclosed)(void); /* A callback to handle closure of the remote connection */ - void(*extra_session_cleanup)(); /* client or server specific cleanup */ - void(*send_kex_first_guess)(); + void(*extra_session_cleanup)(void); /* client or server specific cleanup */ + void(*send_kex_first_guess)(void); struct AuthState authstate; /* Common amongst client and server, since most struct elements are common */ @@ -82,7 +82,7 @@ struct SIGN_key { typedef struct SIGN_key sign_key; -sign_key * new_sign_key(); +sign_key * new_sign_key(void); const char* signkey_name_from_type(enum signkey_type type, unsigned int *namelen); enum signkey_type signkey_type_from_name(const char* name, unsigned int namelen); int buf_get_pub_key(buffer *buf, sign_key *key, enum signkey_type *type); @@ -35,7 +35,7 @@ #include "runopts.h" #include "dbrandom.h" -static void authclear(); +static void authclear(void); static int checkusername(char *username, unsigned int userlen); /* initialise the first time for a session, resetting all parameters */ diff --git a/svr-authpubkey.c b/svr-authpubkey.c index 89d77ed..71c347a 100644 --- a/svr-authpubkey.c +++ b/svr-authpubkey.c @@ -72,7 +72,7 @@ static int checkpubkey(char* algo, unsigned int algolen, unsigned char* keyblob, unsigned int keybloblen); -static int checkpubkeyperms(); +static int checkpubkeyperms(void); static void send_msg_userauth_pk_ok(char* algo, unsigned int algolen, unsigned char* keyblob, unsigned int keybloblen); static int checkfileperm(char * filename); @@ -36,12 +36,12 @@ static void sigchld_handler(int dummy); static void sigsegv_handler(int); static void sigintterm_handler(int fish); #ifdef INETD_MODE -static void main_inetd(); +static void main_inetd(void); #endif #ifdef NON_INETD_MODE -static void main_noinetd(); +static void main_noinetd(void); #endif -static void commonsetup(); +static void commonsetup(void); #if defined(DBMULTI_dropbear) || !defined(DROPBEAR_MULTI) #if defined(DBMULTI_dropbear) && defined(DROPBEAR_MULTI) diff --git a/svr-session.c b/svr-session.c index 254a747..d14bca9 100644 --- a/svr-session.c +++ b/svr-session.c @@ -41,7 +41,7 @@ #include "runopts.h" #include "crypto_desc.h" -static void svr_remoteclosed(); +static void svr_remoteclosed(void); struct serversession svr_ses; /* GLOBAL */ diff --git a/svr-tcpfwd.c b/svr-tcpfwd.c index 1abd0ac..1c8d353 100644 --- a/svr-tcpfwd.c +++ b/svr-tcpfwd.c @@ -46,8 +46,8 @@ void recv_msg_global_request_remotetcp() { /* */ #endif /* !ENABLE_SVR_REMOTETCPFWD */ -static int svr_cancelremotetcp(); -static int svr_remotetcpreq(); +static int svr_cancelremotetcp(void); +static int svr_remotetcpreq(void); static int newtcpdirect(struct Channel * channel); #ifdef ENABLE_SVR_REMOTETCPFWD @@ -57,16 +57,16 @@ struct TCPFwdEntry { }; /* Server */ -void recv_msg_global_request_remotetcp(); +void recv_msg_global_request_remotetcp(void); extern const struct ChanType svr_chan_tcpdirect; /* Client */ -void setup_localtcp(); -void setup_remotetcp(); +void setup_localtcp(void); +void setup_remotetcp(void); extern const struct ChanType cli_chan_tcpremote; -void cli_recv_msg_request_success(); -void cli_recv_msg_request_failure(); +void cli_recv_msg_request_success(void); +void cli_recv_msg_request_failure(void); /* Common */ int listen_tcpfwd(struct TCPListener* tcpinfo); |