# HG changeset patch # User Begley Brothers Inc # Date 1594281067 -36000 # Node ID 70f05f7d4d119a0e896db21a7ca925162ee902a9 # Parent 284c3837891c01f9c32e77c6d789799b1672a348 Default options comments, ignore localoptions.h Also trim whitespaces. Signed-off-by: Begley Brothers Inc diff -r 284c3837891c -r 70f05f7d4d11 .gitignore --- a/.gitignore Thu Jul 09 17:47:58 2020 +1000 +++ b/.gitignore Thu Jul 09 17:51:07 2020 +1000 @@ -19,9 +19,10 @@ /fuzzer-*.options /scp /scp-progress -Makefile config.h default_options_guard.h +localoptions.h +Makefile tags .pytest* *.pyc diff -r 284c3837891c -r 70f05f7d4d11 common-runopts.c --- a/common-runopts.c Thu Jul 09 17:47:58 2020 +1000 +++ b/common-runopts.c Thu Jul 09 17:51:07 2020 +1000 @@ -1,19 +1,19 @@ /* * Dropbear - a SSH2 server - * + * * Copyright (c) 2002,2003 Matt Johnston * All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -35,7 +35,7 @@ /* returns success or failure, and the keytype in *type. If we want * to restrict the type, type can contain a type to return */ -int readhostkey(const char * filename, sign_key * hostkey, +int readhostkey(const char * filename, sign_key * hostkey, enum signkey_type *type) { int ret = DROPBEAR_FAILURE; @@ -116,4 +116,3 @@ } } - diff -r 284c3837891c -r 70f05f7d4d11 default_options.h --- a/default_options.h Thu Jul 09 17:47:58 2020 +1000 +++ b/default_options.h Thu Jul 09 17:51:07 2020 +1000 @@ -6,7 +6,7 @@ default_options.h documents compile-time options, and provides default values. Local customisation should be added to localoptions.h which is -used if it exists in the build directory. Options defined there will override +used if it exists in the build directory. Options defined there will override any options in this file. Options can also be defined with -DDROPBEAR_XXX=[0,1] in Makefile CFLAGS @@ -78,7 +78,7 @@ /* Note: Both DROPBEAR_CLI_PROXYCMD and DROPBEAR_CLI_NETCAT must be set to * allow multihop dbclient connections */ -/* Allow using -J to run the connection through a +/* Allow using -J to run the connection through a pipe to a program, rather the normal TCP connection */ #define DROPBEAR_CLI_PROXYCMD 1 @@ -92,7 +92,7 @@ /* Encryption - at least one required. * AES128 should be enabled, some very old implementations might only * support 3DES. - * Including both AES keysize variants (128 and 256) will result in + * Including both AES keysize variants (128 and 256) will result in * a minimal size increase */ #define DROPBEAR_AES128 1 #define DROPBEAR_AES256 1 @@ -127,17 +127,20 @@ /* Hostkey/public key algorithms - at least one required, these are used * for hostkey as well as for verifying signatures with pubkey auth. * 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 - 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_DSS 1 /* ECDSA is significantly faster than RSA or DSS. Compiling in ECC * code (either ECDSA or ECDH) increases binary size - around 30kB - * on x86-64 */ + * on x86-64. + * See: ECDSA_PRIV_FILENAME */ #define DROPBEAR_ECDSA 1 /* 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 /* SK_ECDSA/SK_ED25519 allows u2f security keys for public key auth. * This is currently server-only. */ @@ -217,7 +220,8 @@ * You can't enable both PASSWORD and PAM. */ #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 /* Whether to take public key options in @@ -289,7 +293,7 @@ /* If you want to enable running an sftp server (such as the one included with - * OpenSSH), set the path below and set DROPBEAR_SFTPSERVER. + * OpenSSH), set the path below and set DROPBEAR_SFTPSERVER. * The sftp-server program is not provided by Dropbear itself. * Homedir is prepended if path begins with ~ */