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

cyassl: version bump to 3.4.6

Browse source 
This patch introduces a new build error into coova-chilli, but
coova-chilli already fails to build even without it anyway. CyaSSL is
now called wolfSSL, and all the API's have been renamed, and
backward-compatibility headers added.

Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 46167
This commit is contained in:
Hauke Mehrtens 2015-07-03 23:20:01 +00:00
parent b5b630ae38
commit 9177e16098
4 changed files with 37 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
package/libs/cyassl/Makefile
View file

@ -7,13 +7,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=cyassl PKG_NAME:=wolfssl
PKG_VERSION:=3.3.0 PKG_VERSION:=3.4.6
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
PKG_SOURCE_URL:=http://www.yassl.com/ PKG_SOURCE_URL:=http://www.yassl.com/
PKG_MD5SUM:=0303eb0f2f9065a1207d9104ab0eba7c PKG_MD5SUM:=0410b3841588d635e9ecacb2d42c38f5
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1
@ -45,17 +45,27 @@ CONFIGURE_ARGS += \
--enable-ecc \ --enable-ecc \
--disable-examples --disable-examples
ifneq ($(CONFIG_TARGET_x86),)
CONFIGURE_ARGS += --enable-intelasm
endif
ifneq ($(CONFIG_TARGET_x86_64),)
CONFIGURE_ARGS += --enable-intelasm
endif
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcyassl.{so*,la} $(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
endef endef
define Package/libcyassl/install define Package/libcyassl/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcyassl.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwolfssl.so* $(1)/usr/lib/
ln -s libwolfssl.so $(1)/usr/lib/libcyassl.so
endef endef
$(eval $(call BuildPackage,libcyassl)) $(eval $(call BuildPackage,libcyassl))

2
package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch
View file

@ -1,6 +1,6 @@
--- a/src/internal.c --- a/src/internal.c
+++ b/src/internal.c +++ b/src/internal.c
@@ -6037,6 +6037,10 @@ int ProcessReply(CYASSL* ssl) @@ -6353,6 +6353,10 @@ int ProcessReply(CYASSL* ssl)
b1 = b1 =
ssl->buffers.inputBuffer.buffer[ssl->buffers.inputBuffer.idx++]; ssl->buffers.inputBuffer.buffer[ssl->buffers.inputBuffer.idx++];
ssl->curSize = (word16)(((b0 & 0x7f) << 8) | b1); ssl->curSize = (word16)(((b0 & 0x7f) << 8) | b1);

10
package/libs/cyassl/patches/300-SSL_set_tlsext_host_name.patch
View file

@ -1,10 +1,10 @@
--- a/cyassl/openssl/ssl.h --- a/wolfssl/openssl/ssl.h
+++ b/cyassl/openssl/ssl.h +++ b/wolfssl/openssl/ssl.h
@@ -372,6 +373,7 @@ @@ -398,6 +398,7 @@
#define SSL_CTX_get_ex_new_index CyaSSL_CTX_get_ex_new_index #define SSL_get_default_timeout(ctx) 500
+#define SSL_set_tlsext_host_name(x, y) CyaSSL_UseSNI(x, CYASSL_SNI_HOST_NAME, y, strlen(y)) +#define SSL_set_tlsext_host_name(x, y) wolfSSL_UseSNI(x, WOLFSSL_SNI_HOST_NAME, y, strlen(y))
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */

15
package/libs/cyassl/patches/400-additional_compatibility.patch Normal file
View file

@ -0,0 +1,15 @@
--- a/cyassl/openssl/ssl.h 2015-02-25 13:04:52.000000000 -0800
+++ b/cyassl/openssl/ssl.h 2015-05-20 11:13:44.476628943 -0700
@@ -25,3 +25,12 @@
*/
+#ifndef CYASSL_OPENSSL_H_
+#define CYASSL_OPENSSL_H_
+
+#include <cyassl/ssl.h>
+#ifndef HAVE_SNI
+#undef CYASSL_SNI_HOST_NAME
+#endif
#include <wolfssl/openssl/ssl.h>
+
+#endif