update to mbedtls-2.7.0, from Björn Ketelaars. various security fixes, see

https://github.com/ARMmbed/mbedtls/blob/development/ChangeLog
This commit is contained in:
sthen 2018-02-06 10:26:31 +00:00
parent aa3b005a63
commit 010ca2d7d5
5 changed files with 17 additions and 18 deletions

View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.18 2017/10/21 00:47:52 jca Exp $
# $OpenBSD: Makefile,v 1.19 2018/02/06 10:26:31 sthen Exp $
COMMENT= SSL library with an intuitive API and readable source code
DISTNAME= mbedtls-2.6.0
DISTNAME= mbedtls-2.7.0
EXTRACT_SUFX= -gpl.tgz
# check SOVERSION
SHARED_LIBS += mbedtls 3.0 # 2.6
SHARED_LIBS += mbedcrypto 1.0 # 2.6
SHARED_LIBS += mbedx509 1.0 # 2.6
SHARED_LIBS += mbedtls 3.1 # 2.7
SHARED_LIBS += mbedcrypto 2.0 # 2.7
SHARED_LIBS += mbedx509 1.0 # 2.7
CATEGORIES= security

View File

@ -1,2 +1,2 @@
SHA256 (mbedtls-2.6.0-gpl.tgz) = qZlZ1zYN7yL5EI0tSHyd44T+dsNJaXF2sfIjcAgNWBA=
SIZE (mbedtls-2.6.0-gpl.tgz) = 1958070
SHA256 (mbedtls-2.7.0-gpl.tgz) = LG/iibS1C/Z7SDnoGwf89SoZ9RKdAkHSqk1Jyx7xHk8=
SIZE (mbedtls-2.7.0-gpl.tgz) = 2092971

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-include_mbedtls_config_h,v 1.2 2017/10/21 00:47:52 jca Exp $
$OpenBSD: patch-include_mbedtls_config_h,v 1.3 2018/02/06 10:26:31 sthen Exp $
MBEDTLS_THREADING_PTHREAD and MBEDTLS_THREADING_C are required by
www/hiawatha.
@ -6,7 +6,7 @@ www/hiawatha.
Index: include/mbedtls/config.h
--- include/mbedtls/config.h.orig
+++ include/mbedtls/config.h
@@ -1385,7 +1385,7 @@
@@ -1433,7 +1433,7 @@
*
* Uncomment this to enable pthread mutexes.
*/
@ -15,7 +15,7 @@ Index: include/mbedtls/config.h
/**
* \def MBEDTLS_VERSION_FEATURES
@@ -2423,7 +2423,7 @@
@@ -2510,7 +2510,7 @@
*
* Enable this layer to allow use of mutexes within mbed TLS
*/

View File

@ -1,15 +1,14 @@
$OpenBSD: patch-tests_suites_main_test_function,v 1.1 2017/10/21 00:47:52 jca Exp $
$OpenBSD: patch-tests_suites_main_test_function,v 1.2 2018/02/06 10:26:31 sthen Exp $
XXX can't take the address of stdout
Index: tests/suites/main_test.function
--- tests/suites/main_test.function.orig
+++ tests/suites/main_test.function
@@ -401,32 +401,7 @@ int main(int argc, const char *argv[])
if( unmet_dep_count == 0 )
@@ -418,30 +418,7 @@ int main(int argc, const char *argv[])
{
test_errors = 0;
-
test_info.failed = 0;
-#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
- /* Suppress all output from the library unless we're verbose
- * mode
@ -34,7 +33,6 @@ Index: tests/suites/main_test.function
- exit( 1 );
- }
-#endif /* __unix__ || __APPLE__ __MACH__ */
-
}
if( unmet_dep_count > 0 || ret == DISPATCH_UNSUPPORTED_SUITE )

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2017/10/21 00:47:52 jca Exp $
@comment $OpenBSD: PLIST,v 1.11 2018/02/06 10:26:31 sthen Exp $
@conflict polarssl-*
include/mbedtls/
include/mbedtls/aes.h
@ -54,6 +54,7 @@ include/mbedtls/platform.h
include/mbedtls/platform_time.h
include/mbedtls/ripemd160.h
include/mbedtls/rsa.h
include/mbedtls/rsa_internal.h
include/mbedtls/sha1.h
include/mbedtls/sha256.h
include/mbedtls/sha512.h