From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu, 1 May 2014 14:04:15 +0000 (+0000)
Subject: cyassl: update to version 3.0.0
X-Git-Tag: reboot~7339
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9be00fc25630337689d664242af84d1d92835119;p=oweals%2Fopenwrt.git

cyassl: update to version 3.0.0

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 40621
---

diff --git a/package/libs/cyassl/Makefile b/package/libs/cyassl/Makefile
index 3b8f88b750..682790c23d 100644
--- a/package/libs/cyassl/Makefile
+++ b/package/libs/cyassl/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cyassl
-PKG_VERSION:=2.8.0
-PKG_RELEASE:=2
+PKG_VERSION:=3.0.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
 PKG_SOURCE_URL:=http://www.yassl.com/
-PKG_MD5SUM:=7465d4815af90eff01095fa1b031ce09
+PKG_MD5SUM:=d29a841796180890bae47b159bb76d38
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
diff --git a/package/libs/cyassl/patches/100-respect_cflags.patch b/package/libs/cyassl/patches/100-respect_cflags.patch
index db6c3ab723..0e03230dcf 100644
--- a/package/libs/cyassl/patches/100-respect_cflags.patch
+++ b/package/libs/cyassl/patches/100-respect_cflags.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -42,7 +42,7 @@ AC_SUBST([CYASSL_LIBRARY_VERSION])
+@@ -47,7 +47,7 @@ AC_SUBST([CYASSL_LIBRARY_VERSION])
  
  # capture user C_EXTRA_FLAGS from ./configure line, CFLAGS may hold -g -O2 even
  # if user doesn't override, no way to tell
diff --git a/package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch b/package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch
index d28f4d38a1..f9a077020e 100644
--- a/package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch
+++ b/package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch
@@ -1,9 +1,9 @@
 --- a/src/internal.c
 +++ b/src/internal.c
-@@ -4622,6 +4622,10 @@ int ProcessReply(CYASSL* ssl)
+@@ -5063,6 +5063,10 @@ int ProcessReply(CYASSL* ssl)
                  b1 =
                  ssl->buffers.inputBuffer.buffer[ssl->buffers.inputBuffer.idx++];
-                 ssl->curSize = ((b0 & 0x7f) << 8) | b1;
+                 ssl->curSize = (word16)(((b0 & 0x7f) << 8) | b1);
 +
 +                /* does not appear to a be a SSLv2 client hello */
 +                if ( ssl->buffers.inputBuffer.buffer[ssl->buffers.inputBuffer.idx] != 1 )