lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-05-16 06:24:39 +03:00
Code

Fix forgotten merge conflict

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-03-20 17:43:37 +00:00
parent 7c4e60fa7d
commit 1e5e819d31
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/mbedtls/config.h
View File

@ -1817,24 +1817,6 @@
#define POLARSSL_PADLOCK_C #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 * \def POLARSSL_PEM_PARSE_C
* *
* Enable PEM decoding / parsing. * Enable PEM decoding / parsing.