Mercurial > dropbear

comparison cli-auth.c @ 1499:2d450c1056e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
options: Complete the transition to numeric toggles (`#if') For the sake of review, this commit alters only the code; the affiliated comments within the source files also need to be updated, but doing so now would obscure the operational changes that have been made here. * All on/off options have been switched to the numeric `#if' variant; that is the only way to make this `default_options.h.in' thing work in a reasonable manner. * There is now some very minor compile-time checking of the user's choice of options. * NO_FAST_EXPTMOD doesn't seem to be used, so it has been removed. * ENABLE_USER_ALGO_LIST was supposed to be renamed DROPBEAR_USER_ALGO_LIST, and this commit completes that work. * DROPBEAR_FUZZ seems to be a relatively new, as-yet undocumented option, which was added by the following commit: commit 6e0b539e9ca0b5628c6c5a3d118ad6a2e79e8039 Author: Matt Johnston <[email protected]> Date: Tue May 23 22:29:21 2017 +0800 split out checkpubkey_line() separately It has now been added to `sysoptions.h' and defined as `0' by default. * The configuration option `DROPBEAR_PASSWORD_ENV' is no longer listed in `default_options.h.in'; it is no longer meant to be set by the user, and is instead left to be defined in `sysoptions.h' (where it was already being defined) as merely the name of the environment variable in question: DROPBEAR_PASSWORD To enable or disable use of that environment variable, the user must now toggle `DROPBEAR_USE_DROPBEAR_PASSWORD'. * The sFTP support is now toggled by setting `DROPBEAR_SFTPSERVER', and the path of the sFTP server program is set independently through the usual SFTPSERVER_PATH.
author Michael Witten <mfwitten@gmail.com>
date Thu, 20 Jul 2017 19:38:26 +0000
parents 06d52bcb8094
children 6c16a05023aa
comparison
equal deleted inserted replaced
1497:bf9c06b8dad9 1499:2d450c1056e3
58 Race described at 58 Race described at
59 http://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/zlib-openssh.html 59 http://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/zlib-openssh.html
60 */ 60 */
61 if (ses.keys->trans.algo_comp != DROPBEAR_COMP_ZLIB_DELAY) { 61 if (ses.keys->trans.algo_comp != DROPBEAR_COMP_ZLIB_DELAY) {
62 ses.authstate.authtypes = AUTH_TYPE_PUBKEY; 62 ses.authstate.authtypes = AUTH_TYPE_PUBKEY;
63 #if DROPBEAR_USE_DROPBEAR_PASSWORD
63 if (getenv(DROPBEAR_PASSWORD_ENV)) { 64 if (getenv(DROPBEAR_PASSWORD_ENV)) {
64 ses.authstate.authtypes |= AUTH_TYPE_PASSWORD | AUTH_TYPE_INTERACT; 65 ses.authstate.authtypes |= AUTH_TYPE_PASSWORD | AUTH_TYPE_INTERACT;
65 } 66 }
67 #endif
66 if (cli_auth_try() == DROPBEAR_SUCCESS) { 68 if (cli_auth_try() == DROPBEAR_SUCCESS) {
67 TRACE(("skipped initial none auth query")) 69 TRACE(("skipped initial none auth query"))
68 /* Note that there will be two auth responses in-flight */ 70 /* Note that there will be two auth responses in-flight */
69 cli_ses.ignore_next_auth_response = 1; 71 cli_ses.ignore_next_auth_response = 1;
70 } 72 }
333 * password is statically allocated by getpass() */ 335 * password is statically allocated by getpass() */
334 char* getpass_or_cancel(const char* prompt) 336 char* getpass_or_cancel(const char* prompt)
335 { 337 {
336 char* password = NULL; 338 char* password = NULL;
337 339
338 #ifdef DROPBEAR_PASSWORD_ENV 340 #if DROPBEAR_USE_DROPBEAR_PASSWORD
339 /* Password provided in an environment var */ 341 /* Password provided in an environment var */
340 password = getenv(DROPBEAR_PASSWORD_ENV); 342 password = getenv(DROPBEAR_PASSWORD_ENV);
341 if (password) 343 if (password)
342 { 344 {
343 return password; 345 return password;