KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cyassl,curl,libustream-ssl: rename every cyassl to wolfssl

Browse source 
This is to eliminate any ambiguity about the cyassl/wolfssl lib.

The rename happened some time ago (~3+ years).
As time goes by, people will start to forget cyassl and
start to get confused about the wolfSSL vs cyassl thing.

It's a good idea to keep up with the times (moving forward).

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
Alexandru Ardelean 2017-08-24 08:56:40 +03:00 committed by Hauke Mehrtens
parent 560b7334ec
commit d03c23c8d4
6 changed files with 44 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
package/libs/ustream-ssl/Makefile
View file

@ -35,11 +35,11 @@ define Package/libustream-openssl
VARIANT:=openssl
endef
define Package/libustream-cyassl
define Package/libustream-wolfssl
$(Package/libustream/default)
TITLE += (cyassl)
DEPENDS += +PACKAGE_libustream-cyassl:libcyassl
VARIANT:=cyassl
TITLE += (wolfssl)
DEPENDS += +PACKAGE_libustream-wolfssl:libwolfssl
VARIANT:=wolfssl
endef
define Package/libustream-mbedtls
@ -50,7 +50,7 @@ define Package/libustream-mbedtls
DEFAULT_VARIANT:=1
endef
ifeq ($(BUILD_VARIANT),cyassl)
ifeq ($(BUILD_VARIANT),wolfssl)
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/cyassl -DHAVE_SNI
CMAKE_OPTIONS += -DCYASSL=on
endif
@ -64,9 +64,9 @@ define Package/libustream/default/install
endef
Package/libustream-openssl/install = $(Package/libustream/default/install)
Package/libustream-cyassl/install = $(Package/libustream/default/install)
Package/libustream-wolfssl/install = $(Package/libustream/default/install)
Package/libustream-mbedtls/install = $(Package/libustream/default/install)
$(eval $(call BuildPackage,libustream-mbedtls))
$(eval $(call BuildPackage,libustream-cyassl))
$(eval $(call BuildPackage,libustream-wolfssl))
$(eval $(call BuildPackage,libustream-openssl))

26
package/libs/cyassl/Config.in → package/libs/wolfssl/Config.in
View file

@ -1,47 +1,47 @@
if PACKAGE_libcyassl
if PACKAGE_libwolfssl
config CYASSL_HAS_AES_CCM
config WOLFSSL_HAS_AES_CCM
bool "Include AES-CCM support"
default n
config CYASSL_HAS_AES_GCM
config WOLFSSL_HAS_AES_GCM
bool "Include AES-GCM support"
default n
config CYASSL_HAS_CHACHA
config WOLFSSL_HAS_CHACHA
bool "Include ChaCha cipher suite support"
default n
config CYASSL_HAS_ECC
config WOLFSSL_HAS_ECC
bool "Include ECC (Elliptic Curve Cryptography) support"
default y
config CYASSL_HAS_DH
config WOLFSSL_HAS_DH
bool "Include DH (Diffie-Hellman) support"
default n
config CYASSL_HAS_ARC4
config WOLFSSL_HAS_ARC4
bool "Include ARC4 support"
default n
config CYASSL_HAS_DES3
config WOLFSSL_HAS_DES3
bool "Include DES3 (Tripple-DES) support"
default n
config CYASSL_HAS_PSK
config WOLFSSL_HAS_PSK
bool "Include PKS (Pre Share Key) support"
default n
config CYASSL_HAS_DTLS
config WOLFSSL_HAS_DTLS
bool "Include DTLS support"
default n
config CYASSL_HAS_ECC25519
config WOLFSSL_HAS_ECC25519
bool "Include ECC Curve 22519 support"
depends on CYASSL_HAS_ECC
depends on WOLFSSL_HAS_ECC
default n
config CYASSL_HAS_POLY_1305
config WOLFSSL_HAS_POLY_1305
bool "Include Poly-1305 support"
default n

38
package/libs/cyassl/Makefile → package/libs/wolfssl/Makefile
View file

