From d03c23c8d4d022288106979e7ce2839c9ec9c7fb Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Thu, 24 Aug 2017 08:56:40 +0300 Subject: cyassl,curl,libustream-ssl: rename every `cyassl` to `wolfssl` 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 --- package/libs/cyassl/Config.in | 48 ------- package/libs/cyassl/Makefile | 140 --------------------- .../patches/400-additional_compatibility.patch | 12 -- package/libs/ustream-ssl/Makefile | 14 +-- package/libs/wolfssl/Config.in | 48 +++++++ package/libs/wolfssl/Makefile | 140 +++++++++++++++++++++ .../patches/400-additional_compatibility.patch | 12 ++ package/network/utils/curl/Config.in | 4 +- package/network/utils/curl/Makefile | 6 +- 9 files changed, 212 insertions(+), 212 deletions(-) delete mode 100644 package/libs/cyassl/Config.in delete mode 100644 package/libs/cyassl/Makefile delete mode 100644 package/libs/cyassl/patches/400-additional_compatibility.patch create mode 100644 package/libs/wolfssl/Config.in create mode 100644 package/libs/wolfssl/Makefile create mode 100644 package/libs/wolfssl/patches/400-additional_compatibility.patch diff --git a/package/libs/cyassl/Config.in b/package/libs/cyassl/Config.in deleted file mode 100644 index 371bb564f8..0000000000 --- a/package/libs/cyassl/Config.in +++ /dev/null @@ -1,48 +0,0 @@ -if PACKAGE_libcyassl - -config CYASSL_HAS_AES_CCM - bool "Include AES-CCM support" - default n - -config CYASSL_HAS_AES_GCM - bool "Include AES-GCM support" - default n - -config CYASSL_HAS_CHACHA - bool "Include ChaCha cipher suite support" - default n - -config CYASSL_HAS_ECC - bool "Include ECC (Elliptic Curve Cryptography) support" - default y - -config CYASSL_HAS_DH - bool "Include DH (Diffie-Hellman) support" - default n - -config CYASSL_HAS_ARC4 - bool "Include ARC4 support" - default n - -config CYASSL_HAS_DES3 - bool "Include DES3 (Tripple-DES) support" - default n - -config CYASSL_HAS_PSK - bool "Include PKS (Pre Share Key) support" - default n - -config CYASSL_HAS_DTLS - bool "Include DTLS support" - default n - -config CYASSL_HAS_ECC25519 - bool "Include ECC Curve 22519 support" - depends on CYASSL_HAS_ECC - default n - -config CYASSL_HAS_POLY_1305 - bool "Include Poly-1305 support" - default n - -endif diff --git a/package/libs/cyassl/Makefile b/package/libs/cyassl/Makefile deleted file mode 100644 index 44268f07d3..0000000000 --- a/package/libs/cyassl/Makefile +++ /dev/null @@ -1,140 +0,0 @@ -# -# Copyright (C) 2006-2016 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=wolfssl -PKG_VERSION:=3.10.0 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip -PKG_SOURCE_URL:=https://www.wolfssl.com/ -PKG_HASH:=66f7f2a8b8ee37d6b4beab3cb0dcb6a6980fd4674373bfd3bf1214b9d0d2c02e - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 -PKG_USE_MIPS16:=0 -PKG_BUILD_PARALLEL:=1 -PKG_LICENSE:=GPL-2.0+ - -include $(INCLUDE_DIR)/package.mk - -define Package/libcyassl - SECTION:=libs - SUBMENU:=SSL - CATEGORY:=Libraries - TITLE:=CyaSSL 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. -endef - -define Package/libcyassl/config - source "$(SOURCE)/Config.in" -endef - -TARGET_CFLAGS += $(FPIC) - -# --enable-stunnel needed for OpenSSL API compatibility bits -CONFIGURE_ARGS += \ - --enable-opensslextra \ - --enable-sni \ - --enable-stunnel \ - --disable-examples - -ifeq ($(CONFIG_IPV6),y) -CONFIGURE_ARGS += \ - --enable-ipv6 -endif - -ifeq ($(CONFIG_CYASSL_HAS_AES_CCM),y) -CONFIGURE_ARGS += \ - --enable-aesccm -endif - -ifeq ($(CONFIG_CYASSL_HAS_AES_GCM),y) -CONFIGURE_ARGS += \ - --enable-aesgcm -endif - -ifeq ($(CONFIG_CYASSL_HAS_CHACHA),y) -CONFIGURE_ARGS += \ - --enable-chacha -endif - -ifeq ($(CONFIG_CYASSL_HAS_ECC),y) -CONFIGURE_ARGS += \ - --enable-ecc \ - --enable-supportedcurves -endif - -ifeq ($(CONFIG_CYASSL_HAS_DH),y) -CONFIGURE_ARGS += \ - --enable-dh -endif - -ifeq ($(CONFIG_CYASSL_HAS_ARC4),n) -CONFIGURE_ARGS += \ - --disable-arc4 -endif - -ifeq ($(CONFIG_CYASSL_HAS_DES3),y) -CONFIGURE_ARGS += \ - --disable-des3 -endif - -ifeq ($(CONFIG_CYASSL_HAS_PSK),y) -CONFIGURE_ARGS += \ - --enable-psk -endif - -ifeq ($(CONFIG_CYASSL_HAS_DTLS),y) -CONFIGURE_ARGS += \ - --enable-dtls -endif - -ifeq ($(CONFIG_CYASSL_HAS_ECC25519),y) -CONFIGURE_ARGS += \ - --enable-ecc25519 -endif - -ifeq ($(CONFIG_CYASSL_HAS_POLY1305),y) -CONFIGURE_ARGS += \ - --enable-poly1305 -endif - -#ifneq ($(CONFIG_TARGET_x86),) -# CONFIGURE_ARGS += --enable-intelasm -#endif -#ifneq ($(CONFIG_TARGET_x86_64),) -# CONFIGURE_ARGS += --enable-intelasm -#endif - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ - - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwolfssl.{so*,la} $(1)/usr/lib/ - ln -s libwolfssl.so $(1)/usr/lib/libcyassl.so - ln -s libwolfssl.la $(1)/usr/lib/libcyassl.la - - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig -endef - -define Package/libcyassl/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)) diff --git a/package/libs/cyassl/patches/400-additional_compatibility.patch b/package/libs/cyassl/patches/400-additional_compatibility.patch deleted file mode 100644 index 1464e9d2a8..0000000000 --- a/package/libs/cyassl/patches/400-additional_compatibility.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/cyassl/openssl/ssl.h -+++ b/cyassl/openssl/ssl.h -@@ -28,6 +28,9 @@ - #define CYASSL_OPENSSL_H_ - - #include -+#ifndef HAVE_SNI -+#undef CYASSL_SNI_HOST_NAME -+#endif - #include - - #endif diff --git a/package/libs/ustream-ssl/Makefile b/package/libs/ustream-ssl/Makefile index ff6c4b7d01..7afbeeba66 100644 --- a/package/libs/ustream-ssl/Makefile +++ b/package/libs/ustream-ssl/Makefile @@ -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)) diff --git a/package/libs/wolfssl/Config.in b/package/libs/wolfssl/Config.in new file mode 100644 index 0000000000..7e8a4b6cee --- /dev/null +++ b/package/libs/wolfssl/Config.in @@ -0,0 +1,48 @@ +if PACKAGE_libwolfssl + +config WOLFSSL_HAS_AES_CCM + bool "Include AES-CCM support" + default n + +config WOLFSSL_HAS_AES_GCM + bool "Include AES-GCM support" + default n + +config WOLFSSL_HAS_CHACHA + bool "Include ChaCha cipher suite support" + default n + +config WOLFSSL_HAS_ECC + bool "Include ECC (Elliptic Curve Cryptography) support" + default y + +config WOLFSSL_HAS_DH + bool "Include DH (Diffie-Hellman) support" + default n + +config WOLFSSL_HAS_ARC4 + bool "Include ARC4 support" + default n + +config WOLFSSL_HAS_DES3 + bool "Include DES3 (Tripple-DES) support" + default n + +config WOLFSSL_HAS_PSK + bool "Include PKS (Pre Share Key) support" + default n + +config WOLFSSL_HAS_DTLS + bool "Include DTLS support" + default n + +config WOLFSSL_HAS_ECC25519 + bool "Include ECC Curve 22519 support" + depends on WOLFSSL_HAS_ECC + default n + +config WOLFSSL_HAS_POLY_1305 + bool "Include Poly-1305 support" + default n + +endif diff --git a/package/libs/wolfssl/Makefile b/package/libs/wolfssl/Makefile new file mode 100644 index 0000000000..e8498162ef --- /dev/null +++ b/package/libs/wolfssl/Makefile @@ -0,0 +1,140 @@ +# +# Copyright (C) 2006-2016 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=wolfssl +PKG_VERSION:=3.10.0 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip +PKG_SOURCE_URL:=https://www.wolfssl.com/ +PKG_HASH:=66f7f2a8b8ee37d6b4beab3cb0dcb6a6980fd4674373bfd3bf1214b9d0d2c02e + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_USE_MIPS16:=0 +PKG_BUILD_PARALLEL:=1 +PKG_LICENSE:=GPL-2.0+ + +include $(INCLUDE_DIR)/package.mk + +define Package/libwolfssl + SECTION:=libs + SUBMENU:=SSL + CATEGORY:=Libraries + TITLE:=wolfSSL library + URL:=http://www.wolfssl.com/ + MENU:=1 + PROVIDES:=libcyassl +endef + +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/libwolfssl/config + source "$(SOURCE)/Config.in" +endef + +TARGET_CFLAGS += $(FPIC) + +# --enable-stunnel needed for OpenSSL API compatibility bits +CONFIGURE_ARGS += \ + --enable-opensslextra \ + --enable-sni \ + --enable-stunnel \ + --disable-examples + +ifeq ($(CONFIG_IPV6),y) +CONFIGURE_ARGS += \ + --enable-ipv6 +endif + +ifeq ($(CONFIG_WOLFSSL_HAS_AES_CCM),y) +CONFIGURE_ARGS += \ + --enable-aesccm +endif + +ifeq ($(CONFIG_WOLFSSL_HAS_AES_GCM),y) +CONFIGURE_ARGS += \ + --enable-aesgcm +endif + +ifeq ($(CONFIG_WOLFSSL_HAS_CHACHA),y) +CONFIGURE_ARGS += \ + --enable-chacha +endif + +ifeq ($(CONFIG_WOLFSSL_HAS_ECC),y) +CONFIGURE_ARGS += \ + --enable-ecc \ + --enable-supportedcurves +endif + +ifeq ($(CONFIG_WOLFSSL_HAS_DH),y) +CONFIGURE_ARGS += \ + --enable-dh +endif + +ifeq ($(CONFIG_WOLFSSL_HAS_ARC4),n) +CONFIGURE_ARGS += \ + --disable-arc4 +endif + +ifeq ($(CONFIG_WOLFSSL_HAS_DES3),y) +CONFIGURE_ARGS += \ + --disable-des3 +endif + +ifeq ($(CONFIG_WOLFSSL_HAS_PSK),y) +CONFIGURE_ARGS += \ + --enable-psk +endif + +ifeq ($(CONFIG_WOLFSSL_HAS_DTLS),y) +CONFIGURE_ARGS += \ + --enable-dtls +endif + +ifeq ($(CONFIG_WOLFSSL_HAS_ECC25519),y) +CONFIGURE_ARGS += \ + --enable-ecc25519 +endif + +ifeq ($(CONFIG_WOLFSSL_HAS_POLY1305),y) +CONFIGURE_ARGS += \ + --enable-poly1305 +endif + +#ifneq ($(CONFIG_TARGET_x86),) +# CONFIGURE_ARGS += --enable-intelasm +#endif +#ifneq ($(CONFIG_TARGET_x86_64),) +# CONFIGURE_ARGS += --enable-intelasm +#endif + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwolfssl.{so*,la} $(1)/usr/lib/ + ln -s libwolfssl.so $(1)/usr/lib/libcyassl.so + ln -s libwolfssl.la $(1)/usr/lib/libcyassl.la + + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig +endef + +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,libwolfssl)) diff --git a/package/libs/wolfssl/patches/400-additional_compatibility.patch b/package/libs/wolfssl/patches/400-additional_compatibility.patch new file mode 100644 index 0000000000..1464e9d2a8 --- /dev/null +++ b/package/libs/wolfssl/patches/400-additional_compatibility.patch @@ -0,0 +1,12 @@ +--- a/cyassl/openssl/ssl.h ++++ b/cyassl/openssl/ssl.h +@@ -28,6 +28,9 @@ + #define CYASSL_OPENSSL_H_ + + #include ++#ifndef HAVE_SNI ++#undef CYASSL_SNI_HOST_NAME ++#endif + #include + + #endif diff --git a/package/network/utils/curl/Config.in b/package/network/utils/curl/Config.in index 6fa10b6781..6f72134731 100644 --- a/package/network/utils/curl/Config.in +++ b/package/network/utils/curl/Config.in @@ -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" diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index 5d510a4d39..9a59a66a8e 100644 --- a/package/network/utils/curl/Makefile +++ b/package/network/utils/curl/Makefile @@ -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) \ -- cgit v1.2.3