eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mbedtls-1.3' into development

Browse source 
* mbedtls-1.3:
  Mark a few additional deprecations
  Use proper doxygen markup to mark deprecations
  Add -fdata-sections in memory.sh too
This commit is contained in:
Manuel Pégourié-Gonnard 2015-03-20 17:30:31 +00:00
commit 7c4e60fa7d
9 changed files with 94 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
include/mbedtls/config.h
View file

@ -1745,7 +1745,9 @@
/**
* \def POLARSSL_MEMORY_C
* Deprecated since 1.3.5. Please use POLARSSL_PLATFORM_MEMORY instead.
*
* \deprecated Use POLARSSL_PLATFORM_MEMORY instead.
*
* Depends on: POLARSSL_PLATFORM_C
*/
//#define POLARSSL_MEMORY_C
@ -1815,6 +1817,24 @@
#define POLARSSL_PADLOCK_C
/**
<<<<<<< HEAD:include/mbedtls/config.h
=======
* \def POLARSSL_PBKDF2_C
*
* Enable PKCS#5 PBKDF2 key derivation function.
*
* \deprecated Use POLARSSL_PKCS5_C instead
*
* Module: library/pbkdf2.c
*
* Requires: POLARSSL_PKCS5_C
*
* This module adds support for the PKCS#5 PBKDF2 key derivation function.
*/
#define POLARSSL_PBKDF2_C
/**
>>>>>>> mbedtls-1.3:include/polarssl/config.h
* \def POLARSSL_PEM_PARSE_C
*
* Enable PEM decoding / parsing.