Default options comments, ignore localoptions.h

Also trim whitespaces.

Signed-off-by: Begley Brothers Inc <begleybrothers@gmail.com>
This commit is contained in:
Begley Brothers Inc 2020-07-09 17:51:07 +10:00 committed by Matt Johnston
parent f4be5a3c8b
commit 8b202f86e2
3 changed files with 20 additions and 16 deletions

3
.gitignore vendored
View File

@ -19,9 +19,10 @@
/fuzzer-*.options /fuzzer-*.options
/scp /scp
/scp-progress /scp-progress
Makefile
config.h config.h
default_options_guard.h default_options_guard.h
localoptions.h
Makefile
tags tags
.pytest* .pytest*
*.pyc *.pyc

View File

@ -116,4 +116,3 @@ void parse_recv_window(const char* recv_window_arg) {
} }
} }

View File

@ -127,17 +127,20 @@ IMPORTANT: Some options will require "make clean" after changes */
/* Hostkey/public key algorithms - at least one required, these are used /* Hostkey/public key algorithms - at least one required, these are used
* for hostkey as well as for verifying signatures with pubkey auth. * for hostkey as well as for verifying signatures with pubkey auth.
* Removing either of these won't save very much space. * Removing either of these won't save very much space.
* RSA is recommended * RSA is recommended.
* DSS may be necessary to connect to some systems though * DSS may be necessary to connect to some systems though
is not recommended for new keys */ * is not recommended for new keys.
* See: RSA_PRIV_FILENAME and DSS_PRIV_FILENAME */
#define DROPBEAR_RSA 1 #define DROPBEAR_RSA 1
#define DROPBEAR_DSS 1 #define DROPBEAR_DSS 1
/* ECDSA is significantly faster than RSA or DSS. Compiling in ECC /* ECDSA is significantly faster than RSA or DSS. Compiling in ECC
* code (either ECDSA or ECDH) increases binary size - around 30kB * code (either ECDSA or ECDH) increases binary size - around 30kB
* on x86-64 */ * on x86-64.
* See: ECDSA_PRIV_FILENAME */
#define DROPBEAR_ECDSA 1 #define DROPBEAR_ECDSA 1
/* Ed25519 is faster than ECDSA. Compiling in Ed25519 code increases /* Ed25519 is faster than ECDSA. Compiling in Ed25519 code increases
binary size - around 7,5kB on x86-64 */ * binary size - around 7,5kB on x86-64.
* See: ED25519_PRIV_FILENAME */
#define DROPBEAR_ED25519 1 #define DROPBEAR_ED25519 1
/* SK_ECDSA/SK_ED25519 allows u2f security keys for public key auth. /* SK_ECDSA/SK_ED25519 allows u2f security keys for public key auth.
* This is currently server-only. */ * This is currently server-only. */
@ -217,7 +220,8 @@ group1 in Dropbear server too */
* You can't enable both PASSWORD and PAM. */ * You can't enable both PASSWORD and PAM. */
#define DROPBEAR_SVR_PAM_AUTH 0 #define DROPBEAR_SVR_PAM_AUTH 0
/* ~/.ssh/authorized_keys authentication */ /* ~/.ssh/authorized_keys authentication.
* You must define DROPBEAR_SVR_PUBKEY_AUTH in order to use plugins. */
#define DROPBEAR_SVR_PUBKEY_AUTH 1 #define DROPBEAR_SVR_PUBKEY_AUTH 1
/* Whether to take public key options in /* Whether to take public key options in