cyassl: update to wolfSSL version 3.7.0
This version and version 3.6.8 are fixing the following security problems: * CVE-2015-7744 * CVE-2015-6925 The activation of SSLv3 support is needed for curl. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47791v19.07.3_mercusys_ac12_duma
parent
e27c8bb156
commit
52df3181c1
@ -1,11 +0,0 @@
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -47,7 +47,7 @@ AC_SUBST([WOLFSSL_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
|
||||
-USER_C_EXTRA_FLAGS="$C_EXTRA_FLAGS"
|
||||
+USER_C_EXTRA_FLAGS="$CFLAGS"
|
||||
|
||||
LT_PREREQ([2.2])
|
||||
LT_INIT([disable-static],[win32-dll])
|
@ -1,10 +1,19 @@
|
||||
--- a/wolfssl/openssl/ssl.h
|
||||
+++ b/wolfssl/openssl/ssl.h
|
||||
@@ -397,6 +397,7 @@ typedef WOLFSSL_X509_STORE_CTX X509_STOR
|
||||
@@ -401,6 +401,8 @@ typedef WOLFSSL_X509_STORE_CTX X509_STOR
|
||||
/* yassl had set the default to be 500 */
|
||||
#define SSL_get_default_timeout(ctx) 500
|
||||
|
||||
+#define SSL_set_tlsext_host_name(x, y) wolfSSL_UseSNI(x, WOLFSSL_SNI_HOST_NAME, y, strlen(y))
|
||||
+
|
||||
/* Lighthttp compatability */
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
#ifdef HAVE_LIGHTY
|
||||
@@ -483,7 +485,6 @@ typedef WOLFSSL_ASN1_BIT_STRING ASN1_
|
||||
#define SSL_TLSEXT_ERR_NOACK alert_warning
|
||||
#define TLSEXT_NAMETYPE_host_name WOLFSSL_SNI_HOST_NAME
|
||||
|
||||
-#define SSL_set_tlsext_host_name wolfSSL_set_tlsext_host_name
|
||||
#define SSL_get_servername wolfSSL_get_servername
|
||||
#define SSL_set_SSL_CTX wolfSSL_set_SSL_CTX
|
||||
#define SSL_CTX_get_verify_callback wolfSSL_CTX_get_verify_callback
|
||||
|
@ -1,16 +1,12 @@
|
||||
--- a/cyassl/openssl/ssl.h
|
||||
+++ b/cyassl/openssl/ssl.h
|
||||
@@ -24,4 +24,13 @@
|
||||
*
|
||||
*/
|
||||
@@ -27,6 +27,9 @@
|
||||
#define CYASSL_OPENSSL_H_
|
||||
|
||||
+#ifndef CYASSL_OPENSSL_H_
|
||||
+#define CYASSL_OPENSSL_H_
|
||||
+
|
||||
+#include <cyassl/ssl.h>
|
||||
#include <cyassl/ssl.h>
|
||||
+#ifndef HAVE_SNI
|
||||
+#undef CYASSL_SNI_HOST_NAME
|
||||
+#endif
|
||||
#include <wolfssl/openssl/ssl.h>
|
||||
+
|
||||
+#endif
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue