From 83218f1da142e7a743afbc734e219099664f80ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Wed, 12 Feb 2014 11:11:12 +0100 Subject: [PATCH] Add dtls version aliases to test serv/cli --- programs/ssl/ssl_client2.c | 20 +++++++++++++------- programs/ssl/ssl_server2.c | 20 +++++++++++++------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c index 63c8e38227..c0a957bd8e 100644 --- a/programs/ssl/ssl_client2.c +++ b/programs/ssl/ssl_client2.c @@ -320,7 +320,7 @@ static int my_verify( void *data, x509_crt *crt, int depth, int *flags ) " min_version=%%s default: \"\" (ssl3)\n" \ " max_version=%%s default: \"\" (tls1_2)\n" \ " force_version=%%s default: \"\" (none)\n" \ - " options: ssl3, tls1, tls1_1, tls1_2\n" \ + " options: ssl3, tls1, tls1_1, tls1_2, dtls1, dtls1_2\n" \ " auth_mode=%%s default: \"required\"\n" \ " options: none, optional, required\n" \ "\n" \ @@ -538,9 +538,11 @@ int main( int argc, char *argv[] ) opt.min_version = SSL_MINOR_VERSION_0; else if( strcmp( q, "tls1" ) == 0 ) opt.min_version = SSL_MINOR_VERSION_1; - else if( strcmp( q, "tls1_1" ) == 0 ) + else if( strcmp( q, "tls1_1" ) == 0 || + strcmp( q, "dtls1" ) == 0 ) opt.min_version = SSL_MINOR_VERSION_2; - else if( strcmp( q, "tls1_2" ) == 0 ) + else if( strcmp( q, "tls1_2" ) == 0 || + strcmp( q, "dtls1_2" ) == 0 ) opt.min_version = SSL_MINOR_VERSION_3; else goto usage; @@ -551,9 +553,11 @@ int main( int argc, char *argv[] ) opt.max_version = SSL_MINOR_VERSION_0; else if( strcmp( q, "tls1" ) == 0 ) opt.max_version = SSL_MINOR_VERSION_1; - else if( strcmp( q, "tls1_1" ) == 0 ) + else if( strcmp( q, "tls1_1" ) == 0 || + strcmp( q, "dtls1" ) == 0 ) opt.max_version = SSL_MINOR_VERSION_2; - else if( strcmp( q, "tls1_2" ) == 0 ) + else if( strcmp( q, "tls1_2" ) == 0 || + strcmp( q, "dtls1_2" ) == 0 ) opt.max_version = SSL_MINOR_VERSION_3; else goto usage; @@ -570,12 +574,14 @@ int main( int argc, char *argv[] ) opt.min_version = SSL_MINOR_VERSION_1; opt.max_version = SSL_MINOR_VERSION_1; } - else if( strcmp( q, "tls1_1" ) == 0 ) + else if( strcmp( q, "tls1_1" ) == 0 || + strcmp( q, "dtls1" ) == 0 ) { opt.min_version = SSL_MINOR_VERSION_2; opt.max_version = SSL_MINOR_VERSION_2; } - else if( strcmp( q, "tls1_2" ) == 0 ) + else if( strcmp( q, "tls1_2" ) == 0 || + strcmp( q, "dtls1_2" ) == 0 ) { opt.min_version = SSL_MINOR_VERSION_3; opt.max_version = SSL_MINOR_VERSION_3; diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c index 36feb6f8c7..fcc8adbd08 100644 --- a/programs/ssl/ssl_server2.c +++ b/programs/ssl/ssl_server2.c @@ -331,7 +331,7 @@ static int my_send( void *ctx, const unsigned char *buf, size_t len ) " min_version=%%s default: \"ssl3\"\n" \ " max_version=%%s default: \"tls1_2\"\n" \ " force_version=%%s default: \"\" (none)\n" \ - " options: ssl3, tls1, tls1_1, tls1_2\n" \ + " options: ssl3, tls1, tls1_1, tls1_2, dtls1, dtls1_2\n" \ "\n" \ " version_suites=a,b,c,d per-version ciphersuites\n" \ " in order from ssl3 to tls1_2\n" \ @@ -821,9 +821,11 @@ int main( int argc, char *argv[] ) opt.min_version = SSL_MINOR_VERSION_0; else if( strcmp( q, "tls1" ) == 0 ) opt.min_version = SSL_MINOR_VERSION_1; - else if( strcmp( q, "tls1_1" ) == 0 ) + else if( strcmp( q, "tls1_1" ) == 0 || + strcmp( q, "dtls1" ) == 0 ) opt.min_version = SSL_MINOR_VERSION_2; - else if( strcmp( q, "tls1_2" ) == 0 ) + else if( strcmp( q, "tls1_2" ) == 0 || + strcmp( q, "dtls1_2" ) == 0 ) opt.min_version = SSL_MINOR_VERSION_3; else goto usage; @@ -834,9 +836,11 @@ int main( int argc, char *argv[] ) opt.max_version = SSL_MINOR_VERSION_0; else if( strcmp( q, "tls1" ) == 0 ) opt.max_version = SSL_MINOR_VERSION_1; - else if( strcmp( q, "tls1_1" ) == 0 ) + else if( strcmp( q, "tls1_1" ) == 0 || + strcmp( q, "dtls1" ) == 0 ) opt.max_version = SSL_MINOR_VERSION_2; - else if( strcmp( q, "tls1_2" ) == 0 ) + else if( strcmp( q, "tls1_2" ) == 0 || + strcmp( q, "dtls1_2" ) == 0 ) opt.max_version = SSL_MINOR_VERSION_3; else goto usage; @@ -853,12 +857,14 @@ int main( int argc, char *argv[] ) opt.min_version = SSL_MINOR_VERSION_1; opt.max_version = SSL_MINOR_VERSION_1; } - else if( strcmp( q, "tls1_1" ) == 0 ) + else if( strcmp( q, "tls1_1" ) == 0 || + strcmp( q, "dtls1" ) == 0 ) { opt.min_version = SSL_MINOR_VERSION_2; opt.max_version = SSL_MINOR_VERSION_2; } - else if( strcmp( q, "tls1_2" ) == 0 ) + else if( strcmp( q, "tls1_2" ) == 0 || + strcmp( q, "dtls1_2" ) == 0 ) { opt.min_version = SSL_MINOR_VERSION_3; opt.max_version = SSL_MINOR_VERSION_3;