From 983acb75f00165c79d1ecfb2f25f98718d90cfdb Mon Sep 17 00:00:00 2001 From: GuHaijun <243297288@qq.com> Date: Fri, 28 Dec 2018 11:11:10 +0800 Subject: [PATCH 1/6] Fix include file path --- include/mbedtls/cipher.h | 2 +- include/mbedtls/platform_util.h | 4 ++-- include/mbedtls/poly1305.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/mbedtls/cipher.h b/include/mbedtls/cipher.h index 922b6c32c6de..082a69174159 100644 --- a/include/mbedtls/cipher.h +++ b/include/mbedtls/cipher.h @@ -36,7 +36,7 @@ #endif #include -#include "mbedtls/platform_util.h" +#include "platform_util.h" #if defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CCM_C) || defined(MBEDTLS_CHACHAPOLY_C) #define MBEDTLS_CIPHER_MODE_AEAD diff --git a/include/mbedtls/platform_util.h b/include/mbedtls/platform_util.h index b0e72ad14966..dba6d4598227 100644 --- a/include/mbedtls/platform_util.h +++ b/include/mbedtls/platform_util.h @@ -26,14 +26,14 @@ #define MBEDTLS_PLATFORM_UTIL_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "mbedtls/config.h" +#include "config.h" #else #include MBEDTLS_CONFIG_FILE #endif #include #if defined(MBEDTLS_HAVE_TIME_DATE) -#include "mbedtls/platform_time.h" +#include "platform_time.h" #include #endif /* MBEDTLS_HAVE_TIME_DATE */ diff --git a/include/mbedtls/poly1305.h b/include/mbedtls/poly1305.h index 05866a2da61a..f0ec44c96833 100644 --- a/include/mbedtls/poly1305.h +++ b/include/mbedtls/poly1305.h @@ -34,7 +34,7 @@ #define MBEDTLS_POLY1305_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "mbedtls/config.h" +#include "config.h" #else #include MBEDTLS_CONFIG_FILE #endif From f7e742d3cec0a232e458037610a41e6202d26a5d Mon Sep 17 00:00:00 2001 From: GuHaijun <243297288@qq.com> Date: Fri, 28 Dec 2018 13:22:33 +0800 Subject: [PATCH 2/6] Update ChangeLog --- ChangeLog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index be28645d6b44..2dedd50c6957 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ mbed TLS ChangeLog (Sorted per branch, date) += mbed TLS x.xx.x branch released xxxx-xx-xx + +Bugfix + * Fix for file not found, which was reporting in header files. + In header files at mbedlts/include folder, The include path has prefix + "mbedtls/" may cause the header file not be found in the case of + mbedtls as a dynamic/static library. + = mbed TLS 2.16.0 branch released 2018-12-21 Features From a306979ce120823574e1c4dd549d6f85d5618ff4 Mon Sep 17 00:00:00 2001 From: GuHaijun <243297288@qq.com> Date: Fri, 28 Dec 2018 14:06:29 +0800 Subject: [PATCH 3/6] Fix ChangeLog formate --- ChangeLog | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2dedd50c6957..3fd66676e4f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,10 +3,10 @@ mbed TLS ChangeLog (Sorted per branch, date) = mbed TLS x.xx.x branch released xxxx-xx-xx Bugfix - * Fix for file not found, which was reporting in header files. - In header files at mbedlts/include folder, The include path has prefix - "mbedtls/" may cause the header file not be found in the case of - mbedtls as a dynamic/static library. + * Fix for file not found, which was reporting in header files. + In header files at mbedlts/include folder, The include path has prefix + "mbedtls/" may cause the header file not be found in the case of + mbedtls as a dynamic/static library. = mbed TLS 2.16.0 branch released 2018-12-21 From f81f41a3b5852ec003b9d6fd54196e8df2cd8868 Mon Sep 17 00:00:00 2001 From: GuHaijun <243297288@qq.com> Date: Fri, 28 Dec 2018 18:28:18 +0800 Subject: [PATCH 4/6] Fix ChangeLog formate --- ChangeLog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3fd66676e4f0..f31137c14d00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,11 @@ mbed TLS ChangeLog (Sorted per branch, date) = mbed TLS x.xx.x branch released xxxx-xx-xx - + Bugfix * Fix for file not found, which was reporting in header files. - In header files at mbedlts/include folder, The include path has prefix - "mbedtls/" may cause the header file not be found in the case of + In header files at mbedlts/include folder, The include path has prefix + "mbedtls/" may cause the header file not be found in the case of mbedtls as a dynamic/static library. = mbed TLS 2.16.0 branch released 2018-12-21 From 4896c6bee51cd221a082752eeb9d1cda13bf7a77 Mon Sep 17 00:00:00 2001 From: Ron Eldor Date: Fri, 4 Jan 2019 07:47:05 +0800 Subject: [PATCH 5/6] Update ChangeLog Co-Authored-By: amisare <243297288@qq.com> --- ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f31137c14d00..1469cf08dc4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,7 +6,8 @@ Bugfix * Fix for file not found, which was reporting in header files. In header files at mbedlts/include folder, The include path has prefix "mbedtls/" may cause the header file not be found in the case of - mbedtls as a dynamic/static library. + * Remove the mbedtls namespacing from the header file, to fix a "file not found"build error. Fixed by Haijun Gu + #2319. = mbed TLS 2.16.0 branch released 2018-12-21 From 5c0b5b53a3e68b3e474637556373eb3ad99eeffb Mon Sep 17 00:00:00 2001 From: amisare <243297288@qq.com> Date: Fri, 4 Jan 2019 08:15:46 +0800 Subject: [PATCH 6/6] Update ChangeLog --- ChangeLog | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1469cf08dc4f..d94de7262056 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,11 +3,8 @@ mbed TLS ChangeLog (Sorted per branch, date) = mbed TLS x.xx.x branch released xxxx-xx-xx Bugfix - * Fix for file not found, which was reporting in header files. - In header files at mbedlts/include folder, The include path has prefix - "mbedtls/" may cause the header file not be found in the case of - * Remove the mbedtls namespacing from the header file, to fix a "file not found"build error. Fixed by Haijun Gu - #2319. + * Remove the mbedtls namespacing from the header file, to fix a "file not found" + build error. Fixed by Haijun Gu #2319. = mbed TLS 2.16.0 branch released 2018-12-21