@ -23,22 +23,22 @@ PKG_LICENSE:=GPL-2.0+
include $(INCLUDE_DIR)/package.mk
define Package/libcyassl
define Package/libwolfssl
SECTION:=libs
SUBMENU:=SSL
CATEGORY:=Libraries
TITLE:=CyaSSL library
TITLE:=wolfSSL library
URL:=http://www.wolfssl.com/
MENU:=1
PROVIDES:=libcyassl
endef
define Package/libcyassl/description
CyaSSL is an SSL library optimized for small footprint, both on disk and for
memory use.
define Package/libwolfssl/description
wolfSSL (formerly CyaSSL) is an SSL library optimized for small
footprint, both on disk and for memory use.
endef
define Package/libcyassl/config
define Package/libwolfssl/config
source "$(SOURCE)/Config.in"
endef
@ -56,58 +56,58 @@ CONFIGURE_ARGS += \
--enable-ipv6
endif
ifeq ($(CONFIG_CYASSL_HAS_AES_CCM),y)
ifeq ($(CONFIG_WOLFSSL_HAS_AES_CCM),y)
CONFIGURE_ARGS += \
--enable-aesccm
endif
ifeq ($(CONFIG_CYASSL_HAS_AES_GCM),y)
ifeq ($(CONFIG_WOLFSSL_HAS_AES_GCM),y)
CONFIGURE_ARGS += \
--enable-aesgcm
endif
ifeq ($(CONFIG_CYASSL_HAS_CHACHA),y)
ifeq ($(CONFIG_WOLFSSL_HAS_CHACHA),y)
CONFIGURE_ARGS += \
--enable-chacha
endif
ifeq ($(CONFIG_CYASSL_HAS_ECC),y)
ifeq ($(CONFIG_WOLFSSL_HAS_ECC),y)
CONFIGURE_ARGS += \
--enable-ecc \
--enable-supportedcurves
endif
ifeq ($(CONFIG_CYASSL_HAS_DH),y)
ifeq ($(CONFIG_WOLFSSL_HAS_DH),y)
CONFIGURE_ARGS += \
--enable-dh
endif
ifeq ($(CONFIG_CYASSL_HAS_ARC4),n)
ifeq ($(CONFIG_WOLFSSL_HAS_ARC4),n)
CONFIGURE_ARGS += \
--disable-arc4
endif
ifeq ($(CONFIG_CYASSL_HAS_DES3),y)
ifeq ($(CONFIG_WOLFSSL_HAS_DES3),y)
CONFIGURE_ARGS += \
--disable-des3
endif
ifeq ($(CONFIG_CYASSL_HAS_PSK),y)
ifeq ($(CONFIG_WOLFSSL_HAS_PSK),y)
CONFIGURE_ARGS += \
--enable-psk
endif
ifeq ($(CONFIG_CYASSL_HAS_DTLS),y)
ifeq ($(CONFIG_WOLFSSL_HAS_DTLS),y)
CONFIGURE_ARGS += \
--enable-dtls
endif
ifeq ($(CONFIG_CYASSL_HAS_ECC25519),y)
ifeq ($(CONFIG_WOLFSSL_HAS_ECC25519),y)
CONFIGURE_ARGS += \
--enable-ecc25519
endif
ifeq ($(CONFIG_CYASSL_HAS_POLY1305),y)
ifeq ($(CONFIG_WOLFSSL_HAS_POLY1305),y)
CONFIGURE_ARGS += \
--enable-poly1305
endif
@ -131,10 +131,10 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig
endef
define Package/libcyassl/install
define Package/libwolfssl/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwolfssl.so* $(1)/usr/lib/
ln -s libwolfssl.so $(1)/usr/lib/libcyassl.so
endef
$(eval $(call BuildPackage,libcyassl))
$(eval $(call BuildPackage,libwolfssl))

0
package/libs/cyassl/patches/400-additional_compatibility.patch → package/libs/wolfssl/patches/400-additional_compatibility.patch
View file

4
package/network/utils/curl/Config.in
View file

@ -9,8 +9,8 @@ choice
config LIBCURL_MBEDTLS
bool "mbed TLS"
config LIBCURL_CYASSL
bool "CyaSSL"
config LIBCURL_WOLFSSL
bool "wolfSSL"
config LIBCURL_OPENSSL
bool "OpenSSL"

6
package/network/utils/curl/Makefile
View file

@ -27,7 +27,7 @@ PKG_BUILD_PARALLEL:=1
PKG_CONFIG_DEPENDS:= \
CONFIG_IPV6 \
\
CONFIG_LIBCURL_CYASSL \
CONFIG_LIBCURL_WOLFSSL \
CONFIG_LIBCURL_GNUTLS \
CONFIG_LIBCURL_OPENSSL \
CONFIG_LIBCURL_MBEDTLS \
@ -84,7 +84,7 @@ define Package/libcurl
$(call Package/curl/Default)
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:= +LIBCURL_CYASSL:libcyassl +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_MBEDTLS:libmbedtls
DEPENDS:= +LIBCURL_WOLFSSL:libwolfssl +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_MBEDTLS:libmbedtls
DEPENDS += +LIBCURL_ZLIB:zlib +LIBCURL_THREADED_RESOLVER:libpthread +LIBCURL_LDAP:libopenldap +LIBCURL_LIBIDN:libidn +LIBCURL_SSH2:libssh2
TITLE:=A client-side URL transfer library
MENU:=1
@ -111,7 +111,7 @@ CONFIGURE_ARGS += \
\
$(call autoconf_bool,CONFIG_IPV6,ipv6) \
\
$(if $(CONFIG_LIBCURL_CYASSL),--with-cyassl="$(STAGING_DIR)/usr" --without-ca-path --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt,--without-cyassl) \
$(if $(CONFIG_LIBCURL_WOLFSSL),--with-cyassl="$(STAGING_DIR)/usr" --without-ca-path --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt,--without-cyassl) \
$(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr" --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-gnutls) \
$(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr" --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-ssl) \
$(if $(CONFIG_LIBCURL_MBEDTLS),--with-mbedtls="$(STAGING_DIR)/usr" --without-ca-path --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt,--without-mbedtls) \