Revert "package/uacme: don't allow mbedtls with ualpn"

This reverts commit ed28a698e390adb4455089e6d22f10a00009ec80
which I applied locally fo testing, but forgot to reset before
continuing to work on other patches...

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>

diff --git a/package/uacme/Config.in b/package/uacme/Config.in
index ba60d787f05e88a5ccb314645eb1080aee054436..58b7c534e73d147d89b1cc82f8a7141247c8ed62 100644 (file)
--- a/package/uacme/Config.in
+++ b/package/uacme/Config.in
@@ -16,30 +16,6 @@ config BR2_PACKAGE_UACME
 
 if BR2_PACKAGE_UACME
 
-choice
-       prompt "Crypto Backend"
-       help
-         Select crypto library to be used in uacme.
-
-config BR2_PACKAGE_UACME_GNUTLS
-       bool "gnutls"
-       depends on BR2_PACKAGE_GNUTLS
-
-config BR2_PACKAGE_UACME_MBEDTLS
-       bool "mbedtls"
-       depends on BR2_PACKAGE_MBEDTLS
-       depends on !BR2_PACKAGE_UACME_UALPN
-
-comment "mbedtls crypto backend unavailable with ualpn"
-       depends on BR2_PACKAGE_MBEDTLS
-       depends on BR2_PACKAGE_UACME_UALPN
-
-config BR2_PACKAGE_UACME_OPENSSL
-       bool "openssl"
-       depends on BR2_PACKAGE_OPENSSL
-
-endchoice
-
 config BR2_PACKAGE_UACME_UALPN
        bool "enable ualpn"
        depends on BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk
index 0fb00d6c908ea88014114743972231b5e0327436..7e544fce7901fd074d53902938d2e4790495b42a 100644 (file)
--- a/package/uacme/uacme.mk
+++ b/package/uacme/uacme.mk
@@ -15,13 +15,13 @@ UACME_DEPENDENCIES = libcurl
 
 UACME_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
 
-ifeq ($(BR2_PACKAGE_UACME_GNUTLS),y)
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
 UACME_CONF_OPTS += --with-gnutls
 UACME_DEPENDENCIES += gnutls
-else ifeq ($(BR2_PACKAGE_UACME_MBEDTLS),y)
+else ifeq ($(BR2_PACKAGE_MBEDTLS),y)
 UACME_CONF_OPTS += --with-mbedtls
 UACME_DEPENDENCIES += mbedtls
-else ifeq ($(BR2_PACKAGE_UACME_OPENSSL),y)
+else ifeq ($(BR2_PACKAGE_OPENSSL),y)
 UACME_CONF_OPTS += --with-openssl
 UACME_DEPENDENCIES += openssl
 endif