Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
include $(TOPDIR)/rules.mk
PKG_NAME:=mbedtls
include $(TOPDIR)/rules.mk
PKG_NAME:=mbedtls
PKG_RELEASE:=1
PKG_USE_MIPS16:=0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz
PKG_SOURCE_URL:=https://tls.mbed.org/download/
PKG_RELEASE:=1
PKG_USE_MIPS16:=0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz
PKG_SOURCE_URL:=https://tls.mbed.org/download/
-PKG_HASH:=baa1121952786f5b2c66c52226a8ca0e05126de920d1756266551df677915b7e
+PKG_HASH:=7ab76eaefab0b02f26ca889230d553facb2598f3a8f077886c41ec1801d2131a
PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=GPL-2.0+
PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=GPL-2.0+
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
*
* Enable Output Feedback mode (OFB) for symmetric ciphers.
*/
*
* Enable Output Feedback mode (OFB) for symmetric ciphers.
*/
/**
* \def MBEDTLS_CIPHER_NULL_CIPHER
/**
* \def MBEDTLS_CIPHER_NULL_CIPHER
*
* Comment macros to disable the curve and functions for it
*/
*
* Comment macros to disable the curve and functions for it
*/
/**
* \def MBEDTLS_ECP_NIST_OPTIM
/**
* \def MBEDTLS_ECP_NIST_OPTIM
*
* Comment this macro to disable deterministic ECDSA.
*/
*
* Comment this macro to disable deterministic ECDSA.
*/
/**
* \def MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
/**
* \def MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
* See dhm.h for more details.
*
*/
* See dhm.h for more details.
*
*/
/**
* \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
/**
* \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
* MBEDTLS_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
* MBEDTLS_TLS_ECDHE_PSK_WITH_RC4_128_SHA
*/
* MBEDTLS_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
* MBEDTLS_TLS_ECDHE_PSK_WITH_RC4_128_SHA
*/
/**
* \def MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
/**
* \def MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
* MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
*/
* MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
*/
/**
* \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
/**
* \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
*/
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
*/
/**
* \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
/**
* \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
*/
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
*/
/**
* \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
/**
* \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
* This option is only useful if both MBEDTLS_SHA256_C and
* MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used.
*/
* This option is only useful if both MBEDTLS_SHA256_C and
* MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used.
*/
/**
* \def MBEDTLS_ENTROPY_NV_SEED
/**
* \def MBEDTLS_ENTROPY_NV_SEED
* Uncomment this macro to disable the use of CRT in RSA.
*
*/
* Uncomment this macro to disable the use of CRT in RSA.
*
*/
/**
* \def MBEDTLS_SHA256_SMALLER
/**
* \def MBEDTLS_SHA256_SMALLER
*
* Uncomment to enable the smaller implementation of SHA256.
*/
*
* Uncomment to enable the smaller implementation of SHA256.
*/
/**
* \def MBEDTLS_SSL_ALL_ALERT_MESSAGES
/**
* \def MBEDTLS_SSL_ALL_ALERT_MESSAGES
* configuration of this extension).
*
*/
* configuration of this extension).
*
*/
/**
* \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
/**
* \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
*
* Comment this macro to disable support for SSL session tickets
*/
*
* Comment this macro to disable support for SSL session tickets
*/
/**
* \def MBEDTLS_SSL_EXPORT_KEYS
/**
* \def MBEDTLS_SSL_EXPORT_KEYS
*
* Comment this macro to disable support for truncated HMAC in SSL
*/
*
* Comment this macro to disable support for truncated HMAC in SSL
*/
/**
* \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT
/**
* \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT
*
* Comment this to disable run-time checking and save ROM space
*/
*
* Comment this to disable run-time checking and save ROM space
*/
/**
* \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
/**
* \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
*/
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
*/
/**
* \def MBEDTLS_ARIA_C
/**
* \def MBEDTLS_ARIA_C
* This module enables the AES-CCM ciphersuites, if other requisites are
* enabled as well.
*/
* This module enables the AES-CCM ciphersuites, if other requisites are
* enabled as well.
*/
/**
* \def MBEDTLS_CERTS_C
/**
* \def MBEDTLS_CERTS_C
*
* This module is used for testing (ssl_client/server).
*/
*
* This module is used for testing (ssl_client/server).
*/
/**
* \def MBEDTLS_CHACHA20_C
/**
* \def MBEDTLS_CHACHA20_C
*
* Module: library/chacha20.c
*/
*
* Module: library/chacha20.c
*/
/**
* \def MBEDTLS_CHACHAPOLY_C
/**
* \def MBEDTLS_CHACHAPOLY_C
*
* This module requires: MBEDTLS_CHACHA20_C, MBEDTLS_POLY1305_C
*/
*
* This module requires: MBEDTLS_CHACHA20_C, MBEDTLS_POLY1305_C
*/
/**
* \def MBEDTLS_CIPHER_C
/**
* \def MBEDTLS_CIPHER_C
*
* This module provides debugging functions.
*/
*
* This module provides debugging functions.
*/
* \warning DES is considered a weak cipher and its use constitutes a
* security risk. We recommend considering stronger ciphers instead.
*/
* \warning DES is considered a weak cipher and its use constitutes a
* security risk. We recommend considering stronger ciphers instead.
*/
* This module adds support for the Hashed Message Authentication Code
* (HMAC)-based key derivation function (HKDF).
*/
* This module adds support for the Hashed Message Authentication Code
* (HMAC)-based key derivation function (HKDF).
*/
/**
* \def MBEDTLS_HMAC_DRBG_C
/**
* \def MBEDTLS_HMAC_DRBG_C
*
* Uncomment to enable the HMAC_DRBG random number geerator.
*/
*
* Uncomment to enable the HMAC_DRBG random number geerator.
*/
/**
* \def MBEDTLS_NIST_KW_C
/**
* \def MBEDTLS_NIST_KW_C
*
* This module enables abstraction of common (libc) functions.
*/
*
* This module enables abstraction of common (libc) functions.
*/
/**
* \def MBEDTLS_POLY1305_C
/**
* \def MBEDTLS_POLY1305_C
* Module: library/poly1305.c
* Caller: library/chachapoly.c
*/
* Module: library/poly1305.c
* Caller: library/chachapoly.c
*/
/**
* \def MBEDTLS_RIPEMD160_C
/**
* \def MBEDTLS_RIPEMD160_C
* Caller: library/md.c
*
*/
* Caller: library/md.c
*
*/
*
* Requires: MBEDTLS_CIPHER_C
*/
*
* Requires: MBEDTLS_CIPHER_C
*/
/**
* \def MBEDTLS_SSL_CLI_C
/**
* \def MBEDTLS_SSL_CLI_C
*
* This module provides run-time version information.
*/
*
* This module provides run-time version information.
*/
/**
* \def MBEDTLS_X509_USE_C
/**
* \def MBEDTLS_X509_USE_C
* Module: library/xtea.c
* Caller:
*/
* Module: library/xtea.c
* Caller:
*/
--- a/include/mbedtls/bn_mul.h
+++ b/include/mbedtls/bn_mul.h
--- a/include/mbedtls/bn_mul.h
+++ b/include/mbedtls/bn_mul.h
"r6", "r7", "r8", "r9", "cc" \
);
"r6", "r7", "r8", "r9", "cc" \
);
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
-@@ -159,7 +159,7 @@ endif(USE_STATIC_MBEDTLS_LIBRARY)
+@@ -165,7 +165,7 @@ endif(USE_STATIC_MBEDTLS_LIBRARY)
if(USE_SHARED_MBEDTLS_LIBRARY)
add_library(mbedcrypto SHARED ${src_crypto})
if(USE_SHARED_MBEDTLS_LIBRARY)
add_library(mbedcrypto SHARED ${src_crypto})
-- set_target_properties(mbedcrypto PROPERTIES VERSION 2.14.1 SOVERSION 3)
+- set_target_properties(mbedcrypto PROPERTIES VERSION 2.16.1 SOVERSION 3)
+ set_target_properties(mbedcrypto PROPERTIES VERSION 2.12.0 SOVERSION 1)
target_link_libraries(mbedcrypto ${libs})
add_library(mbedx509 SHARED ${src_x509})
+ set_target_properties(mbedcrypto PROPERTIES VERSION 2.12.0 SOVERSION 1)
target_link_libraries(mbedcrypto ${libs})
add_library(mbedx509 SHARED ${src_x509})
-@@ -167,7 +167,7 @@ if(USE_SHARED_MBEDTLS_LIBRARY)
+@@ -173,7 +173,7 @@ if(USE_SHARED_MBEDTLS_LIBRARY)
target_link_libraries(mbedx509 ${libs} mbedcrypto)
add_library(mbedtls SHARED ${src_tls})
target_link_libraries(mbedx509 ${libs} mbedcrypto)
add_library(mbedtls SHARED ${src_tls})
-- set_target_properties(mbedtls PROPERTIES VERSION 2.14.1 SOVERSION 12)
+- set_target_properties(mbedtls PROPERTIES VERSION 2.16.1 SOVERSION 12)
+ set_target_properties(mbedtls PROPERTIES VERSION 2.12.0 SOVERSION 10)
target_link_libraries(mbedtls ${libs} mbedx509)
+ set_target_properties(mbedtls PROPERTIES VERSION 2.12.0 SOVERSION 10)
target_link_libraries(mbedtls ${libs} mbedx509)