ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-01-31 02:46:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a single DROPBEAR_SK_KEYS config option

Browse Source 
Replaces DROPBEAR_SK_ECDSA and DROPBEAR_SK_ED25519
This commit is contained in:
Matt Johnston 2022-11-11 16:23:07 +08:00
parent b2b94acc97
commit aa6559db66
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -15,6 +15,9 @@ Features and Changes:
- Add option for requiring both password and pubkey (-t) - Add option for requiring both password and pubkey (-t)
Patch from Jackkal Patch from Jackkal
- >> DROPBEAR_SK_KEYS config option now replaces separate DROPBEAR_SK_ECDSA
and DROPBEAR_SK_ED25519 options.
- Add 'permitopen' option for authorized_keys to restrict forwarded ports - Add 'permitopen' option for authorized_keys to restrict forwarded ports
Patch from Tuomas Haikarainen Patch from Tuomas Haikarainen

7
default_options.h
View File

@ -154,10 +154,11 @@ IMPORTANT: Some options will require "make clean" after changes */
* See: ED25519_PRIV_FILENAME */ * See: ED25519_PRIV_FILENAME */
#define DROPBEAR_ED25519 1 #define DROPBEAR_ED25519 1
/* SK_ECDSA/SK_ED25519 allows u2f security keys for public key auth. /* Allow U2F security keys for public key auth, with
* sk-ecdsa-sha2-nistp256@openssh.com or sk-ssh-ed25519@openssh.com keys.
* The corresponding DROPBEAR_ECDSA or DROPBEAR_ED25519 also needs to be set.
* This is currently server-only. */ * This is currently server-only. */
#define DROPBEAR_SK_ECDSA 1 #define DROPBEAR_SK_KEYS 1
#define DROPBEAR_SK_ED25519 1
/* RSA must be >=1024 */ /* RSA must be >=1024 */
#define DROPBEAR_DEFAULT_RSA_SIZE 2048 #define DROPBEAR_DEFAULT_RSA_SIZE 2048

7
sysoptions.h
View File

@ -183,6 +183,13 @@
#define DROPBEAR_NORMAL_DH ((DROPBEAR_DH_GROUP1) || (DROPBEAR_DH_GROUP14) || (DROPBEAR_DH_GROUP16)) #define DROPBEAR_NORMAL_DH ((DROPBEAR_DH_GROUP1) || (DROPBEAR_DH_GROUP14) || (DROPBEAR_DH_GROUP16))
#ifndef DROPBEAR_SK_ECDSA
#define DROPBEAR_SK_ECDSA DROPBEAR_SK_KEYS
#endif
#ifndef DROPBEAR_SK_ED25519
#define DROPBEAR_SK_ED25519 DROPBEAR_SK_KEYS
#endif
/* Dropbear only uses server-sig-algs, only needed if we have rsa-sha256 pubkey auth */ /* Dropbear only uses server-sig-algs, only needed if we have rsa-sha256 pubkey auth */
#define DROPBEAR_EXT_INFO ((DROPBEAR_RSA_SHA256) \ #define DROPBEAR_EXT_INFO ((DROPBEAR_RSA_SHA256) \
&& ((DROPBEAR_CLI_PUBKEY_AUTH) || (DROPBEAR_SVR_PUBKEY_AUTH))) && ((DROPBEAR_CLI_PUBKEY_AUTH) || (DROPBEAR_SVR_PUBKEY_AUTH)))