From 192e047fda587b7b8c52140f13ba0fc9f323ed14 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 15 Aug 2022 18:01:24 +0200 Subject: [PATCH] package/uacme: fix crypto backend preference order In 96c3b52132b4 (package/uacme: don't allow ualpn with mbedTLS), the preference order moved openssl before mbedtls, because ualpn was not compatible with mbedtls. That caused the preference order in the .mk to diverge semantically from the preference order in the Config.in. Indeed, openssl is only selected when neither gnutls nor mbedtls are enabled, so openssl is clearly leastpreferred crypto backend. But when both openssl and mbedtls were enabled, then uacme would use opensslC because of ualpn. The ualpn limitation was lifted in 6c7b46945e65 (package/uacme: allow ualpn with mbedTLS), but the preference order in the .mk was not restored to match that of the Config.in. Restore the order in the .mk so that openssl is again treated as the least-preferred crypto backend. Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: - split off to its own patch - write the full commit log ] Signed-off-by: Yann E. MORIN --- package/uacme/uacme.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk index 2be96d534e..84e0105762 100644 --- a/package/uacme/uacme.mk +++ b/package/uacme/uacme.mk @@ -18,12 +18,12 @@ UACME_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' ifeq ($(BR2_PACKAGE_GNUTLS),y) UACME_CONF_OPTS += --with-gnutls UACME_DEPENDENCIES += gnutls -else ifeq ($(BR2_PACKAGE_OPENSSL),y) -UACME_CONF_OPTS += --with-openssl -UACME_DEPENDENCIES += openssl else ifeq ($(BR2_PACKAGE_MBEDTLS),y) UACME_CONF_OPTS += --with-mbedtls UACME_DEPENDENCIES += mbedtls +else ifeq ($(BR2_PACKAGE_OPENSSL),y) +UACME_CONF_OPTS += --with-openssl +UACME_DEPENDENCIES += openssl endif ifeq ($(BR2_PACKAGE_UACME_UALPN),y)