| commit | f7d2bbaa62625bf05aea919555d3656f4c561225 | [log] [tgz] |
|---|---|---|
| author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Mon Feb 09 11:42:40 2015 +0000 |
| committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Mon Feb 09 11:42:40 2015 +0000 |
| tree | 927254db5431a32821e4062f30e41eda30e21d24 | |
| parent | 4eaf8f02bb7c69e696678417c5bcbc8f67a1f8f9 [diff] | |
| parent | 539d972a25954bf0b1e9de6f0b3baa54f1a7e3d6 [diff] |
Merge branch 'development' into dtls * development: Add missing guards for gnuTLS Prepare for mbed TLS 1.3.10 release Fix potential timing issue in RSA pms handling Conflicts: ChangeLog doxygen/input/doc_mainpage.h doxygen/mbedtls.doxyfile include/polarssl/version.h library/CMakeLists.txt library/ssl_srv.c tests/suites/test_suite_version.data visualc/VS2010/mbedTLS.vcxproj visualc/VS6/mbedtls.dsp visualc/VS6/mbedtls.dsw