aboutsummaryrefslogtreecommitdiffstats
path: root/package/libs/cyassl
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-05-01 14:04:15 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-05-01 14:04:15 +0000
commite857ee07a4e04dc6a7bb69136ea03f7b018edfb3 (patch)
tree76c7a79cd6f5693d7c0d479d077fc46197104407 /package/libs/cyassl
parent507fef5ebcead18bf0ec06d9e4c8f20c3061e06a (diff)
downloadmaster-187ad058-e857ee07a4e04dc6a7bb69136ea03f7b018edfb3.tar.gz
master-187ad058-e857ee07a4e04dc6a7bb69136ea03f7b018edfb3.tar.bz2
master-187ad058-e857ee07a4e04dc6a7bb69136ea03f7b018edfb3.zip
cyassl: update to version 3.0.0
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40621 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libs/cyassl')
-rw-r--r--package/libs/cyassl/Makefile6
-rw-r--r--package/libs/cyassl/patches/100-respect_cflags.patch2
-rw-r--r--package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch4
3 files changed, 6 insertions, 6 deletions
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 )