lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-11-25 23:43:17 +03:00
Code Activity

Merge remote-tracking branch 'upstream-public/pr/866' into development

Browse Source 
Conflict resolution: additions in the same places as
upstream-public/pr/865, both adding into lexicographically sorted
lists, resolved by taking the additions in lexicographic order.
This commit is contained in:
Gilles Peskine
2018-01-02 15:55:55 +01:00
parent 7c483b6765 621080d7c6
commit 3fcc045c23
5 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/mbedtls/config.h
View File

@@ -267,6 +267,7 @@
//#define MBEDTLS_BLOWFISH_ALT
//#define MBEDTLS_CAMELLIA_ALT
//#define MBEDTLS_CCM_ALT
//#define MBEDTLS_CMAC_ALT
//#define MBEDTLS_DES_ALT
//#define MBEDTLS_XTEA_ALT
//#define MBEDTLS_MD2_ALT