Mercurial > dropbear
comparison keyimport.c @ 1499:2d450c1056e3
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 | 315fcba6960e |
comparison
equal
deleted
inserted
replaced
1497:bf9c06b8dad9 | 1499:2d450c1056e3 |
---|---|
868 * Find the sequence of integers to be encoded into the OpenSSH | 868 * Find the sequence of integers to be encoded into the OpenSSH |
869 * key blob, and also decide on the header line. | 869 * key blob, and also decide on the header line. |
870 */ | 870 */ |
871 numbers[0].start = zero; numbers[0].bytes = 1; zero[0] = '\0'; | 871 numbers[0].start = zero; numbers[0].bytes = 1; zero[0] = '\0'; |
872 | 872 |
873 #ifdef DROPBEAR_RSA | 873 #if DROPBEAR_RSA |
874 if (key->type == DROPBEAR_SIGNKEY_RSA) { | 874 if (key->type == DROPBEAR_SIGNKEY_RSA) { |
875 | 875 |
876 if (key->rsakey->p == NULL || key->rsakey->q == NULL) { | 876 if (key->rsakey->p == NULL || key->rsakey->q == NULL) { |
877 fprintf(stderr, "Pre-0.33 Dropbear keys cannot be converted to OpenSSH keys.\n"); | 877 fprintf(stderr, "Pre-0.33 Dropbear keys cannot be converted to OpenSSH keys.\n"); |
878 goto error; | 878 goto error; |
964 header = "-----BEGIN RSA PRIVATE KEY-----\n"; | 964 header = "-----BEGIN RSA PRIVATE KEY-----\n"; |
965 footer = "-----END RSA PRIVATE KEY-----\n"; | 965 footer = "-----END RSA PRIVATE KEY-----\n"; |
966 } | 966 } |
967 #endif /* DROPBEAR_RSA */ | 967 #endif /* DROPBEAR_RSA */ |
968 | 968 |
969 #ifdef DROPBEAR_DSS | 969 #if DROPBEAR_DSS |
970 if (key->type == DROPBEAR_SIGNKEY_DSS) { | 970 if (key->type == DROPBEAR_SIGNKEY_DSS) { |
971 | 971 |
972 /* p */ | 972 /* p */ |
973 numbers[1].bytes = buf_getint(keyblob); | 973 numbers[1].bytes = buf_getint(keyblob); |
974 numbers[1].start = buf_getptr(keyblob, numbers[1].bytes); | 974 numbers[1].start = buf_getptr(keyblob, numbers[1].bytes); |