[gentoo-commits] repo/gentoo:master commit in: net-libs/mbedtls/files/

2020-05-25 Thread Anthony G. Basile 
commit: 2e5894dc106fd4c18cba46bbf2e17744391eec99
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sun May 24 11:31:51 2020 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon May 25 21:22:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e5894dc

net-libs/mbedtls: remove unused patches

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: Anthony G. Basile  gentoo.org>

 net-libs/mbedtls/files/mbedtls-2.19.1-zlib.patch   | 29 -
 .../files/mbedtls-dont-overwrite-headers.patch | 48 -
 .../mbedtls-un-pebcak-705038-wrong-file.patch  | 50 --
 3 files changed, 127 deletions(-)

diff --git a/net-libs/mbedtls/files/mbedtls-2.19.1-zlib.patch 
b/net-libs/mbedtls/files/mbedtls-2.19.1-zlib.patch
deleted file mode 100644
index ba4559cfc9b..000
--- a/net-libs/mbedtls/files/mbedtls-2.19.1-zlib.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9f25b8deff8e5b8fad8493db421b4639f14d2e5d Mon Sep 17 00:00:00 2001
-From: jiblime <47689567+jibl...@users.noreply.github.com>
-Date: Wed, 18 Dec 2019 21:40:01 -0800
-Subject: [PATCH] Fixes definition error when the deprecated
- MBEDTLS_ZLIB_SUPPORT and ENABLE_ZLIB_SUPPORT macro are defined/enabled for
- zlib support in mbedtls
-
-100% tests passed, 0 tests failed out of 85
-
-https://github.com/ARMmbed/mbedtls/blob/mbedtls-2.19.1/library/ssl_tls.c#L1842
-
-https://github.com/ARMmbed/mbedtls/blob/mbedtls-2.19.1/library/ssl_tls.c#L1862

- library/ssl_tls.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/library/ssl_tls.c b/library/ssl_tls.c
-index 6cf7781f2a..51ae9da3c6 100644
 a/library/ssl_tls.c
