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

Fix "-c none" so that it allows aes during authentication

Browse Source 
Default for options.h shouldn't allow "none"
This commit is contained in:
Matt Johnston 2013-03-20 23:52:49 +08:00
parent 2259ce4cdf
commit 845ad0be39
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common-runopts.c
View File

@ -75,6 +75,12 @@ parse_ciphers_macs()
dropbear_exit("."); dropbear_exit(".");
} }
if (strcmp(opts.cipher_list, "none") == 0)
{
/* Encryption is required during authentication */
opts.cipher_list = "none,aes128-ctr";
}
if (check_user_algos(opts.cipher_list, sshciphers, "cipher") == 0) if (check_user_algos(opts.cipher_list, sshciphers, "cipher") == 0)
{ {
dropbear_exit("No valid ciphers specified for '-c'"); dropbear_exit("No valid ciphers specified for '-c'");

8
options.h
View File

@ -104,7 +104,7 @@ much traffic. */
* this could be safe security-wise, though make sure you know what * this could be safe security-wise, though make sure you know what
* you're doing. Anyone can see everything that goes over the wire, so * you're doing. Anyone can see everything that goes over the wire, so
* the only safe auth method is public key. */ * the only safe auth method is public key. */
#define DROPBEAR_NONE_CIPHER /* #define DROPBEAR_NONE_CIPHER */
/* Message Integrity - at least one required. /* Message Integrity - at least one required.
* Protocol RFC requires sha1 and recommends sha1-96. * Protocol RFC requires sha1 and recommends sha1-96.
@ -126,10 +126,8 @@ much traffic. */
/* You can also disable integrity. Don't bother disabling this if you're /* You can also disable integrity. Don't bother disabling this if you're
* still using a cipher, it's relatively cheap. If you disable this it's dead * still using a cipher, it's relatively cheap. If you disable this it's dead
* simple to run arbitrary commands on the remote host. Beware. * simple to run arbitrary commands on the remote host. Beware. */
* Note again, for the client you will have to disable other hashes above /* #define DROPBEAR_NONE_INTEGRITY */
* to use this. */
#define DROPBEAR_NONE_INTEGRITY
/* 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.