diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-05-01 14:04:15 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-05-01 14:04:15 +0000 |
commit | 9be00fc25630337689d664242af84d1d92835119 (patch) | |
tree | c4d631828b2f040f728a3f96316c48ea9d7c7f5b /package/libs/cyassl/patches | |
parent | e2cd04bfb39f333aeaafaa87668fd364c3e42946 (diff) | |
download | upstream-9be00fc25630337689d664242af84d1d92835119.tar.gz upstream-9be00fc25630337689d664242af84d1d92835119.tar.bz2 upstream-9be00fc25630337689d664242af84d1d92835119.zip |
cyassl: update to version 3.0.0
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 40621
Diffstat (limited to 'package/libs/cyassl/patches')
-rw-r--r-- | package/libs/cyassl/patches/100-respect_cflags.patch | 2 | ||||
-rw-r--r-- | package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch | 4 |
2 files changed, 3 insertions, 3 deletions
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 ) |