diff options
-rw-r--r-- | meta-phosphor/recipes-core/dropbear/dropbear/options.patch | 26 | ||||
-rw-r--r-- | meta-phosphor/recipes-core/dropbear/dropbear_2017.75.bbappend | 4 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta-phosphor/recipes-core/dropbear/dropbear/options.patch b/meta-phosphor/recipes-core/dropbear/dropbear/options.patch new file mode 100644 index 000000000..0582ca4e4 --- /dev/null +++ b/meta-phosphor/recipes-core/dropbear/dropbear/options.patch @@ -0,0 +1,26 @@ +diff --git a/options.h b/options.h +index 0c51bb1..2c38f42 100644 +--- a/options.h ++++ b/options.h +@@ -95,12 +95,9 @@ much traffic. */ + #define DROPBEAR_AES256 + /* Compiling in Blowfish will add ~6kB to runtime heap memory usage */ + /*#define DROPBEAR_BLOWFISH*/ +-#define DROPBEAR_TWOFISH256 +-#define DROPBEAR_TWOFISH128 + + /* Enable CBC mode for ciphers. This has security issues though + * is the most compatible with older SSH implementations */ +-#define DROPBEAR_ENABLE_CBC_MODE + + /* Enable "Counter Mode" for ciphers. This is more secure than normal + * CBC mode against certain attacks. It is recommended for security +@@ -130,8 +127,6 @@ If you test it please contact the Dropbear author */ + * These hashes are also used for public key fingerprints in logs. + * If you disable MD5, Dropbear will fall back to SHA1 fingerprints, + * which are not the standard form. */ +-#define DROPBEAR_SHA1_HMAC +-#define DROPBEAR_SHA1_96_HMAC + #define DROPBEAR_SHA2_256_HMAC + #define DROPBEAR_SHA2_512_HMAC + #define DROPBEAR_MD5_HMAC diff --git a/meta-phosphor/recipes-core/dropbear/dropbear_2017.75.bbappend b/meta-phosphor/recipes-core/dropbear/dropbear_2017.75.bbappend new file mode 100644 index 000000000..0bcdf6f93 --- /dev/null +++ b/meta-phosphor/recipes-core/dropbear/dropbear_2017.75.bbappend @@ -0,0 +1,4 @@ +# TODO: Dropbear 2018.76 controls options in a different way. See +# https://github.com/openbmc/openbmc/issues/3186 +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += "file://options.patch" |