mbedtls/programs/ssl
Manuel Pégourié-Gonnard d901d17817 Merge branch 'development' into dtls
* development: (100 commits)
  Update Changelog for the mem-measure branch
  Fix issues introduced when rebasing
  Fix compile error in memory_buffer_alloc_selftest
  Code cosmetics
  Add curve25519 to ecc-heap.sh
  Add curve25519 to the benchmark program
  Fix compile issue when buffer_alloc not available
  New script ecc-heap.sh
  Fix unused variable issue in some configs
  Rm usunused member in private struct
  Add heap usage for PK in benchmark
  Use memory_buffer_alloc() in benchmark if available
  Only define mode_func if mode is enabled (CBC etc)
  PKCS8 encrypted key depend on PKCS5 or PKCS12
  Disable SRV_C for client measurement
  Output stack+heap usage with massif
  Enable NIST_OPTIM by default for config-suite-b
  Refactor memory.sh
  Adapt memory.sh to config-suite-b
  Adapt mini-client for config-suite-b.h
  ...

Conflicts:
	ChangeLog
	include/polarssl/net.h
	library/Makefile
	library/error.c
	library/ssl_tls.c
	programs/Makefile
	programs/ssl/ssl_client2.c
	programs/ssl/ssl_server2.c
	tests/Makefile
2015-02-16 18:44:39 +00:00
..
CMakeLists.txt Merge branch 'development' into dtls 2015-02-16 18:44:39 +00:00
dtls_client.c Fix remaining printfs in programs 2015-01-29 13:29:20 +00:00
dtls_server.c Fix remaining printfs in programs 2015-01-29 13:29:20 +00:00
mini_client.c Adapt mini-client for config-suite-b.h 2015-02-16 17:22:46 +00:00
ssl_client1.c Merge branch 'development' into dtls 2015-02-16 18:44:39 +00:00
ssl_client2.c Merge branch 'development' into dtls 2015-02-16 18:44:39 +00:00
ssl_fork_server.c Merge branch 'development' into dtls 2015-02-16 18:44:39 +00:00
ssl_mail_client.c Merge branch 'development' into dtls 2015-02-16 18:44:39 +00:00
ssl_pthread_server.c Merge branch 'development' into dtls 2015-02-16 18:44:39 +00:00
ssl_server.c Merge branch 'development' into dtls 2015-02-16 18:44:39 +00:00
ssl_server2.c Merge branch 'development' into dtls 2015-02-16 18:44:39 +00:00