comparison session.h @ 1295:750ec4ec4cbe

Convert #ifdef to #if, other build changes
author Matt Johnston <matt@ucc.asn.au>
date Wed, 04 May 2016 15:33:40 +0200
parents 9169e4e7cbee
children 533e070b3126
comparison
equal deleted inserted replaced
1294:56aba7dedbea 1295:750ec4ec4cbe
77 z_streamp zstream; 77 z_streamp zstream;
78 #endif 78 #endif
79 /* actual keys */ 79 /* actual keys */
80 union { 80 union {
81 symmetric_CBC cbc; 81 symmetric_CBC cbc;
82 #ifdef DROPBEAR_ENABLE_CTR_MODE 82 #if DROPBEAR_ENABLE_CTR_MODE
83 symmetric_CTR ctr; 83 symmetric_CTR ctr;
84 #endif 84 #endif
85 } cipher_state; 85 } cipher_state;
86 unsigned char mackey[MAX_MAC_LEN]; 86 unsigned char mackey[MAX_MAC_LEN];
87 int valid; 87 int valid;
235 char * addrstring; 235 char * addrstring;
236 236
237 /* The resolved remote address, used for lastlog etc */ 237 /* The resolved remote address, used for lastlog etc */
238 char *remotehost; 238 char *remotehost;
239 239
240 #ifdef USE_VFORK 240 #if DROPBEAR_VFORK
241 pid_t server_pid; 241 pid_t server_pid;
242 #endif 242 #endif
243 243
244 }; 244 };
245 245
286 int winchange; /* Set to 1 when a windowchange signal happens */ 286 int winchange; /* Set to 1 when a windowchange signal happens */
287 287
288 int lastauthtype; /* either AUTH_TYPE_PUBKEY or AUTH_TYPE_PASSWORD, 288 int lastauthtype; /* either AUTH_TYPE_PUBKEY or AUTH_TYPE_PASSWORD,
289 for the last type of auth we tried */ 289 for the last type of auth we tried */
290 int ignore_next_auth_response; 290 int ignore_next_auth_response;
291 #ifdef ENABLE_CLI_INTERACT_AUTH 291 #if DROPBEAR_CLI_INTERACT_AUTH
292 int auth_interact_failed; /* flag whether interactive auth can still 292 int auth_interact_failed; /* flag whether interactive auth can still
293 be used */ 293 be used */
294 int interact_request_received; /* flag whether we've received an 294 int interact_request_received; /* flag whether we've received an
295 info request from the server for 295 info request from the server for
296 interactive auth.*/ 296 interactive auth.*/
309 }; 309 };
310 310
311 /* Global structs storing the state */ 311 /* Global structs storing the state */
312 extern struct sshsession ses; 312 extern struct sshsession ses;
313 313
314 #ifdef DROPBEAR_SERVER 314 #if DROPBEAR_SERVER
315 extern struct serversession svr_ses; 315 extern struct serversession svr_ses;
316 #endif /* DROPBEAR_SERVER */ 316 #endif /* DROPBEAR_SERVER */
317 317
318 #ifdef DROPBEAR_CLIENT 318 #if DROPBEAR_CLIENT
319 extern struct clientsession cli_ses; 319 extern struct clientsession cli_ses;
320 #endif /* DROPBEAR_CLIENT */ 320 #endif /* DROPBEAR_CLIENT */
321 321
322 #endif /* DROPBEAR_SESSION_H_ */ 322 #endif /* DROPBEAR_SESSION_H_ */