diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-07-03 23:20:01 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-07-03 23:20:01 +0000 |
| commit | 9177e160987af4939b65b865adc1be916e28b997 (patch) | |
| tree | df5fbf7ad66437273f28e2eded244c4eb9f845b6 /package/libs/cyassl/patches | |
| parent | b5b630ae3884ce8f4b416cb06a91ebc002ce83ed (diff) | |
| download | upstream-9177e160987af4939b65b865adc1be916e28b997.tar.gz upstream-9177e160987af4939b65b865adc1be916e28b997.tar.bz2 upstream-9177e160987af4939b65b865adc1be916e28b997.zip | |
cyassl: version bump to 3.4.6
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
Diffstat (limited to 'package/libs/cyassl/patches')
3 files changed, 21 insertions, 6 deletions
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 5463cb0cf9..4e2c540bd8 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,6 +1,6 @@ --- a/src/internal.c +++ b/src/internal.c -@@ -6037,6 +6037,10 @@ int ProcessReply(CYASSL* ssl) +@@ -6353,6 +6353,10 @@ int ProcessReply(CYASSL* ssl) b1 = ssl->buffers.inputBuffer.buffer[ssl->buffers.inputBuffer.idx++]; ssl->curSize = (word16)(((b0 & 0x7f) << 8) | b1); diff --git a/package/libs/cyassl/patches/300-SSL_set_tlsext_host_name.patch b/package/libs/cyassl/patches/300-SSL_set_tlsext_host_name.patch index d81e416180..5bccb05133 100644 --- a/package/libs/cyassl/patches/300-SSL_set_tlsext_host_name.patch +++ b/package/libs/cyassl/patches/300-SSL_set_tlsext_host_name.patch @@ -1,10 +1,10 @@ ---- a/cyassl/openssl/ssl.h -+++ b/cyassl/openssl/ssl.h -@@ -372,6 +373,7 @@ - #define SSL_CTX_get_ex_new_index CyaSSL_CTX_get_ex_new_index +--- a/wolfssl/openssl/ssl.h ++++ b/wolfssl/openssl/ssl.h +@@ -398,6 +398,7 @@ + #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 } /* extern "C" */ diff --git a/package/libs/cyassl/patches/400-additional_compatibility.patch b/package/libs/cyassl/patches/400-additional_compatibility.patch new file mode 100644 index 0000000000..360fb148cf --- /dev/null +++ b/package/libs/cyassl/patches/400-additional_compatibility.patch @@ -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 |