NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit ed28a698e3
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>
This commit is contained in:
Yann E. MORIN 2020-04-26 13:47:04 +02:00
parent 7dcb9e98b5
commit d8e057bbfa
2 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
package/uacme/Config.in
View File

@ -16,30 +16,6 @@ config BR2_PACKAGE_UACME
if 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 config BR2_PACKAGE_UACME_UALPN
bool "enable ualpn" bool "enable ualpn"
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS

6
package/uacme/uacme.mk
View File

@ -15,13 +15,13 @@ UACME_DEPENDENCIES = libcurl
UACME_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' 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_CONF_OPTS += --with-gnutls
UACME_DEPENDENCIES += gnutls UACME_DEPENDENCIES += gnutls
else ifeq ($(BR2_PACKAGE_UACME_MBEDTLS),y) else ifeq ($(BR2_PACKAGE_MBEDTLS),y)
UACME_CONF_OPTS += --with-mbedtls UACME_CONF_OPTS += --with-mbedtls
UACME_DEPENDENCIES += mbedtls UACME_DEPENDENCIES += mbedtls
else ifeq ($(BR2_PACKAGE_UACME_OPENSSL),y) else ifeq ($(BR2_PACKAGE_OPENSSL),y)
UACME_CONF_OPTS += --with-openssl UACME_CONF_OPTS += --with-openssl
UACME_DEPENDENCIES += openssl UACME_DEPENDENCIES += openssl
endif endif