diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-22 17:12:15 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
commit | f133cfa4cc591626a4151027f2386f585661ef69 (patch) | |
tree | f1d132bad908168a74e6f4b12a2413f8250ef186 | |
parent | 9b4d8b0ea6b5862f279fab62e6ccee3bd51ddcc2 (diff) | |
download | openbmc-f133cfa4cc591626a4151027f2386f585661ef69.tar.xz |
openssl: move to DEPRECATED_CRYPTO_FLAGS
Upstream recipe moved the disabling of deprecated crypto algorithms into
a new DEPRECATED_CRYPTO_FLAGS variable.
(Klaus: also adjust phosphor's EXTRA_OECONF for this package to not
double-disable already obsolete ciphers)
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I75e2c35ada37c9510a0af347772cdeb2b23d99e9
Signed-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com>
-rw-r--r-- | meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend | 4 | ||||
-rw-r--r-- | meta-phosphor/recipes-connectivity/openssl/openssl_%.bbappend | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend b/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend index 6ffe5db6c..ebe35e4b2 100644 --- a/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend +++ b/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend @@ -1,4 +1,4 @@ # Rainier needs ibmtpm2tss which needs ibmswtpm2 which needs openssl # camellia support -EXTRA_OECONF_remove_witherspoon-tacoma = " no-camellia" -EXTRA_OECONF_remove_rainier = " no-camellia" +DEPRECATED_CRYPTO_FLAGS_remove_witherspoon-tacoma = " no-camellia" +DEPRECATED_CRYPTO_FLAGS_remove_rainier = " no-camellia" diff --git a/meta-phosphor/recipes-connectivity/openssl/openssl_%.bbappend b/meta-phosphor/recipes-connectivity/openssl/openssl_%.bbappend index 004d8dc71..0c5ed3b21 100644 --- a/meta-phosphor/recipes-connectivity/openssl/openssl_%.bbappend +++ b/meta-phosphor/recipes-connectivity/openssl/openssl_%.bbappend @@ -5,10 +5,8 @@ EXTRA_OECONF_append_class-target = " shared no-hw no-err no-psk no-srp " EXTRA_OECONF_append_class-target = " no-ssl2 no-ssl3 " # Disable various algorithms. -EXTRA_OECONF_append_class-target = " no-idea no-md2 no-mdc2 no-rc5 no-md4 \ - no-rmd160 no-whirlpool no-camellia \ - no-rc2 no-rc4 no-bf no-cast no-seed no-gost " - +EXTRA_OECONF_append_class-target = " no-md4 no-rmd160 no-whirlpool \ + no-rc2 no-rc4 no-bf no-cast no-gost " do_configure_append() { oe_runmake depend } |