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

CBC mode cleanup (#95)

Browse Source 
* Fix CBC mode can't be fully disabled

* Fix CBC mode can't be the only mode
This commit is contained in:
Vladislav Grishenko 2020-05-25 20:55:13 +05:00 committed by GitHub
parent d3d0d60076
commit 61267f8503
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common-algo.c
View File

@ -184,12 +184,18 @@ algo_type sshciphers[] = {
#if DROPBEAR_TWOFISH128 #if DROPBEAR_TWOFISH128
{"twofish128-cbc", 0, &dropbear_twofish128, 1, &dropbear_mode_cbc}, {"twofish128-cbc", 0, &dropbear_twofish128, 1, &dropbear_mode_cbc},
#endif #endif
#endif /* DROPBEAR_ENABLE_CBC_MODE */
#if DROPBEAR_3DES #if DROPBEAR_3DES
#if DROPBEAR_ENABLE_CTR_MODE
{"3des-ctr", 0, &dropbear_3des, 1, &dropbear_mode_ctr}, {"3des-ctr", 0, &dropbear_3des, 1, &dropbear_mode_ctr},
#endif #endif
#if DROPBEAR_3DES #if DROPBEAR_ENABLE_CBC_MODE
{"3des-cbc", 0, &dropbear_3des, 1, &dropbear_mode_cbc}, {"3des-cbc", 0, &dropbear_3des, 1, &dropbear_mode_cbc},
#endif #endif
#endif /* DROPBEAR_3DES */
#if DROPBEAR_ENABLE_CBC_MODE
#if DROPBEAR_BLOWFISH #if DROPBEAR_BLOWFISH
{"blowfish-cbc", 0, &dropbear_blowfish, 1, &dropbear_mode_cbc}, {"blowfish-cbc", 0, &dropbear_blowfish, 1, &dropbear_mode_cbc},
#endif #endif

2
libtomcrypt/src/headers/tomcrypt_dropbear.h
View File

@ -27,7 +27,7 @@
#define LTC_DES #define LTC_DES
#endif #endif
#if DROPBEAR_ENABLE_CTR_MODE #if DROPBEAR_ENABLE_CBC_MODE
#define LTC_CBC_MODE #define LTC_CBC_MODE
#endif #endif

2
session.h
View File

@ -79,7 +79,9 @@ struct key_context_directional {
#endif #endif
/* actual keys */ /* actual keys */
union { union {
#if DROPBEAR_ENABLE_CBC_MODE
symmetric_CBC cbc; symmetric_CBC cbc;
#endif
#if DROPBEAR_ENABLE_CTR_MODE #if DROPBEAR_ENABLE_CTR_MODE
symmetric_CTR ctr; symmetric_CTR ctr;
#endif #endif