summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.hgsigs1
-rw-r--r--.hgtags1
-rw-r--r--CHANGES5
-rw-r--r--bignum.c38
-rw-r--r--buffer.c2
-rw-r--r--cli-auth.c12
-rw-r--r--cli-tcpfwd.c4
-rw-r--r--common-algo.c22
-rw-r--r--common-kex.c44
-rw-r--r--dbmulti.c30
-rw-r--r--dbutil.c30
-rw-r--r--debian/changelog4
-rw-r--r--dh_groups.c46
-rw-r--r--dh_groups.h10
-rw-r--r--dropbearkey.c40
-rw-r--r--ecdsa.c4
-rw-r--r--gensignkey.c32
-rw-r--r--keyimport.c8
-rw-r--r--list.h8
-rw-r--r--options.h10
-rw-r--r--packet.c6
-rw-r--r--rsa.c40
-rw-r--r--scp.c4
-rw-r--r--signkey.c8
-rw-r--r--svr-main.c2
-rw-r--r--svr-tcpfwd.c2
-rw-r--r--svr-x11fwd.c27
-rw-r--r--sysoptions.h11
28 files changed, 236 insertions, 215 deletions
diff --git a/.hgsigs b/.hgsigs
index 6194e6e..fb2aa02 100644
--- a/.hgsigs
+++ b/.hgsigs
@@ -19,3 +19,4 @@ ef4b26364b0cdda1084751d7de3d76c589e2d9cb 0 iQIcBAABCgAGBQJVxg7BAAoJEESTFJTynGdz9
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
diff --git a/.hgtags b/.hgtags
index c16ccff..e9263f5 100644
--- a/.hgtags
+++ b/.hgtags
@@ -51,3 +51,4 @@ cbd674d63cd4f3781464a8d4056a5506c8ae926f DROPBEAR_2015.67
1637dbd262124d113e52967df46afd6c715e4fad DROPBEAR_2015.69
79a6ef02307d05cb9dda10465cb5b807baa8f62e DROPBEAR_2015.70
9a944a243f08be6b22d32f166a0690eb4872462b DROPBEAR_2015.71
+78b12b6549be08b0bea3da329b2578060a76ca31 DROPBEAR_2016.72
diff --git a/CHANGES b/CHANGES
index 64e8312..a6cd0b6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+2016.72 - 9 March 2016
+
+- Validate X11 forwarding input. Could allow bypass of authorized_keys command= restrictions,
+ found by github.com/tintinweb. Thanks for Damien Miller for a patch.
+
2015.71 - 3 December 2015
- Fix "bad buf_incrpos" when data is transferred, broke in 2015.69
diff --git a/bignum.c b/bignum.c
index 4400969..3758052 100644
--- a/bignum.c
+++ b/bignum.c
@@ -39,33 +39,33 @@ void m_mp_init(mp_int *mp) {
* on error */
void m_mp_init_multi(mp_int *mp, ...)
{
- mp_int* cur_arg = mp;
- va_list args;
+ mp_int* cur_arg = mp;
+ va_list args;
- va_start(args, mp); /* init args to next argument from caller */
- while (cur_arg != NULL) {
- if (mp_init(cur_arg) != MP_OKAY) {
+ va_start(args, mp); /* init args to next argument from caller */
+ while (cur_arg != NULL) {
+ if (mp_init(cur_arg) != MP_OKAY) {
dropbear_exit("Mem alloc error");
- }
- cur_arg = va_arg(args, mp_int*);
- }
- va_end(args);
+ }
+ cur_arg = va_arg(args, mp_int*);
+ }
+ va_end(args);
}
void m_mp_alloc_init_multi(mp_int **mp, ...)
{
- mp_int** cur_arg = mp;
- va_list args;
+ mp_int** cur_arg = mp;
+ va_list args;
- va_start(args, mp); /* init args to next argument from caller */
- while (cur_arg != NULL) {
- *cur_arg = m_malloc(sizeof(mp_int));
- if (mp_init(*cur_arg) != MP_OKAY) {
+ va_start(args, mp); /* init args to next argument from caller */
+ while (cur_arg != NULL) {
+ *cur_arg = m_malloc(sizeof(mp_int));
+ if (mp_init(*cur_arg) != MP_OKAY) {
dropbear_exit("Mem alloc error");
- }
- cur_arg = va_arg(args, mp_int**);
- }
- va_end(args);
+ }
+ cur_arg = va_arg(args, mp_int**);
+ }
+ va_end(args);
}
void bytes_to_mp(mp_int *mp, const unsigned char* bytes, unsigned int len) {
diff --git a/buffer.c b/buffer.c
index 1e5a864..cd974e3 100644
--- a/buffer.c
+++ b/buffer.c
@@ -98,7 +98,7 @@ buffer* buf_newcopy(buffer* buf) {
ret = buf_new(buf->len);
ret->len = buf->len;
if (buf->len > 0) {
- memcpy(ret->data, buf->data, buf->len);
+ memcpy(ret->data, buf->data, buf->len);
}
return ret;
}
diff --git a/cli-auth.c b/cli-auth.c
index da0d9d5..59d455b 100644
--- a/cli-auth.c
+++ b/cli-auth.c
@@ -332,12 +332,12 @@ char* getpass_or_cancel(char* prompt)
char* password = NULL;
#ifdef DROPBEAR_PASSWORD_ENV
- /* Password provided in an environment var */
- password = getenv(DROPBEAR_PASSWORD_ENV);
- if (password)
- {
- return password;
- }
+ /* Password provided in an environment var */
+ password = getenv(DROPBEAR_PASSWORD_ENV);
+ if (password)
+ {
+ return password;
+ }
#endif
password = getpass(prompt);
diff --git a/cli-tcpfwd.c b/cli-tcpfwd.c
index b32d9e0..c3a1350 100644
--- a/cli-tcpfwd.c
+++ b/cli-tcpfwd.c
@@ -231,7 +231,7 @@ void setup_remotetcp() {
static int newtcpforwarded(struct Channel * channel) {
- char *origaddr = NULL;
+ char *origaddr = NULL;
unsigned int origport;
m_list_elem * iter = NULL;
struct TCPFwdEntry *fwd;
@@ -267,7 +267,7 @@ static int newtcpforwarded(struct Channel * channel) {
if (iter == NULL) {
/* We didn't request forwarding on that port */
- cleantext(origaddr);
+ cleantext(origaddr);
dropbear_log(LOG_INFO, "Server sent unrequested forward from \"%s:%d\"",
origaddr, origport);
goto out;
diff --git a/common-algo.c b/common-algo.c
index 1841d67..c2cef77 100644
--- a/common-algo.c
+++ b/common-algo.c
@@ -248,14 +248,17 @@ algo_type sshhostkey[] = {
{NULL, 0, NULL, 0, NULL}
};
+#if DROPBEAR_DH_GROUP1
static const struct dropbear_kex kex_dh_group1 = {DROPBEAR_KEX_NORMAL_DH, dh_p_1, DH_P_1_LEN, NULL, &sha1_desc };
+#endif
+#if DROPBEAR_DH_GROUP14
static const struct dropbear_kex kex_dh_group14_sha1 = {DROPBEAR_KEX_NORMAL_DH, dh_p_14, DH_P_14_LEN, NULL, &sha1_desc };
+#if DROPBEAR_DH_GROUP14_256
static const struct dropbear_kex kex_dh_group14_sha256 = {DROPBEAR_KEX_NORMAL_DH, dh_p_14, DH_P_14_LEN, NULL, &sha256_desc };
-#ifdef DROPBEAR_DH_GROUP15
-static const struct dropbear_kex kex_dh_group15_sha256 = {DROPBEAR_KEX_NORMAL_DH, dh_p_15, DH_P_15_LEN, NULL, &sha256_desc };
#endif
-#ifdef DROPBEAR_DH_GROUP16
-static const struct dropbear_kex kex_dh_group16_sha256 = {DROPBEAR_KEX_NORMAL_DH, dh_p_16, DH_P_16_LEN, NULL, &sha256_desc };
+#endif
+#if DROPBEAR_DH_GROUP16
+static const struct dropbear_kex kex_dh_group16_sha512 = {DROPBEAR_KEX_NORMAL_DH, dh_p_16, DH_P_16_LEN, NULL, &sha512_desc };
#endif
/* These can't be const since dropbear_ecc_fill_dp() fills out
@@ -292,14 +295,17 @@ algo_type sshkex[] = {
{"ecdh-sha2-nistp256", 0, &kex_ecdh_nistp256, 1, NULL},
#endif
#endif
+#if DROPBEAR_DH_GROUP14
+#if DROPBEAR_DH_GROUP14_256
{"diffie-hellman-group14-sha256", 0, &kex_dh_group14_sha256, 1, NULL},
+#endif
{"diffie-hellman-group14-sha1", 0, &kex_dh_group14_sha1, 1, NULL},
+#endif
+#if DROPBEAR_DH_GROUP1
{"diffie-hellman-group1-sha1", 0, &kex_dh_group1, 1, NULL},
-#ifdef DROPBEAR_DH_GROUP15
- {"diffie-hellman-group15-sha256", 0, &kex_dh_group15_sha256, 1, NULL},
#endif
-#ifdef DROPBEAR_DH_GROUP16
- {"diffie-hellman-group16-sha256", 0, &kex_dh_group16_sha256, 1, NULL},
+#if DROPBEAR_DH_GROUP16
+ {"diffie-hellman-group16-sha512", 0, &kex_dh_group16_sha512, 1, NULL},
#endif
#ifdef USE_KEXGUESS2
{KEXGUESS2_ALGO_NAME, KEXGUESS2_ALGO_ID, NULL, 1, NULL},
diff --git a/common-kex.c b/common-kex.c
index d403bd2..c7004e6 100644
--- a/common-kex.c
+++ b/common-kex.c
@@ -308,17 +308,17 @@ static void gen_new_keys() {
ses.hash = NULL;
if (IS_DROPBEAR_CLIENT) {
- trans_IV = C2S_IV;
- recv_IV = S2C_IV;
- trans_key = C2S_key;
- recv_key = S2C_key;
+ trans_IV = C2S_IV;
+ recv_IV = S2C_IV;
+ trans_key = C2S_key;
+ recv_key = S2C_key;
mactransletter = 'E';
macrecvletter = 'F';
} else {
- trans_IV = S2C_IV;
- recv_IV = C2S_IV;
- trans_key = S2C_key;
- recv_key = C2S_key;
+ trans_IV = S2C_IV;
+ recv_IV = C2S_IV;
+ trans_key = S2C_key;
+ recv_key = C2S_key;
mactransletter = 'F';
macrecvletter = 'E';
}
@@ -484,18 +484,18 @@ void recv_msg_kexinit() {
read_kex_algos();
/* V_C, the client's version string (CR and NL excluded) */
- buf_putstring(ses.kexhashbuf, LOCAL_IDENT, local_ident_len);
+ buf_putstring(ses.kexhashbuf, LOCAL_IDENT, local_ident_len);
/* V_S, the server's version string (CR and NL excluded) */
- buf_putstring(ses.kexhashbuf, ses.remoteident, remote_ident_len);
+ buf_putstring(ses.kexhashbuf, ses.remoteident, remote_ident_len);
/* I_C, the payload of the client's SSH_MSG_KEXINIT */
- buf_putstring(ses.kexhashbuf,
+ buf_putstring(ses.kexhashbuf,
(const char*)ses.transkexinit->data, ses.transkexinit->len);
/* I_S, the payload of the server's SSH_MSG_KEXINIT */
- buf_setpos(ses.payload, ses.payload_beginning);
- buf_putstring(ses.kexhashbuf,
- (const char*)buf_getptr(ses.payload, ses.payload->len-ses.payload->pos),
- ses.payload->len-ses.payload->pos);
+ buf_setpos(ses.payload, ses.payload_beginning);
+ buf_putstring(ses.kexhashbuf,
+ (const char*)buf_getptr(ses.payload, ses.payload->len-ses.payload->pos),
+ ses.payload->len-ses.payload->pos);
ses.requirenext = SSH_MSG_KEXDH_REPLY;
} else {
/* SERVER */
@@ -503,18 +503,18 @@ void recv_msg_kexinit() {
/* read the peer's choice of algos */
read_kex_algos();
/* V_C, the client's version string (CR and NL excluded) */
- buf_putstring(ses.kexhashbuf, ses.remoteident, remote_ident_len);
+ buf_putstring(ses.kexhashbuf, ses.remoteident, remote_ident_len);
/* V_S, the server's version string (CR and NL excluded) */
- buf_putstring(ses.kexhashbuf, LOCAL_IDENT, local_ident_len);
+ buf_putstring(ses.kexhashbuf, LOCAL_IDENT, local_ident_len);
/* I_C, the payload of the client's SSH_MSG_KEXINIT */
- buf_setpos(ses.payload, ses.payload_beginning);
- buf_putstring(ses.kexhashbuf,
- (const char*)buf_getptr(ses.payload, ses.payload->len-ses.payload->pos),
- ses.payload->len-ses.payload->pos);
+ buf_setpos(ses.payload, ses.payload_beginning);
+ buf_putstring(ses.kexhashbuf,
+ (const char*)buf_getptr(ses.payload, ses.payload->len-ses.payload->pos),
+ ses.payload->len-ses.payload->pos);
/* I_S, the payload of the server's SSH_MSG_KEXINIT */
- buf_putstring(ses.kexhashbuf,
+ buf_putstring(ses.kexhashbuf,
(const char*)ses.transkexinit->data, ses.transkexinit->len);
ses.requirenext = SSH_MSG_KEXDH_INIT;
diff --git a/dbmulti.c b/dbmulti.c
index 8d99656..204e9a3 100644
--- a/dbmulti.c
+++ b/dbmulti.c
@@ -26,17 +26,13 @@
/* definitions are cleanest if we just put them here */
int dropbear_main(int argc, char ** argv);
+int cli_main(int argc, char ** argv);
int dropbearkey_main(int argc, char ** argv);
int dropbearconvert_main(int argc, char ** argv);
int scp_main(int argc, char ** argv);
-int main(int argc, char ** argv) {
-
- char * progname;
-
- if (argc > 0) {
- /* figure which form we're being called as */
- progname = basename(argv[0]);
+static int runprog(const char *progname, int argc, char ** argv, int *match) {
+ *match = DROPBEAR_SUCCESS;
#ifdef DBMULTI_dropbear
if (strcmp(progname, "dropbear") == 0) {
@@ -64,10 +60,28 @@ int main(int argc, char ** argv) {
return scp_main(argc, argv);
}
#endif
+ *match = DROPBEAR_FAILURE;
+ return 1;
+}
+
+int main(int argc, char ** argv) {
+ int i;
+ for (i = 0; i < 2; i++) {
+ /* Try symlink first, then try as an argument eg "dropbearmulti dbclient host ..." */
+ if (argc > i) {
+ int match, res;
+ /* figure which form we're being called as */
+ const char* progname = basename(argv[i]);
+ res = runprog(progname, argc-i, &argv[i], &match);
+ if (match == DROPBEAR_SUCCESS) {
+ return res;
+ }
+ }
}
fprintf(stderr, "Dropbear SSH multi-purpose v%s\n"
- "Make a symlink pointing at this binary with one of the following names:\n"
+ "Make a symlink pointing at this binary with one of the\n"
+ "following names or run 'dropbearmulti <command>'.\n"
#ifdef DBMULTI_dropbear
"'dropbear' - the Dropbear server\n"
#endif
diff --git a/dbutil.c b/dbutil.c
index 7c7c069..93b03a3 100644
--- a/dbutil.c
+++ b/dbutil.c
@@ -157,26 +157,26 @@ void debug_start_net()
{
if (getenv("DROPBEAR_DEBUG_NET_TIMESTAMP"))
{
- /* Timestamps start from first network activity */
- struct timeval tv;
- gettimeofday(&tv, NULL);
- debug_start_time = tv.tv_sec + (tv.tv_usec / 1000000.0);
- TRACE(("Resetting Dropbear TRACE timestamps"))
+ /* Timestamps start from first network activity */
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ debug_start_time = tv.tv_sec + (tv.tv_usec / 1000000.0);
+ TRACE(("Resetting Dropbear TRACE timestamps"))
}
}
static double time_since_start()
{
- double nowf;
- struct timeval tv;
- gettimeofday(&tv, NULL);
- nowf = tv.tv_sec + (tv.tv_usec / 1000000.0);
- if (debug_start_time < 0)
- {
- debug_start_time = nowf;
- return 0;
- }
- return nowf - debug_start_time;
+ double nowf;
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ nowf = tv.tv_sec + (tv.tv_usec / 1000000.0);
+ if (debug_start_time < 0)
+ {
+ debug_start_time = nowf;
+ return 0;
+ }
+ return nowf - debug_start_time;
}
void dropbear_trace(const char* format, ...) {
diff --git a/debian/changelog b/debian/changelog
index 79ea117..9a3d08e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-dropbear (2015.71-0.1) unstable; urgency=low
+dropbear (2016.72-0.1) unstable; urgency=low
* New upstream release.
- -- Matt Johnston <matt@ucc.asn.au> Thu, 3 Dec 2015 22:52:58 +0800
+ -- Matt Johnston <matt@ucc.asn.au> Wed, 10 Mar 2016 22:52:58 +0800
dropbear (2015.70-0.1) unstable; urgency=low
diff --git a/dh_groups.c b/dh_groups.c
index 205dea3..44ee830 100644
--- a/dh_groups.c
+++ b/dh_groups.c
@@ -1,6 +1,7 @@
#include "options.h"
#include "dh_groups.h"
+#if DROPBEAR_DH_GROUP1
/* diffie-hellman-group1-sha1 value for p */
const unsigned char dh_p_1[DH_P_1_LEN] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2,
@@ -14,7 +15,9 @@ const unsigned char dh_p_1[DH_P_1_LEN] = {
0xEE, 0x38, 0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5, 0xAE, 0x9F, 0x24, 0x11,
0x7C, 0x4B, 0x1F, 0xE6, 0x49, 0x28, 0x66, 0x51, 0xEC, 0xE6, 0x53, 0x81,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+#endif /* DROPBEAR_DH_GROUP1 */
+#if DROPBEAR_DH_GROUP14
/* diffie-hellman-group14-sha1 value for p */
const unsigned char dh_p_14[DH_P_14_LEN] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2,
@@ -39,46 +42,9 @@ const unsigned char dh_p_14[DH_P_14_LEN] = {
0xEA, 0x95, 0x6A, 0xE5, 0x15, 0xD2, 0x26, 0x18, 0x98, 0xFA, 0x05, 0x10,
0x15, 0x72, 0x8E, 0x5A, 0x8A, 0xAC, 0xAA, 0x68, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF};
+#endif /* DROPBEAR_DH_GROUP14 */
-#ifdef DROPBEAR_DH_GROUP15
-/* diffie-hellman-group15-sha256 value for p */
-const unsigned char dh_p_15[DH_P_15_LEN] = {
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2,
- 0x21, 0x68, 0xC2, 0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1,
- 0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74, 0x02, 0x0B, 0xBE, 0xA6,
- 0x3B, 0x13, 0x9B, 0x22, 0x51, 0x4A, 0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD,
- 0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B, 0x30, 0x2B, 0x0A, 0x6D,
- 0xF2, 0x5F, 0x14, 0x37, 0x4F, 0xE1, 0x35, 0x6D, 0x6D, 0x51, 0xC2, 0x45,
- 0xE4, 0x85, 0xB5, 0x76, 0x62, 0x5E, 0x7E, 0xC6, 0xF4, 0x4C, 0x42, 0xE9,
- 0xA6, 0x37, 0xED, 0x6B, 0x0B, 0xFF, 0x5C, 0xB6, 0xF4, 0x06, 0xB7, 0xED,
- 0xEE, 0x38, 0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5, 0xAE, 0x9F, 0x24, 0x11,
- 0x7C, 0x4B, 0x1F, 0xE6, 0x49, 0x28, 0x66, 0x51, 0xEC, 0xE4, 0x5B, 0x3D,
- 0xC2, 0x00, 0x7C, 0xB8, 0xA1, 0x63, 0xBF, 0x05, 0x98, 0xDA, 0x48, 0x36,
- 0x1C, 0x55, 0xD3, 0x9A, 0x69, 0x16, 0x3F, 0xA8, 0xFD, 0x24, 0xCF, 0x5F,
- 0x83, 0x65, 0x5D, 0x23, 0xDC, 0xA3, 0xAD, 0x96, 0x1C, 0x62, 0xF3, 0x56,
- 0x20, 0x85, 0x52, 0xBB, 0x9E, 0xD5, 0x29, 0x07, 0x70, 0x96, 0x96, 0x6D,
- 0x67, 0x0C, 0x35, 0x4E, 0x4A, 0xBC, 0x98, 0x04, 0xF1, 0x74, 0x6C, 0x08,
- 0xCA, 0x18, 0x21, 0x7C, 0x32, 0x90, 0x5E, 0x46, 0x2E, 0x36, 0xCE, 0x3B,
- 0xE3, 0x9E, 0x77, 0x2C, 0x18, 0x0E, 0x86, 0x03, 0x9B, 0x27, 0x83, 0xA2,
- 0xEC, 0x07, 0xA2, 0x8F, 0xB5, 0xC5, 0x5D, 0xF0, 0x6F, 0x4C, 0x52, 0xC9,
- 0xDE, 0x2B, 0xCB, 0xF6, 0x95, 0x58, 0x17, 0x18, 0x39, 0x95, 0x49, 0x7C,
- 0xEA, 0x95, 0x6A, 0xE5, 0x15, 0xD2, 0x26, 0x18, 0x98, 0xFA, 0x05, 0x10,
- 0x15, 0x72, 0x8E, 0x5A, 0x8A, 0xAA, 0xC4, 0x2D, 0xAD, 0x33, 0x17, 0x0D,
- 0x04, 0x50, 0x7A, 0x33, 0xA8, 0x55, 0x21, 0xAB, 0xDF, 0x1C, 0xBA, 0x64,
- 0xEC, 0xFB, 0x85, 0x04, 0x58, 0xDB, 0xEF, 0x0A, 0x8A, 0xEA, 0x71, 0x57,
- 0x5D, 0x06, 0x0C, 0x7D, 0xB3, 0x97, 0x0F, 0x85, 0xA6, 0xE1, 0xE4, 0xC7,
- 0xAB, 0xF5, 0xAE, 0x8C, 0xDB, 0x09, 0x33, 0xD7, 0x1E, 0x8C, 0x94, 0xE0,
- 0x4A, 0x25, 0x61, 0x9D, 0xCE, 0xE3, 0xD2, 0x26, 0x1A, 0xD2, 0xEE, 0x6B,
- 0xF1, 0x2F, 0xFA, 0x06, 0xD9, 0x8A, 0x08, 0x64, 0xD8, 0x76, 0x02, 0x73,
- 0x3E, 0xC8, 0x6A, 0x64, 0x52, 0x1F, 0x2B, 0x18, 0x17, 0x7B, 0x20, 0x0C,
- 0xBB, 0xE1, 0x17, 0x57, 0x7A, 0x61, 0x5D, 0x6C, 0x77, 0x09, 0x88, 0xC0,
- 0xBA, 0xD9, 0x46, 0xE2, 0x08, 0xE2, 0x4F, 0xA0, 0x74, 0xE5, 0xAB, 0x31,
- 0x43, 0xDB, 0x5B, 0xFC, 0xE0, 0xFD, 0x10, 0x8E, 0x4B, 0x82, 0xD1, 0x20,
- 0xA9, 0x3A, 0xD2, 0xCA, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-#endif /* DROPBEAR_DH_GROUP15 */
-
-
-#ifdef DROPBEAR_DH_GROUP16
+#if DROPBEAR_DH_GROUP16
/* diffie-hellman-group16-256 value for p */
const unsigned char dh_p_16[DH_P_16_LEN] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2, 0x21,
@@ -123,6 +89,6 @@ const unsigned char dh_p_16[DH_P_16_LEN] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
#endif /* DROPBEAR_DH_GROUP16 */
-/* Same for group1 and group14 */
+/* Same for all groups */
const int DH_G_VAL = 2;
diff --git a/dh_groups.h b/dh_groups.h
index 7fadac2..cddaa17 100644
--- a/dh_groups.h
+++ b/dh_groups.h
@@ -2,17 +2,17 @@
#define DROPBEAR_DH_GROUPS_H
#include "options.h"
+#if DROPBEAR_DH_GROUP1
#define DH_P_1_LEN 128
extern const unsigned char dh_p_1[DH_P_1_LEN];
+#endif
+
+#if DROPBEAR_DH_GROUP14
#define DH_P_14_LEN 256
extern const unsigned char dh_p_14[DH_P_14_LEN];
-
-#ifdef DROPBEAR_DH_GROUP15
-#define DH_P_15_LEN 384
-extern const unsigned char dh_p_15[DH_P_15_LEN];
#endif
-#ifdef DROPBEAR_DH_GROUP16
+#if DROPBEAR_DH_GROUP16
#define DH_P_16_LEN 512
extern const unsigned char dh_p_16[DH_P_16_LEN];
#endif
diff --git a/dropbearkey.c b/dropbearkey.c
index 7eb2f3f..644de94 100644
--- a/dropbearkey.c
+++ b/dropbearkey.c
@@ -105,25 +105,25 @@ static void printhelp(char * progname) {
/* fails fatally */
static void check_signkey_bits(enum signkey_type type, int bits)
{
- switch (type) {
+ switch (type) {
#ifdef DROPBEAR_RSA
- case DROPBEAR_SIGNKEY_RSA:
- if (bits < 512 || bits > 4096 || (bits % 8 != 0)) {
- dropbear_exit("Bits must satisfy 512 <= bits <= 4096, and be a"
- " multiple of 8\n");
- }
- break;
+ case DROPBEAR_SIGNKEY_RSA:
+ if (bits < 512 || bits > 4096 || (bits % 8 != 0)) {
+ dropbear_exit("Bits must satisfy 512 <= bits <= 4096, and be a"
+ " multiple of 8\n");
+ }
+ break;
#endif
#ifdef DROPEAR_DSS
- case DROPBEAR_SIGNKEY_DSS:
- if (bits != 1024) {
- dropbear_exit("DSS keys have a fixed size of 1024 bits\n");
- exit(EXIT_FAILURE);
- }
+ case DROPBEAR_SIGNKEY_DSS:
+ if (bits != 1024) {
+ dropbear_exit("DSS keys have a fixed size of 1024 bits\n");
+ exit(EXIT_FAILURE);
+ }
#endif
- default:
- (void)0; /* quiet, compiler. ecdsa handles checks itself */
- }
+ default:
+ (void)0; /* quiet, compiler. ecdsa handles checks itself */
+ }
}
#if defined(DBMULTI_dropbearkey) || !defined(DROPBEAR_MULTI)
@@ -238,13 +238,13 @@ int main(int argc, char ** argv) {
}
check_signkey_bits(keytype, bits);;
- }
+ }
fprintf(stderr, "Generating key, this may take a while...\n");
- if (signkey_generate(keytype, bits, filename) == DROPBEAR_FAILURE)
- {
- dropbear_exit("Failed to generate key.\n");
- }
+ if (signkey_generate(keytype, bits, filename) == DROPBEAR_FAILURE)
+ {
+ dropbear_exit("Failed to generate key.\n");
+ }
printpubfile(filename);
diff --git a/ecdsa.c b/ecdsa.c
index 5568131..14558b6 100644
--- a/ecdsa.c
+++ b/ecdsa.c
@@ -385,12 +385,12 @@ int buf_ecdsa_verify(buffer *buf, ecc_key *key, buffer *data_buf) {
goto out;
}
- /* reduce */
+ /* reduce */
if (ltc_mp.ecc_map(mG, m, mp) != CRYPT_OK) {
goto out;
}
} else {
- /* use Shamir's trick to compute u1*mG + u2*mQ using half of the doubles */
+ /* use Shamir's trick to compute u1*mG + u2*mQ using half of the doubles */
if (ltc_mp.ecc_mul2add(mG, u1, mQ, u2, mG, m) != CRYPT_OK) {
goto out;
}
diff --git a/gensignkey.c b/gensignkey.c
index e6c40e0..cdc16e6 100644
--- a/gensignkey.c
+++ b/gensignkey.c
@@ -52,28 +52,28 @@ out:
/* returns 0 on failure */
static int get_default_bits(enum signkey_type keytype)
{
- switch (keytype) {
+ switch (keytype) {
#ifdef DROPBEAR_RSA
- case DROPBEAR_SIGNKEY_RSA:
- return RSA_DEFAULT_SIZE;
+ case DROPBEAR_SIGNKEY_RSA:
+ return RSA_DEFAULT_SIZE;
#endif
#ifdef DROPBEAR_DSS
- case DROPBEAR_SIGNKEY_DSS:
- return DSS_DEFAULT_SIZE;
+ case DROPBEAR_SIGNKEY_DSS:
+ return DSS_DEFAULT_SIZE;
#endif
#ifdef DROPBEAR_ECDSA
- case DROPBEAR_SIGNKEY_ECDSA_KEYGEN:
- return ECDSA_DEFAULT_SIZE;
- case DROPBEAR_SIGNKEY_ECDSA_NISTP521:
- return 521;
- case DROPBEAR_SIGNKEY_ECDSA_NISTP384:
- return 384;
- case DROPBEAR_SIGNKEY_ECDSA_NISTP256:
- return 256;
+ case DROPBEAR_SIGNKEY_ECDSA_KEYGEN:
+ return ECDSA_DEFAULT_SIZE;
+ case DROPBEAR_SIGNKEY_ECDSA_NISTP521:
+ return 521;
+ case DROPBEAR_SIGNKEY_ECDSA_NISTP384:
+ return 384;
+ case DROPBEAR_SIGNKEY_ECDSA_NISTP256:
+ return 256;
#endif
- default:
- return 0;
- }
+ default:
+ return 0;
+ }
}
int signkey_generate(enum signkey_type keytype, int bits, const char* filename)
diff --git a/keyimport.c b/keyimport.c
index d45914f..66a6df7 100644
--- a/keyimport.c
+++ b/keyimport.c
@@ -194,13 +194,13 @@ static void base64_encode_fp(FILE * fp, unsigned char *data,
int datalen, int cpl)
{
unsigned char out[100];
- int n;
+ int n;
unsigned long outlen;
int rawcpl;
rawcpl = cpl * 3 / 4;
dropbear_assert((unsigned int)cpl < sizeof(out));
- while (datalen > 0) {
+ while (datalen > 0) {
n = (datalen < rawcpl ? datalen : rawcpl);
outlen = sizeof(out);
base64_encode(data, n, out, &outlen);
@@ -208,7 +208,7 @@ static void base64_encode_fp(FILE * fp, unsigned char *data,
datalen -= n;
fwrite(out, 1, outlen, fp);
fputc('\n', fp);
- }
+ }
}
/*
* Read an ASN.1/BER identifier and length pair.
@@ -1056,7 +1056,7 @@ static int openssh_write(const char *filename, sign_key *key,
dropbear_assert(k_size <= curve_size);
buf_incrwritepos(seq_buf,
ber_write_id_len(buf_getwriteptr(seq_buf, 10), 4, k_size, 0));
- mp_to_unsigned_bin((*eck)->k, buf_getwriteptr(seq_buf, k_size));
+ mp_to_unsigned_bin((*eck)->k, buf_getwriteptr(seq_buf, k_size));
buf_incrwritepos(seq_buf, k_size);
/* SECGCurveNames */
diff --git a/list.h b/list.h
index 35c0d49..b26a212 100644
--- a/list.h
+++ b/list.h
@@ -4,17 +4,17 @@
struct _m_list;
struct _m_list_elem {
- void *item;
+ void *item;
struct _m_list_elem *next;
struct _m_list_elem *prev;
- struct _m_list *list;
+ struct _m_list *list;
};
typedef struct _m_list_elem m_list_elem;
struct _m_list {
- m_list_elem *first;
- m_list_elem *last;
+ m_list_elem *first;
+ m_list_elem *last;
};
typedef struct _m_list m_list;
diff --git a/options.h b/options.h
index 1be412b..0c51bb1 100644
--- a/options.h
+++ b/options.h
@@ -152,11 +152,6 @@ If you test it please contact the Dropbear author */
* on x86-64 */
#define DROPBEAR_ECDSA
-/* These larger DH groups (3072 and 4096 bit respectively) add to binary size
- and may be significantly slower. Usually ECDH or curve25519 will be a better option */
-/*#define DROPBEAR_DH_GROUP15*/
-/*#define DROPBEAR_DH_GROUP16*/
-
/* Generate hostkeys as-needed when the first connection using that key type occurs.
This avoids the need to otherwise run "dropbearkey" and avoids some problems
with badly seeded /dev/urandom when systems first boot.
@@ -173,6 +168,11 @@ If you test it please contact the Dropbear author */
* ECDSA above */
#define DROPBEAR_ECDH
+/* Group14 (2048 bit) is recommended. Group1 is less secure (1024 bit) though
+ is the only option for interoperability with some older SSH programs */
+#define DROPBEAR_DH_GROUP1 1
+#define DROPBEAR_DH_GROUP14 1
+
/* Control the memory/performance/compression tradeoff for zlib.
* Set windowBits=8 for least memory usage, see your system's
* zlib.h for full details.
diff --git a/packet.c b/packet.c
index 19b5759..f827ab8 100644
--- a/packet.c
+++ b/packet.c
@@ -576,8 +576,8 @@ void encrypt_packet() {
}
buf_incrpos(writebuf, len);
- /* stick the MAC on it */
- buf_putbytes(writebuf, mac_bytes, mac_size);
+ /* stick the MAC on it */
+ buf_putbytes(writebuf, mac_bytes, mac_size);
/* Update counts */
ses.kexstate.datatrans += writebuf->len;
@@ -645,7 +645,7 @@ static void make_mac(unsigned int seqno, const struct key_context_directional *
dropbear_exit("HMAC error");
}
- bufsize = MAX_MAC_LEN;
+ bufsize = MAX_MAC_LEN;
if (hmac_done(&hmac, output_mac, &bufsize) != CRYPT_OK) {
dropbear_exit("HMAC error");
}
diff --git a/rsa.c b/rsa.c
index 193e577..4fa4088 100644
--- a/rsa.c
+++ b/rsa.c
@@ -47,7 +47,7 @@ static void rsa_pad_em(dropbear_rsa_key * key,
* Returns DROPBEAR_SUCCESS or DROPBEAR_FAILURE */
int buf_get_rsa_pub_key(buffer* buf, dropbear_rsa_key *key) {
- int ret = DROPBEAR_FAILURE;
+ int ret = DROPBEAR_FAILURE;
TRACE(("enter buf_get_rsa_pub_key"))
dropbear_assert(key != NULL);
m_mp_alloc_init_multi(&key->e, &key->n, NULL);
@@ -60,21 +60,21 @@ int buf_get_rsa_pub_key(buffer* buf, dropbear_rsa_key *key) {
if (buf_getmpint(buf, key->e) == DROPBEAR_FAILURE
|| buf_getmpint(buf, key->n) == DROPBEAR_FAILURE) {
TRACE(("leave buf_get_rsa_pub_key: failure"))
- goto out;
+ goto out;
}
if (mp_count_bits(key->n) < MIN_RSA_KEYLEN) {
dropbear_log(LOG_WARNING, "RSA key too short");
- goto out;
+ goto out;
}
TRACE(("leave buf_get_rsa_pub_key: success"))
- ret = DROPBEAR_SUCCESS;
+ ret = DROPBEAR_SUCCESS;
out:
- if (ret == DROPBEAR_FAILURE) {
- m_free(key->e);
- m_free(key->n);
- }
+ if (ret == DROPBEAR_FAILURE) {
+ m_free(key->e);
+ m_free(key->n);
+ }
return ret;
}
@@ -82,7 +82,7 @@ out:
* Loads a private rsa key from a buffer
* Returns DROPBEAR_SUCCESS or DROPBEAR_FAILURE */
int buf_get_rsa_priv_key(buffer* buf, dropbear_rsa_key *key) {
- int ret = DROPBEAR_FAILURE;
+ int ret = DROPBEAR_FAILURE;
TRACE(("enter buf_get_rsa_priv_key"))
dropbear_assert(key != NULL);
@@ -99,34 +99,34 @@ int buf_get_rsa_priv_key(buffer* buf, dropbear_rsa_key *key) {
m_mp_alloc_init_multi(&key->d, NULL);
if (buf_getmpint(buf, key->d) == DROPBEAR_FAILURE) {
TRACE(("leave buf_get_rsa_priv_key: d: ret == DROPBEAR_FAILURE"))
- goto out;
+ goto out;
}
if (buf->pos == buf->len) {
- /* old Dropbear private keys didn't keep p and q, so we will ignore them*/
+ /* old Dropbear private keys didn't keep p and q, so we will ignore them*/
} else {
m_mp_alloc_init_multi(&key->p, &key->q, NULL);
if (buf_getmpint(buf, key->p) == DROPBEAR_FAILURE) {
TRACE(("leave buf_get_rsa_priv_key: p: ret == DROPBEAR_FAILURE"))
- goto out;
+ goto out;
}
if (buf_getmpint(buf, key->q) == DROPBEAR_FAILURE) {
TRACE(("leave buf_get_rsa_priv_key: q: ret == DROPBEAR_FAILURE"))
- goto out;
+ goto out;
}
}
- ret = DROPBEAR_SUCCESS;
+ ret = DROPBEAR_SUCCESS;
out:
- if (ret == DROPBEAR_FAILURE) {
- m_free(key->d);
- m_free(key->p);
- m_free(key->q);
- }
+ if (ret == DROPBEAR_FAILURE) {
+ m_free(key->d);
+ m_free(key->p);
+ m_free(key->q);
+ }
TRACE(("leave buf_get_rsa_priv_key"))
- return ret;
+ return ret;
}
diff --git a/scp.c b/scp.c
index 8c94ec8..73262fa 100644
--- a/scp.c
+++ b/scp.c
@@ -440,9 +440,9 @@ main(int argc, char **argv)
*/
if (do_cmd_pid != -1 && errs == 0) {
if (remin != -1)
- (void) close(remin);
+ (void) close(remin);
if (remout != -1)
- (void) close(remout);
+ (void) close(remout);
if (waitpid(do_cmd_pid, &status, 0) == -1)
errs = 1;
else {
diff --git a/signkey.c b/signkey.c
index ac5d887..55f34e7 100644
--- a/signkey.c
+++ b/signkey.c
@@ -317,15 +317,15 @@ void buf_put_priv_key(buffer* buf, sign_key *key, enum signkey_type type) {
#ifdef DROPBEAR_DSS
if (type == DROPBEAR_SIGNKEY_DSS) {
buf_put_dss_priv_key(buf, key->dsskey);
- TRACE(("leave buf_put_priv_key: dss done"))
- return;
+ TRACE(("leave buf_put_priv_key: dss done"))
+ return;
}
#endif
#ifdef DROPBEAR_RSA
if (type == DROPBEAR_SIGNKEY_RSA) {
buf_put_rsa_priv_key(buf, key->rsakey);
- TRACE(("leave buf_put_priv_key: rsa done"))
- return;
+ TRACE(("leave buf_put_priv_key: rsa done"))
+ return;
}
#endif
#ifdef DROPBEAR_ECDSA
diff --git a/svr-main.c b/svr-main.c
index af56a7c..28fc9b0 100644
--- a/svr-main.c
+++ b/svr-main.c
@@ -398,7 +398,7 @@ static void commonsetup() {
* otherwise we might end up blatting error messages to the socket */
load_all_hostkeys();
- seedrandom();
+ seedrandom();
}
/* Set up listening sockets for all the requested ports */
diff --git a/svr-tcpfwd.c b/svr-tcpfwd.c
index 9d051bf..1abd0ac 100644
--- a/svr-tcpfwd.c
+++ b/svr-tcpfwd.c
@@ -194,7 +194,7 @@ static int svr_remotetcpreq() {
tcpinfo->request_listenaddr = request_addr;
if (!opts.listen_fwd_all || (strcmp(request_addr, "localhost") == 0) ) {
- /* NULL means "localhost only" */
+ /* NULL means "localhost only" */
tcpinfo->listenaddr = NULL;
}
else
diff --git a/svr-x11fwd.c b/svr-x11fwd.c
index 9e7df24..2af4141 100644
--- a/svr-x11fwd.c
+++ b/svr-x11fwd.c
@@ -42,11 +42,29 @@ static void x11accept(struct Listener* listener, int sock);
static int bindport(int fd);
static int send_msg_channel_open_x11(int fd, struct sockaddr_in* addr);
+/* Check untrusted xauth strings for metacharacters */
+/* Returns DROPBEAR_SUCCESS/DROPBEAR_FAILURE */
+static int
+xauth_valid_string(const char *s)
+{
+ size_t i;
+
+ for (i = 0; s[i] != '\0'; i++) {
+ if (!isalnum(s[i]) &&
+ s[i] != '.' && s[i] != ':' && s[i] != '/' &&
+ s[i] != '-' && s[i] != '_') {
+ return DROPBEAR_FAILURE;
+ }
+ }
+ return DROPBEAR_SUCCESS;
+}
+
+
/* called as a request for a session channel, sets up listening X11 */
/* returns DROPBEAR_SUCCESS or DROPBEAR_FAILURE */
int x11req(struct ChanSess * chansess) {
- int fd;
+ int fd = -1;
if (!svr_pubkey_allows_x11fwd()) {
return DROPBEAR_FAILURE;
@@ -62,6 +80,11 @@ int x11req(struct ChanSess * chansess) {
chansess->x11authcookie = buf_getstring(ses.payload, NULL);
chansess->x11screennum = buf_getint(ses.payload);
+ if (xauth_valid_string(chansess->x11authprot) == DROPBEAR_FAILURE ||
+ xauth_valid_string(chansess->x11authcookie) == DROPBEAR_FAILURE) {
+ dropbear_log(LOG_WARNING, "Bad xauth request");
+ goto fail;
+ }
/* create listening socket */
fd = socket(PF_INET, SOCK_STREAM, 0);
if (fd < 0) {
@@ -159,7 +182,7 @@ void x11setauth(struct ChanSess *chansess) {
return;
}
- /* popen is a nice function - code is strongly based on OpenSSH's */
+ /* code is strongly based on OpenSSH's */
authprog = popen(XAUTH_COMMAND, "w");
if (authprog) {
fprintf(authprog, "add %s %s %s\n",
diff --git a/sysoptions.h b/sysoptions.h
index a29cbbe..8ce4361 100644
--- a/sysoptions.h
+++ b/sysoptions.h
@@ -4,7 +4,7 @@
*******************************************************************/
#ifndef DROPBEAR_VERSION
-#define DROPBEAR_VERSION "2015.71"
+#define DROPBEAR_VERSION "2016.72"
#endif
#define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION
@@ -113,20 +113,25 @@
#define RSA_BLINDING
/* hashes which will be linked and registered */
-#if defined(DROPBEAR_SHA2_256_HMAC) || defined(DROPBEAR_ECC_256) || defined(DROPBEAR_CURVE25519)
+#if defined(DROPBEAR_SHA2_256_HMAC) || defined(DROPBEAR_ECC_256) || defined(DROPBEAR_CURVE25519) || DROPBEAR_DH_GROUP14
#define DROPBEAR_SHA256
#endif
#if defined(DROPBEAR_ECC_384)
#define DROPBEAR_SHA384
#endif
/* LTC SHA384 depends on SHA512 */
-#if defined(DROPBEAR_SHA2_512_HMAC) || defined(DROPBEAR_ECC_521) || defined(DROPBEAR_ECC_384)
+#if defined(DROPBEAR_SHA2_512_HMAC) || defined(DROPBEAR_ECC_521) || defined(DROPBEAR_ECC_384) || DROPBEAR_DH_GROUP16
#define DROPBEAR_SHA512
#endif
#if defined(DROPBEAR_MD5_HMAC)
#define DROPBEAR_MD5
#endif
+/* These are disabled in Dropbear 2016.73 by default since the spec
+ draft-ietf-curdle-ssh-kex-sha2-02 is under development. */
+#define DROPBEAR_DH_GROUP14_256 0
+#define DROPBEAR_DH_GROUP16 0
+
/* roughly 2x 521 bits */
#define MAX_ECC_SIZE 140
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-01 03:04:14 +0000