aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/utils
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-02-01 22:37:41 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2016-02-01 22:37:41 +0000
commit3a2e25bc77bf0b714f95b9570503ca12a5c13b43 (patch)
tree8cb69dd773285929980012f88b4b8df5c83bed1a /package/network/utils
parent969ec949a8ec1b19009b0915582b359de2ec1d2a (diff)
downloadupstream-3a2e25bc77bf0b714f95b9570503ca12a5c13b43.tar.gz
upstream-3a2e25bc77bf0b714f95b9570503ca12a5c13b43.tar.bz2
upstream-3a2e25bc77bf0b714f95b9570503ca12a5c13b43.zip
curl: add support for mbedtls
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 48615
Diffstat (limited to 'package/network/utils')
-rw-r--r--package/network/utils/curl/Config.in3
-rw-r--r--package/network/utils/curl/Makefile4
-rw-r--r--package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch11
3 files changed, 17 insertions, 1 deletions
diff --git a/package/network/utils/curl/Config.in b/package/network/utils/curl/Config.in
index 11cfa39e95..f41307a970 100644
--- a/package/network/utils/curl/Config.in
+++ b/package/network/utils/curl/Config.in
@@ -9,6 +9,9 @@ choice
config LIBCURL_POLARSSL
bool "PolarSSL"
+ config LIBCURL_MBEDTLS
+ bool "mbed TLS"
+
config LIBCURL_CYASSL
bool "CyaSSL"
diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile
index 56dcb6b60d..bc85da3a0a 100644
--- a/package/network/utils/curl/Makefile
+++ b/package/network/utils/curl/Makefile
@@ -34,6 +34,7 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_LIBCURL_GNUTLS \
CONFIG_LIBCURL_OPENSSL \
CONFIG_LIBCURL_POLARSSL \
+ CONFIG_LIBCURL_MBEDTLS \
CONFIG_LIBCURL_NOSSL \
\
CONFIG_LIBCURL_LIBIDN \
@@ -86,7 +87,7 @@ define Package/libcurl
$(call Package/curl/Default)
SECTION:=libs
CATEGORY:=Libraries
- DEPENDS:=+LIBCURL_POLARSSL:libpolarssl +LIBCURL_CYASSL:libcyassl +LIBCURL_AXTLS:libaxtls +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls
+ DEPENDS:=+LIBCURL_POLARSSL:libpolarssl +LIBCURL_CYASSL:libcyassl +LIBCURL_AXTLS:libaxtls +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_MBEDTLS:libmbedtls
DEPENDS += +LIBCURL_ZLIB:zlib +LIBCURL_THREADED_RESOLVER:libpthread +LIBCURL_LDAP:libopenldap +LIBCURL_LIBIDN:libidn +LIBCURL_SSH2:libssh2
TITLE:=A client-side URL transfer library
MENU:=1
@@ -117,6 +118,7 @@ CONFIGURE_ARGS += \
$(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr" --with-ca-path=/etc/ssl/certs,--without-gnutls) \
$(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr" --with-ca-path=/etc/ssl/certs,--without-ssl) \
$(if $(CONFIG_LIBCURL_POLARSSL),--with-polarssl="$(STAGING_DIR)/usr" --with-ca-path=/etc/ssl/certs,--without-polarssl) \
+ $(if $(CONFIG_LIBCURL_MBEDTLS),--with-mbedtls="$(STAGING_DIR)/usr" --without-ca-path,--without-mbedtls) \
\
$(if $(CONFIG_LIBCURL_LIBIDN),--with-libidn="$(STAGING_DIR)/usr",--without-libidn) \
$(if $(CONFIG_LIBCURL_SSH2),--with-libssh2="$(STAGING_DIR)/usr",--without-libssh2) \
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
index 1b5b63aa69..6f9cf2e998 100644
--- 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
@@ -9,3 +9,14 @@
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
+@@ -686,7 +686,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);
+ }