diff options
| author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2015-02-16 18:37:53 +0000 |
|---|---|---|
| committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2015-02-16 18:44:39 +0000 |
| commit | d901d17817363d752d4e0c1b4ba580ac3c438ea4 (patch) | |
| tree | b1ddd34a70f63aa818502d202ee1e2e862c516e5 /programs/.gitignore | |
| parent | 82cf0a1f9a506ae0c528817e0f5a9a5641381b95 (diff) | |
| parent | ad350ed75909e5d1083e1e171bf07ce71b590e84 (diff) | |
| download | mbedtls-d901d17817363d752d4e0c1b4ba580ac3c438ea4.zip mbedtls-d901d17817363d752d4e0c1b4ba580ac3c438ea4.tar.gz mbedtls-d901d17817363d752d4e0c1b4ba580ac3c438ea4.tar.bz2 | |
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
Diffstat (limited to 'programs/.gitignore')
| -rw-r--r-- | programs/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/programs/.gitignore b/programs/.gitignore index c25ee3e..57334c4 100644 --- a/programs/.gitignore +++ b/programs/.gitignore @@ -40,6 +40,7 @@ ssl/ssl_mail_client ssl/ssl_pthread_server ssl/ssl_server ssl/ssl_server2 +ssl/mini_client test/benchmark test/ecp-bench test/o_p_test |