Merge remote-tracking branch 'public/pr/1875' into development

This commit is contained in:
Simon Butcher 2018-07-24 08:41:07 +01:00
commit 4072aaea73

View file

@ -97,6 +97,10 @@ int main( void )
#include <windows.h> #include <windows.h>
#endif #endif
/* Size of memory to be allocated for the heap, when using the library's memory
* management and MBEDTLS_MEMORY_BUFFER_ALLOC_C is enabled. */
#define MEMORY_HEAP_SIZE 120000
#define DFL_SERVER_ADDR NULL #define DFL_SERVER_ADDR NULL
#define DFL_SERVER_PORT "4433" #define DFL_SERVER_PORT "4433"
#define DFL_DEBUG_LEVEL 0 #define DFL_DEBUG_LEVEL 0
@ -1212,7 +1216,7 @@ int main( int argc, char *argv[] )
const char *alpn_list[ALPN_LIST_SIZE]; const char *alpn_list[ALPN_LIST_SIZE];
#endif #endif
#if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C) #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)
unsigned char alloc_buf[100000]; unsigned char alloc_buf[MEMORY_HEAP_SIZE];
#endif #endif
int i; int i;