comparison session.h @ 1129:45830474d83c coverity

merge up to date, attempt to fix travis.yml
author Matt Johnston <matt@ucc.asn.au>
date Fri, 12 Jun 2015 23:02:15 +0800
parents 2ebf450edc2d
children 43a8ea69b24c
comparison
equal deleted inserted replaced
1077:26c1f9b8f82e 1129:45830474d83c
61 void svr_dropbear_log(int priority, const char* format, va_list param); 61 void svr_dropbear_log(int priority, const char* format, va_list param);
62 62
63 /* Client */ 63 /* Client */
64 void cli_session(int sock_in, int sock_out, struct dropbear_progress_connection *progress) ATTRIB_NORETURN; 64 void cli_session(int sock_in, int sock_out, struct dropbear_progress_connection *progress) ATTRIB_NORETURN;
65 void cli_connected(int result, int sock, void* userdata, const char *errstring); 65 void cli_connected(int result, int sock, void* userdata, const char *errstring);
66 void cleantext(unsigned char* dirtytext); 66 void cleantext(char* dirtytext);
67 67
68 /* crypto parameters that are stored individually for transmit and receive */ 68 /* crypto parameters that are stored individually for transmit and receive */
69 struct key_context_directional { 69 struct key_context_directional {
70 const struct dropbear_cipher *algo_crypt; 70 const struct dropbear_cipher *algo_crypt;
71 const struct dropbear_cipher_mode *crypt_mode; 71 const struct dropbear_cipher_mode *crypt_mode;
113 int sock_out; 113 int sock_out;
114 114
115 /* remotehost will be initially NULL as we delay 115 /* remotehost will be initially NULL as we delay
116 * reading the remote version string. it will be set 116 * reading the remote version string. it will be set
117 * by the time any recv_() packet methods are called */ 117 * by the time any recv_() packet methods are called */
118 unsigned char *remoteident; 118 char *remoteident;
119 119
120 int maxfd; /* the maximum file descriptor to check with select() */ 120 int maxfd; /* the maximum file descriptor to check with select() */
121 121
122 122
123 /* Packet buffers/values etc */ 123 /* Packet buffers/values etc */