diff options
author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2015-06-17 13:53:47 +0200 |
---|---|---|
committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2015-06-17 14:59:27 +0200 |
commit | b31c5f68b1d280165980e4345bb075e4aa923b93 (patch) | |
tree | a65a36dd7e852dff371635f048f50ddae339186b /programs/ssl | |
parent | 7bfc1227036f0b83f15f252a0529105b9c787c09 (diff) | |
download | mbedtls-b31c5f68b1d280165980e4345bb075e4aa923b93.zip mbedtls-b31c5f68b1d280165980e4345bb075e4aa923b93.tar.gz mbedtls-b31c5f68b1d280165980e4345bb075e4aa923b93.tar.bz2 |
Add SSL presets.
No need to use a separate profile as in X.509, everything we need is already
in ssl_config. Just load appropriate values.
Diffstat (limited to 'programs/ssl')
-rw-r--r-- | programs/ssl/dtls_client.c | 3 | ||||
-rw-r--r-- | programs/ssl/dtls_server.c | 3 | ||||
-rw-r--r-- | programs/ssl/mini_client.c | 3 | ||||
-rw-r--r-- | programs/ssl/ssl_client1.c | 3 | ||||
-rw-r--r-- | programs/ssl/ssl_client2.c | 3 | ||||
-rw-r--r-- | programs/ssl/ssl_fork_server.c | 3 | ||||
-rw-r--r-- | programs/ssl/ssl_mail_client.c | 3 | ||||
-rw-r--r-- | programs/ssl/ssl_pthread_server.c | 3 | ||||
-rw-r--r-- | programs/ssl/ssl_server.c | 3 | ||||
-rw-r--r-- | programs/ssl/ssl_server2.c | 3 |
10 files changed, 20 insertions, 10 deletions
diff --git a/programs/ssl/dtls_client.c b/programs/ssl/dtls_client.c index 4052975..cc0d051 100644 --- a/programs/ssl/dtls_client.c +++ b/programs/ssl/dtls_client.c @@ -163,7 +163,8 @@ int main( int argc, char *argv[] ) if( ( ret = mbedtls_ssl_config_defaults( &conf, MBEDTLS_SSL_IS_CLIENT, - MBEDTLS_SSL_TRANSPORT_DATAGRAM ) ) != 0 ) + MBEDTLS_SSL_TRANSPORT_DATAGRAM, + MBEDTLS_SSL_PRESET_DEFAULT ) ) != 0 ) { mbedtls_printf( " failed\n ! mbedtls_ssl_config_defaults returned %d\n\n", ret ); goto exit; diff --git a/programs/ssl/dtls_server.c b/programs/ssl/dtls_server.c index 4eabf98..3ad10ce 100644 --- a/programs/ssl/dtls_server.c +++ b/programs/ssl/dtls_server.c @@ -199,7 +199,8 @@ int main( void ) if( ( ret = mbedtls_ssl_config_defaults( &conf, MBEDTLS_SSL_IS_SERVER, - MBEDTLS_SSL_TRANSPORT_DATAGRAM ) ) != 0 ) + MBEDTLS_SSL_TRANSPORT_DATAGRAM, + MBEDTLS_SSL_PRESET_DEFAULT ) ) != 0 ) { mbedtls_printf( " failed\n ! mbedtls_ssl_config_defaults returned %d\n\n", ret ); goto exit; diff --git a/programs/ssl/mini_client.c b/programs/ssl/mini_client.c index 090e018..2d1dcb9 100644 --- a/programs/ssl/mini_client.c +++ b/programs/ssl/mini_client.c @@ -191,7 +191,8 @@ int main( void ) if( mbedtls_ssl_config_defaults( &conf, MBEDTLS_SSL_IS_CLIENT, - MBEDTLS_SSL_TRANSPORT_STREAM) != 0 ) + MBEDTLS_SSL_TRANSPORT_STREAM, + MBEDTLS_SSL_PRESET_DEFAULT ) != 0 ) { ret = ssl_config_defaults_failed; goto exit; diff --git a/programs/ssl/ssl_client1.c b/programs/ssl/ssl_client1.c index 6ff0e14..b672305 100644 --- a/programs/ssl/ssl_client1.c +++ b/programs/ssl/ssl_client1.c @@ -153,7 +153,8 @@ int main( void ) if( ( ret = mbedtls_ssl_config_defaults( &conf, MBEDTLS_SSL_IS_CLIENT, - MBEDTLS_SSL_TRANSPORT_STREAM ) ) != 0 ) + MBEDTLS_SSL_TRANSPORT_STREAM, + MBEDTLS_SSL_PRESET_DEFAULT ) ) != 0 ) { mbedtls_printf( " failed\n ! mbedtls_ssl_config_defaults returned %d\n\n", ret ); goto exit; diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c index eabcbdc..b8a4a62 100644 --- a/programs/ssl/ssl_client2.c +++ b/programs/ssl/ssl_client2.c @@ -1059,7 +1059,8 @@ int main( int argc, char *argv[] ) if( ( ret = mbedtls_ssl_config_defaults( &conf, MBEDTLS_SSL_IS_CLIENT, - opt.transport ) ) != 0 ) + opt.transport, + MBEDTLS_SSL_PRESET_DEFAULT ) ) != 0 ) { mbedtls_printf( " failed\n ! mbedtls_ssl_config_defaults returned -0x%x\n\n", -ret ); goto exit; diff --git a/programs/ssl/ssl_fork_server.c b/programs/ssl/ssl_fork_server.c index 1f50c25..bafaa01 100644 --- a/programs/ssl/ssl_fork_server.c +++ b/programs/ssl/ssl_fork_server.c @@ -177,7 +177,8 @@ int main( void ) if( ( ret = mbedtls_ssl_config_defaults( &conf, MBEDTLS_SSL_IS_SERVER, - MBEDTLS_SSL_TRANSPORT_STREAM ) ) != 0 ) + MBEDTLS_SSL_TRANSPORT_STREAM, + MBEDTLS_SSL_PRESET_DEFAULT ) ) != 0 ) { mbedtls_printf( " failed\n ! mbedtls_ssl_config_defaults returned %d\n\n", ret ); goto exit; diff --git a/programs/ssl/ssl_mail_client.c b/programs/ssl/ssl_mail_client.c index 9587b7a..c06d0c0 100644 --- a/programs/ssl/ssl_mail_client.c +++ b/programs/ssl/ssl_mail_client.c @@ -587,7 +587,8 @@ int main( int argc, char *argv[] ) if( ( ret = mbedtls_ssl_config_defaults( &conf, MBEDTLS_SSL_IS_CLIENT, - MBEDTLS_SSL_TRANSPORT_STREAM ) ) != 0 ) + MBEDTLS_SSL_TRANSPORT_STREAM, + MBEDTLS_SSL_PRESET_DEFAULT ) ) != 0 ) { mbedtls_printf( " failed\n ! mbedtls_ssl_config_defaults returned %d\n\n", ret ); goto exit; diff --git a/programs/ssl/ssl_pthread_server.c b/programs/ssl/ssl_pthread_server.c index 2f414bf..3af66d0 100644 --- a/programs/ssl/ssl_pthread_server.c +++ b/programs/ssl/ssl_pthread_server.c @@ -412,7 +412,8 @@ int main( void ) if( ( ret = mbedtls_ssl_config_defaults( &conf, MBEDTLS_SSL_IS_SERVER, - MBEDTLS_SSL_TRANSPORT_STREAM ) ) != 0 ) + MBEDTLS_SSL_TRANSPORT_STREAM, + MBEDTLS_SSL_PRESET_DEFAULT ) ) != 0 ) { mbedtls_printf( " failed: mbedtls_ssl_config_defaults returned -0x%04x\n", -ret ); diff --git a/programs/ssl/ssl_server.c b/programs/ssl/ssl_server.c index 6c837e9..f2f969c 100644 --- a/programs/ssl/ssl_server.c +++ b/programs/ssl/ssl_server.c @@ -193,7 +193,8 @@ int main( void ) if( ( ret = mbedtls_ssl_config_defaults( &conf, MBEDTLS_SSL_IS_SERVER, - MBEDTLS_SSL_TRANSPORT_STREAM ) ) != 0 ) + MBEDTLS_SSL_TRANSPORT_STREAM, + MBEDTLS_SSL_PRESET_DEFAULT ) ) != 0 ) { mbedtls_printf( " failed\n ! mbedtls_ssl_config_defaults returned %d\n\n", ret ); goto exit; diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c index 78632a5..de51d45 100644 --- a/programs/ssl/ssl_server2.c +++ b/programs/ssl/ssl_server2.c @@ -1533,7 +1533,8 @@ int main( int argc, char *argv[] ) if( ( ret = mbedtls_ssl_config_defaults( &conf, MBEDTLS_SSL_IS_SERVER, - opt.transport ) ) != 0 ) + opt.transport, + MBEDTLS_SSL_PRESET_DEFAULT ) ) != 0 ) { mbedtls_printf( " failed\n ! mbedtls_ssl_config_defaults returned -0x%x\n\n", -ret ); goto exit; |