-+++ b/library/ssl_tls.c
-@@ -1880,7 +1880,7 @@ int mbedtls_ssl_derive_keys( mbedtls_ssl_context *ssl )
- 
- /* Allocate compression buffer */
- #if defined(MBEDTLS_ZLIB_SUPPORT)
--if( session->compression == MBEDTLS_SSL_COMPRESS_DEFLATE &&
-+if( ssl->session_negotiate->compression == MBEDTLS_SSL_COMPRESS_DEFLATE &&
- ssl->compress_buf == NULL )
- {
- MBEDTLS_SSL_DEBUG_MSG( 3, ( "Allocating compression buffer" ) );

diff --git a/net-libs/mbedtls/files/mbedtls-dont-overwrite-headers.patch 
b/net-libs/mbedtls/files/mbedtls-dont-overwrite-headers.patch
deleted file mode 100644
index 4e39308ac5a..000
--- a/net-libs/mbedtls/files/mbedtls-dont-overwrite-headers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From de35f31091b7e6cb20ebc8d8c0afc3b20bc57098 Mon Sep 17 00:00:00 2001
-From: Mihai Moldovan 
-Date: Thu, 16 Jan 2020 08:59:39 +0100
-Subject: [PATCH] Avoid overwriting tls headers in submodule mode
-
-When crypto is embedded as a submodule and the cmake build system is
-used, it would previously overwrite some header files installed by tls.
-Most of them are harmless (since they should be identical), but config.h
-is a special case.
-
-tls's and crypto's config.h files differ widely in scope and overwriting
-the more general, bigger config.h file from tls with crypto's smaller
-one will make a lot of features unavailable in programs using tls.
-
-Let's just avoid overwriting any tls header in submodule mode.
-
-Note that this will not fix the potential issue that crypto might be
-using a different configuration than tls in the submodule case.
-
-Fixes ARMmbed/mbedtls#2965

- include/CMakeLists.txt | 13 +
- 1 file changed, 13 insertions(+)
-
-diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
-index 02f924df4..92229a221 100644
 a/include/CMakeLists.txt
-+++ b/include/CMakeLists.txt
-@@ -5,6 +5,19 @@ if(INSTALL_MBEDTLS_HEADERS)
- file(GLOB headers "mbedtls/*.h")
- file(GLOB psa_headers "psa/*.h")
- 
-+if(USE_CRYPTO_SUBMODULE)
-+# Don't overwrite mbedtls's header files!
-+# config.h is supposed to be automatically checked for compatibility
-+# in automatic builds, while the other files should not just be
-+# compatible, but also identical in theory.
-+# Practically, we don't check that in crypto but just assume that the
-+# submodule configuration is sane and trust tls's headers.
-+list(REMOVE_ITEM headers
"${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/compat-1.3.h"
-+
"${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/config.h"
-+
"${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/error.h"
-+
"${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/version.h")
-+endif(USE_CRYPTO_SUBMODULE)
-+
- install(FILES ${headers}
- DESTINATION include/mbedtls
- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)

diff --git a/net-libs/mbedtls/files/mbedtls-un-pebcak-705038-wrong-file.patch 
b/net-libs/mbedtls/files/mbedtls-un-pebcak-705038-wrong-file.patch
deleted file mode 100644
index 73e870fa1e4..000
--- a/net-libs/mbedtls/files/mbedtls-un-pebcak-705038-wrong-file.patch
+++ /dev/null
@@ -1,50 +0,0

[gentoo-commits] repo/gentoo:master commit in: net-libs/mbedtls/files/

2017-08-09 Thread Anthony G. Basile 
commit: 9ede47e701d02b584543ddf6317a095b47c5a4d2
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Wed Aug  9 09:09:27 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Aug  9 12:18:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ede47e7

net-libs/mbedtls: remove unused patches

 .../files/mbedtls-2.3.0-include-guards.patch   |  34 ---
 .../files/mbedtls-2.3.0-move-to-header.patch   | 333 -
 net-libs/mbedtls/files/mbedtls-2.3.0-tests.patch   |  23 --
 3 files changed, 390 deletions(-)

diff --git a/net-libs/mbedtls/files/mbedtls-2.3.0-include-guards.patch 
b/net-libs/mbedtls/files/mbedtls-2.3.0-include-guards.patch
deleted file mode 100644
index af12d4b1f4a..000
--- a/net-libs/mbedtls/files/mbedtls-2.3.0-include-guards.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 23e9778684ba734dbfba1445e145b04dd6b59e76 Mon Sep 17 00:00:00 2001
-From: Simon Butcher 
-Date: Wed, 13 Jul 2016 13:31:08 +0100
-Subject: [PATCH] Adds missing conditions for platform time
-
-In platform.c, made the time functions dependent on the configuration
-MBEDTLS_HAVE_TIME to fix a build break where the functions could be
-built but the mbedtls_time_t was not defined.

- library/platform.c | 4 
- 1 file changed, 4 insertions(+)
-
-diff --git a/library/platform.c b/library/platform.c
-index 68ca45d..2591c45 100644
 a/library/platform.c
-+++ b/library/platform.c
-@@ -190,6 +190,8 @@ int mbedtls_platform_set_exit( void (*exit_func)( int 
status ) )
- }
- #endif /* MBEDTLS_PLATFORM_EXIT_ALT */
- 
-+#if defined(MBEDTLS_HAVE_TIME)
-+
- #if defined(MBEDTLS_PLATFORM_TIME_ALT)
- #if !defined(MBEDTLS_PLATFORM_STD_TIME)
- /*
-@@ -213,6 +215,8 @@ int mbedtls_platform_set_time( mbedtls_time_t 
(*time_func)( mbedtls_time_t* time
- }
- #endif /* MBEDTLS_PLATFORM_TIME_ALT */
- 
-+#endif /* MBEDTLS_HAVE_TIME */
-+
- #if defined(MBEDTLS_ENTROPY_NV_SEED)
- #if !defined(MBEDTLS_PLATFORM_NO_STD_FUNCTIONS) && defined(MBEDTLS_FS_IO)
- /* Default implementations for the platform independent seed functions use

diff --git a/net-libs/mbedtls/files/mbedtls-2.3.0-move-to-header.patch 
b/net-libs/mbedtls/files/mbedtls-2.3.0-move-to-header.patch
deleted file mode 100644
index 2c858bb7f82..000
--- a/net-libs/mbedtls/files/mbedtls-2.3.0-move-to-header.patch
+++ /dev/null
@@ -1,333 +0,0 @@
-From b5b6af2663fdb7f57c30494607bade90810f6844 Mon Sep 17 00:00:00 2001
-From: Simon Butcher 
-Date: Wed, 13 Jul 2016 14:46:18 +0100
-Subject: [PATCH] Puts platform time abstraction into its own header
-
-Separates platform time abstraction into it's own header from the
-general platform abstraction as both depend on different build options.
-(MBEDTLS_PLATFORM_C vs MBEDTLS_HAVE_TIME)

- include/mbedtls/platform.h  | 37 ++-
- include/mbedtls/platform_time.h | 81 +
- include/mbedtls/ssl.h   |  2 +-
- library/net.c   |  1 -
- library/ssl_cache.c |  2 -
- library/ssl_ciphersuites.c  |  1 -
- library/ssl_cli.c   |  4 +-
- library/ssl_cookie.c|  2 -
- library/ssl_srv.c   |  4 +-
- library/ssl_ticket.c|  2 -
- library/ssl_tls.c   |  1 -
- library/x509.c  |  7 +++-
- programs/ssl/dtls_client.c  |  1 -
- 13 files changed, 93 insertions(+), 52 deletions(-)
- create mode 100644 include/mbedtls/platform_time.h
-
-diff --git a/include/mbedtls/platform.h b/include/mbedtls/platform.h
-index caf8f25..b1b019e 100644
 a/include/mbedtls/platform.h
-+++ b/include/mbedtls/platform.h
-@@ -29,6 +29,10 @@
- #include MBEDTLS_CONFIG_FILE
- #endif
- 
-+#if defined(MBEDTLS_HAVE_TIME)
-+#include "mbedtls/platform_time.h"
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -244,39 +248,6 @@ int mbedtls_platform_set_exit( void (*exit_func)( int 
status ) );
- #endif
- 
- /*
-- * The time_t datatype
-- */
--#if defined(MBEDTLS_PLATFORM_TIME_TYPE_MACRO)
--typedef MBEDTLS_PLATFORM_TIME_TYPE_MACRO mbedtls_time_t;
--#else
--/* For time_t */
--#include 
--typedef time_t mbedtls_time_t;
--#endif /* MBEDTLS_PLATFORM_TIME_TYPE_MACRO */
--
--/*
-- * The function pointers for time
-- */
--#if defined(MBEDTLS_PLATFORM_TIME_ALT)
--extern mbedtls_time_t (*mbedtls_time)( mbedtls_time_t* time );
--
--/**
-- * \brief   Set your own time function pointer
-- *
-- * \param   time_func   the time function implementation
-- *
-- * \return  0
-- */
--int mbedtls_platform_set_time( mbedtls_time_t (*time_func)( mbedtls_time_t* 
time ) );
--#else
--#if defined(MBEDTLS_PLATFORM_TIME_MACRO)
--#define mbedtls_timeMBEDTLS_PLATFORM_TIME_MACRO
--#else
--#define mbedtls_time   time
--#endif /* MBEDTLS_PLATFORM_TIME_MACRO */
--#endif /* MBEDTLS_PLATFORM_TIME_ALT */
--
--/*
-  * The function pointers for reading from and writing a seed file to
-  * Non-Volatile storage