ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-03-03 18:52:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make group1 client-only

Browse Source
This commit is contained in:
Matt Johnston 2018-02-26 22:42:53 +08:00
parent 246f24eda8
commit 3996e93a20
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
default_options.h
View File

@ -149,12 +149,17 @@ IMPORTANT: Some options will require "make clean" after changes */
* Small systems should generally include either curve25519 or ecdh for performance. * Small systems should generally include either curve25519 or ecdh for performance.
* curve25519 is less widely supported but is faster * curve25519 is less widely supported but is faster
*/ */
#define DROPBEAR_DH_GROUP1 0
#define DROPBEAR_DH_GROUP14_SHA1 1 #define DROPBEAR_DH_GROUP14_SHA1 1
#define DROPBEAR_DH_GROUP14_SHA256 1 #define DROPBEAR_DH_GROUP14_SHA256 1
#define DROPBEAR_DH_GROUP16 0 #define DROPBEAR_DH_GROUP16 0
#define DROPBEAR_CURVE25519 1 #define DROPBEAR_CURVE25519 1
#define DROPBEAR_ECDH 1 #define DROPBEAR_ECDH 1
#define DROPBEAR_DH_GROUP1 1
/* When group1 is enabled it will only be allowed by Dropbear client
not as a server, due to concerns over its strength. Set to 0 to allow
group1 in Dropbear server too */
#define DROPBEAR_DH_GROUP1_CLIENTONLY 1
/* Control the memory/performance/compression tradeoff for zlib. /* Control the memory/performance/compression tradeoff for zlib.
* Set windowBits=8 for least memory usage, see your system's * Set windowBits=8 for least memory usage, see your system's

13
svr-session.c
View File

@ -42,6 +42,7 @@
#include "crypto_desc.h" #include "crypto_desc.h"
static void svr_remoteclosed(void); static void svr_remoteclosed(void);
static void svr_algos_initialise(void);
struct serversession svr_ses; /* GLOBAL */ struct serversession svr_ses; /* GLOBAL */
@ -102,6 +103,7 @@ void svr_session(int sock, int childpipe) {
svr_authinitialise(); svr_authinitialise();
chaninitialise(svr_chantypes); chaninitialise(svr_chantypes);
svr_chansessinitialise(); svr_chansessinitialise();
svr_algos_initialise();
/* for logging the remote address */ /* for logging the remote address */
get_socket_address(ses.sock_in, NULL, NULL, &host, &port, 0); get_socket_address(ses.sock_in, NULL, NULL, &host, &port, 0);
@ -243,3 +245,14 @@ static void svr_remoteclosed() {
} }
static void svr_algos_initialise(void) {
#if DROPBEAR_DH_GROUP1 && DROPBEAR_DH_GROUP1_CLIENTONLY
algo_type *algo;
for (algo = sshkex; algo->name; algo++) {
if (strcmp(algo->name, "diffie-hellman-group1-sha1") == 0) {
algo->usable = 0;
}
}
#endif
}