From 2fc243d06a51e583df374e16eceab66b0b025ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg@elzevir.fr>
Date: Wed, 19 Feb 2014 18:22:59 +0100
Subject: [PATCH] Rearrange help messages of example cli/srv
---
programs/ssl/ssl_client2.c | 15 ++++++++++-----
programs/ssl/ssl_server2.c | 15 +++++++++------
2 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index e8917e13c..ddc1eac15 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -204,13 +204,21 @@ static int my_verify( void *data, x509_crt *crt, int depth, int *flags )
"\n acceptable parameters:\n" \
" server_name=%%s default: localhost\n" \
" server_port=%%d default: 4433\n" \
- " debug_level=%%d default: 0 (disabled)\n" \
- USAGE_IO \
" request_page=%%s default: \".\"\n" \
+ " debug_level=%%d default: 0 (disabled)\n" \
+ "\n" \
+ " auth_mode=%%s default: \"optional\"\n" \
+ " options: none, optional, required\n" \
+ USAGE_IO \
+ "\n" \
+ USAGE_PSK \
+ "\n" \
" renegotiation=%%d default: 1 (enabled)\n" \
" allow_legacy=%%d default: 0 (disabled)\n" \
" reconnect=%%d default: 0 (disabled)\n" \
USAGE_TICKETS \
+ USAGE_MAX_FRAG_LEN \
+ USAGE_TRUNC_HMAC \
"\n" \
" min_version=%%s default: \"\" (ssl3)\n" \
" max_version=%%s default: \"\" (tls1_2)\n" \
@@ -218,9 +226,6 @@ static int my_verify( void *data, x509_crt *crt, int depth, int *flags )
" options: ssl3, tls1, tls1_1, tls1_2\n" \
" auth_mode=%%s default: \"optional\"\n" \
" options: none, optional, required\n" \
- USAGE_MAX_FRAG_LEN \
- USAGE_TRUNC_HMAC \
- USAGE_PSK \
"\n" \
" force_ciphersuite=<name> default: all enabled\n"\
" acceptable ciphersuite names:\n"
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index c916b8ba0..a34b18795 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -177,19 +177,22 @@ static void my_debug( void *ctx, int level, const char *str )
" server_addr=%%d default: (all interfaces)\n" \
" server_port=%%d default: 4433\n" \
" debug_level=%%d default: 0 (disabled)\n" \
+ "\n" \
+ " auth_mode=%%s default: \"optional\"\n" \
+ " options: none, optional, required\n" \
USAGE_IO \
- " request_page=%%s default: \".\"\n" \
+ "\n" \
+ USAGE_PSK \
+ "\n" \
" renegotiation=%%d default: 1 (enabled)\n" \
- USAGE_TICKETS \
" allow_legacy=%%d default: 0 (disabled)\n" \
+ USAGE_TICKETS \
+ USAGE_MAX_FRAG_LEN \
+ "\n" \
" 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" \
- " auth_mode=%%s default: \"optional\"\n" \
- " options: none, optional, required\n" \
- USAGE_MAX_FRAG_LEN \
- USAGE_PSK \
"\n" \
" force_ciphersuite=<name> default: all enabled\n"\
" acceptable ciphersuite names:\n"