aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/utils/curl/patches
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2016-12-29 18:53:03 -0800
committerJo-Philipp Wich <jo@mein.io>2017-01-03 14:26:41 +0100
commit558680012dd79de0289aeeb74a72163916cd9f33 (patch)
treeb92411697b1a8c3c948a77127c33b57e0cf846b4 /package/network/utils/curl/patches
parentcd18ff9ed6e14019455b9f48fa663ee829f311a7 (diff)
downloadupstream-558680012dd79de0289aeeb74a72163916cd9f33.tar.gz
upstream-558680012dd79de0289aeeb74a72163916cd9f33.tar.bz2
upstream-558680012dd79de0289aeeb74a72163916cd9f33.zip
curl: Remove PolarSSL and adjust default to mbedTLS
luci-ssl has already made the switch since mainline support for PolarSSL is almost over (2016). Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'package/network/utils/curl/patches')
-rw-r--r--package/network/utils/curl/patches/310-mbedtls-disable-runtime-version-check.patch11
-rw-r--r--package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch22
2 files changed, 11 insertions, 22 deletions
diff --git a/package/network/utils/curl/patches/310-mbedtls-disable-runtime-version-check.patch b/package/network/utils/curl/patches/310-mbedtls-disable-runtime-version-check.patch
new file mode 100644
index 0000000000..22b838daa0
--- /dev/null
+++ b/package/network/utils/curl/patches/310-mbedtls-disable-runtime-version-check.patch
@@ -0,0 +1,11 @@
+--- a/lib/vtls/mbedtls.c
++++ b/lib/vtls/mbedtls.c
+@@ -724,7 +724,7 @@ void Curl_mbedtls_session_free(void *ptr
+
+ size_t Curl_mbedtls_version(char *buffer, size_t size)
+ {
+- unsigned int version = mbedtls_version_get_number();
++ unsigned int version = MBEDTLS_VERSION_NUMBER;
+ return snprintf(buffer, size, "mbedTLS/%d.%d.%d", version>>24,
+ (version>>16)&0xff, (version>>8)&0xff);
+ }
diff --git a/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch b/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch
deleted file mode 100644
index 95064b12a7..0000000000
--- a/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/lib/vtls/polarssl.c
-+++ b/lib/vtls/polarssl.c
-@@ -657,7 +657,7 @@ void Curl_polarssl_session_free(void *pt
-
- size_t Curl_polarssl_version(char *buffer, size_t size)
- {
-- unsigned int version = version_get_number();
-+ unsigned int version = POLARSSL_VERSION_NUMBER;
- return snprintf(buffer, size, "%s/%d.%d.%d",
- version >= 0x01030A00?"mbedTLS":"PolarSSL",
- version>>24, (version>>16)&0xff, (version>>8)&0xff);
---- a/lib/vtls/mbedtls.c
-+++ b/lib/vtls/mbedtls.c
-@@ -724,7 +724,7 @@ void Curl_mbedtls_session_free(void *ptr
-
- size_t Curl_mbedtls_version(char *buffer, size_t size)
- {
-- unsigned int version = mbedtls_version_get_number();
-+ unsigned int version = MBEDTLS_VERSION_NUMBER;
- return snprintf(buffer, size, "mbedTLS/%d.%d.%d", version>>24,
- (version>>16)&0xff, (version>>8)&0xff);
- }