mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-01-05 22:04:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug with compatibility memory define/header

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-01-23 17:28:27 +00:00
parent 2be147a9cb
commit 0a155b826c
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/polarssl/check_config.h
View File

@ -156,6 +156,10 @@
#error "POLARSSL_KEY_EXCHANGE_RSA_ENABLED defined, but not all prerequisites" #error "POLARSSL_KEY_EXCHANGE_RSA_ENABLED defined, but not all prerequisites"
#endif #endif
#if defined(POLARSSL_MEMORY_C) && !defined(POLARSSL_PLATFORM_C)
#error "POLARSSL_MEMORY_C defined, but not all prerequisites"
#endif
#if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C) && \ #if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C) && \
( !defined(POLARSSL_PLATFORM_C) || !defined(POLARSSL_PLATFORM_MEMORY) ) ( !defined(POLARSSL_PLATFORM_C) || !defined(POLARSSL_PLATFORM_MEMORY) )
#error "POLARSSL_MEMORY_BUFFER_ALLOC_C defined, but not all prerequisites" #error "POLARSSL_MEMORY_BUFFER_ALLOC_C defined, but not all prerequisites"

1
include/polarssl/config.h
View File

@ -1679,6 +1679,7 @@
/** /**
* \def POLARSSL_MEMORY_C * \def POLARSSL_MEMORY_C
* Deprecated since 1.3.5. Please use POLARSSL_PLATFORM_MEMORY instead. * Deprecated since 1.3.5. Please use POLARSSL_PLATFORM_MEMORY instead.
* Depends on: POLARSSL_PLATFORM_C
*/ */
//#define POLARSSL_MEMORY_C //#define POLARSSL_MEMORY_C

4
include/polarssl/memory.h
View File

@ -32,10 +32,6 @@
#include <stdlib.h> #include <stdlib.h>
#if defined(POLARSSL_MEMORY_C) && !defined(POLARSSL_PLATFORM_MEMORY)
#define POLARSSL_PLATFORM_MEMORY
#endif
#include "platform.h" #include "platform.h"
#include "memory_buffer_alloc.h" #include "memory_buffer_alloc.h"

5
include/polarssl/platform.h
View File

@ -30,6 +30,11 @@
#include POLARSSL_CONFIG_FILE #include POLARSSL_CONFIG_FILE
#endif #endif
/* Temporary compability hack for to keep the deprecated MEMORY_C working */
#if defined(POLARSSL_MEMORY_C) && !defined(POLARSSL_PLATFORM_MEMORY)
#define POLARSSL_PLATFORM_MEMORY
#endif
#include <stdio.h> #include <stdio.h>
#ifdef __cplusplus #ifdef __cplusplus