updated auto-generated filestmp-tlsfuzzer-updates

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

2 files changed, 395 insertions, 329 deletions

diff --git a/src/cli-args.c.bak b/src/cli-args.c.bak
index eb0ba3fdab..684898cb48 100644
--- a/src/cli-args.c.bak
+++ b/src/cli-args.c.bak
@@ -63,7 +63,7 @@ extern FILE * option_usage_fp;
 /**
  *  static const strings for gnutls-cli options
  */
-static char const gnutls_cli_opt_strs[4637] =
+static char const gnutls_cli_opt_strs[4829] =
 /*     0 */ "gnutls-cli @VERSION@\n"
             "Copyright (C) 2000-@YEAR@ Free Software Foundation, and others, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
@@ -146,112 +146,118 @@ static char const gnutls_cli_opt_strs[4637] =
 /*  2191 */ "Save the peer's OCSP status response in the provided file\0"
 /*  2249 */ "SAVE_OCSP\0"
 /*  2259 */ "save-ocsp\0"
-/*  2269 */ "The minimum number of bits allowed for DH\0"
-/*  2311 */ "DH_BITS\0"
-/*  2319 */ "dh-bits\0"
-/*  2327 */ "Priorities string\0"
-/*  2345 */ "PRIORITY\0"
-/*  2354 */ "priority\0"
-/*  2363 */ "Certificate file or PKCS #11 URL to use\0"
-/*  2403 */ "X509CAFILE\0"
-/*  2414 */ "x509cafile\0"
-/*  2425 */ "CRL file to use\0"
-/*  2441 */ "X509CRLFILE\0"
-/*  2453 */ "x509crlfile\0"
-/*  2465 */ "X.509 key file or PKCS #11 URL to use\0"
-/*  2503 */ "X509KEYFILE\0"
-/*  2515 */ "x509keyfile\0"
-/*  2527 */ "X.509 Certificate file or PKCS #11 URL to use\0"
-/*  2573 */ "X509CERTFILE\0"
-/*  2586 */ "x509certfile\0"
-/*  2599 */ "SRP username to use\0"
-/*  2619 */ "SRPUSERNAME\0"
-/*  2631 */ "srpusername\0"
-/*  2643 */ "SRP password to use\0"
-/*  2663 */ "SRPPASSWD\0"
-/*  2673 */ "srppasswd\0"
-/*  2683 */ "PSK username to use\0"
-/*  2703 */ "PSKUSERNAME\0"
-/*  2715 */ "pskusername\0"
-/*  2727 */ "PSK key (in hex) to use\0"
-/*  2751 */ "PSKKEY\0"
-/*  2758 */ "pskkey\0"
-/*  2765 */ "The port or service to connect to\0"
-/*  2799 */ "PORT\0"
-/*  2804 */ "port\0"
-/*  2809 */ "Don't abort program if server certificate can't be validated\0"
-/*  2870 */ "INSECURE\0"
-/*  2879 */ "insecure\0"
-/*  2888 */ "Allow broken algorithms, such as MD5 for certificate verification\0"
-/*  2954 */ "VERIFY_ALLOW_BROKEN\0"
-/*  2974 */ "verify-allow-broken\0"
-/*  2994 */ "Use length-hiding padding to prevent traffic analysis\0"
-/*  3048 */ "RANGES\0"
-/*  3055 */ "ranges\0"
-/*  3062 */ "Benchmark individual ciphers\0"
-/*  3091 */ "BENCHMARK_CIPHERS\0"
-/*  3109 */ "benchmark-ciphers\0"
-/*  3127 */ "Benchmark TLS key exchange methods\0"
-/*  3162 */ "BENCHMARK_TLS_KX\0"
-/*  3179 */ "benchmark-tls-kx\0"
-/*  3196 */ "Benchmark TLS ciphers\0"
-/*  3218 */ "BENCHMARK_TLS_CIPHERS\0"
-/*  3240 */ "benchmark-tls-ciphers\0"
-/*  3262 */ "Print a list of the supported algorithms and modes\0"
-/*  3313 */ "LIST\0"
-/*  3318 */ "list\0"
-/*  3323 */ "Print a list of the supported priority strings\0"
-/*  3370 */ "PRIORITY_LIST\0"
-/*  3384 */ "priority-list\0"
-/*  3398 */ "Don't allow session tickets\0"
-/*  3426 */ "NOTICKET\0"
-/*  3435 */ "noticket\0"
-/*  3444 */ "Offer SRTP profiles\0"
-/*  3464 */ "SRTP_PROFILES\0"
-/*  3478 */ "srtp-profiles\0"
-/*  3492 */ "Application layer protocol\0"
-/*  3519 */ "ALPN\0"
-/*  3524 */ "alpn\0"
-/*  3529 */ "Activate heartbeat support\0"
-/*  3556 */ "HEARTBEAT\0"
-/*  3566 */ "heartbeat\0"
-/*  3576 */ "The maximum record size to advertize\0"
-/*  3613 */ "RECORDSIZE\0"
-/*  3624 */ "recordsize\0"
-/*  3635 */ "Do not send a Server Name Indication (SNI)\0"
-/*  3678 */ "DISABLE_SNI\0"
-/*  3690 */ "disable-sni\0"
-/*  3702 */ "Disable all the TLS extensions\0"
-/*  3733 */ "DISABLE_EXTENSIONS\0"
-/*  3752 */ "disable-extensions\0"
-/*  3771 */ "Inline commands of the form ^<cmd>^\0"
-/*  3807 */ "INLINE_COMMANDS\0"
-/*  3823 */ "inline-commands\0"
-/*  3839 */ "Change the default delimiter for inline commands.\0"
-/*  3889 */ "INLINE_COMMANDS_PREFIX\0"
-/*  3912 */ "inline-commands-prefix\0"
-/*  3935 */ "Specify the PKCS #11 provider library\0"
-/*  3973 */ "PROVIDER\0"
-/*  3982 */ "provider\0"
-/*  3991 */ "Reports the status of the FIPS140-2 mode in gnutls library\0"
-/*  4050 */ "FIPS140_MODE\0"
-/*  4063 */ "fips140-mode\0"
-/*  4076 */ "display extended usage information and exit\0"
-/*  4120 */ "help\0"
-/*  4125 */ "extended usage information passed thru pager\0"
-/*  4170 */ "more-help\0"
-/*  4180 */ "output version information and exit\0"
-/*  4216 */ "version\0"
-/*  4224 */ "GNUTLS_CLI\0"
-/*  4235 */ "gnutls-cli - GnuTLS client\n"
+/*  2269 */ "Save the server-side TLS message trace in the provided file\0"
+/*  2329 */ "SAVE_SERVER_TRACE\0"
+/*  2347 */ "save-server-trace\0"
+/*  2365 */ "Save the client-side TLS message trace in the provided file\0"
+/*  2425 */ "SAVE_CLIENT_TRACE\0"
+/*  2443 */ "save-client-trace\0"
+/*  2461 */ "The minimum number of bits allowed for DH\0"
+/*  2503 */ "DH_BITS\0"
+/*  2511 */ "dh-bits\0"
+/*  2519 */ "Priorities string\0"
+/*  2537 */ "PRIORITY\0"
+/*  2546 */ "priority\0"
+/*  2555 */ "Certificate file or PKCS #11 URL to use\0"
+/*  2595 */ "X509CAFILE\0"
+/*  2606 */ "x509cafile\0"
+/*  2617 */ "CRL file to use\0"
+/*  2633 */ "X509CRLFILE\0"
+/*  2645 */ "x509crlfile\0"
+/*  2657 */ "X.509 key file or PKCS #11 URL to use\0"
+/*  2695 */ "X509KEYFILE\0"
+/*  2707 */ "x509keyfile\0"
+/*  2719 */ "X.509 Certificate file or PKCS #11 URL to use\0"
+/*  2765 */ "X509CERTFILE\0"
+/*  2778 */ "x509certfile\0"
+/*  2791 */ "SRP username to use\0"
+/*  2811 */ "SRPUSERNAME\0"
+/*  2823 */ "srpusername\0"
+/*  2835 */ "SRP password to use\0"
+/*  2855 */ "SRPPASSWD\0"
+/*  2865 */ "srppasswd\0"
+/*  2875 */ "PSK username to use\0"
+/*  2895 */ "PSKUSERNAME\0"
+/*  2907 */ "pskusername\0"
+/*  2919 */ "PSK key (in hex) to use\0"
+/*  2943 */ "PSKKEY\0"
+/*  2950 */ "pskkey\0"
+/*  2957 */ "The port or service to connect to\0"
+/*  2991 */ "PORT\0"
+/*  2996 */ "port\0"
+/*  3001 */ "Don't abort program if server certificate can't be validated\0"
+/*  3062 */ "INSECURE\0"
+/*  3071 */ "insecure\0"
+/*  3080 */ "Allow broken algorithms, such as MD5 for certificate verification\0"
+/*  3146 */ "VERIFY_ALLOW_BROKEN\0"
+/*  3166 */ "verify-allow-broken\0"
+/*  3186 */ "Use length-hiding padding to prevent traffic analysis\0"
+/*  3240 */ "RANGES\0"
+/*  3247 */ "ranges\0"
+/*  3254 */ "Benchmark individual ciphers\0"
+/*  3283 */ "BENCHMARK_CIPHERS\0"
+/*  3301 */ "benchmark-ciphers\0"
+/*  3319 */ "Benchmark TLS key exchange methods\0"
+/*  3354 */ "BENCHMARK_TLS_KX\0"
+/*  3371 */ "benchmark-tls-kx\0"
+/*  3388 */ "Benchmark TLS ciphers\0"
+/*  3410 */ "BENCHMARK_TLS_CIPHERS\0"
+/*  3432 */ "benchmark-tls-ciphers\0"
+/*  3454 */ "Print a list of the supported algorithms and modes\0"
+/*  3505 */ "LIST\0"
+/*  3510 */ "list\0"
+/*  3515 */ "Print a list of the supported priority strings\0"
+/*  3562 */ "PRIORITY_LIST\0"
+/*  3576 */ "priority-list\0"
+/*  3590 */ "Don't allow session tickets\0"
+/*  3618 */ "NOTICKET\0"
+/*  3627 */ "noticket\0"
+/*  3636 */ "Offer SRTP profiles\0"
+/*  3656 */ "SRTP_PROFILES\0"
+/*  3670 */ "srtp-profiles\0"
+/*  3684 */ "Application layer protocol\0"
+/*  3711 */ "ALPN\0"
+/*  3716 */ "alpn\0"
+/*  3721 */ "Activate heartbeat support\0"
+/*  3748 */ "HEARTBEAT\0"
+/*  3758 */ "heartbeat\0"
+/*  3768 */ "The maximum record size to advertize\0"
+/*  3805 */ "RECORDSIZE\0"
+/*  3816 */ "recordsize\0"
+/*  3827 */ "Do not send a Server Name Indication (SNI)\0"
+/*  3870 */ "DISABLE_SNI\0"
+/*  3882 */ "disable-sni\0"
+/*  3894 */ "Disable all the TLS extensions\0"
+/*  3925 */ "DISABLE_EXTENSIONS\0"
+/*  3944 */ "disable-extensions\0"
+/*  3963 */ "Inline commands of the form ^<cmd>^\0"
+/*  3999 */ "INLINE_COMMANDS\0"
+/*  4015 */ "inline-commands\0"
+/*  4031 */ "Change the default delimiter for inline commands.\0"
+/*  4081 */ "INLINE_COMMANDS_PREFIX\0"
+/*  4104 */ "inline-commands-prefix\0"
+/*  4127 */ "Specify the PKCS #11 provider library\0"
+/*  4165 */ "PROVIDER\0"
+/*  4174 */ "provider\0"
+/*  4183 */ "Reports the status of the FIPS140-2 mode in gnutls library\0"
+/*  4242 */ "FIPS140_MODE\0"
+/*  4255 */ "fips140-mode\0"
+/*  4268 */ "display extended usage information and exit\0"
+/*  4312 */ "help\0"
+/*  4317 */ "extended usage information passed thru pager\0"
+/*  4362 */ "more-help\0"
+/*  4372 */ "output version information and exit\0"
+/*  4408 */ "version\0"
+/*  4416 */ "GNUTLS_CLI\0"
+/*  4427 */ "gnutls-cli - GnuTLS client\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [hostname]\n\0"
-/*  4331 */ "@PACKAGE_BUGREPORT@\0"
-/*  4351 */ "\n\0"
-/*  4353 */ "Simple client program to set up a TLS connection to some other computer.  It\n"
+/*  4523 */ "@PACKAGE_BUGREPORT@\0"
+/*  4543 */ "\n\0"
+/*  4545 */ "Simple client program to set up a TLS connection to some other computer.  It\n"
             "sets up a TLS connection and forwards data from the standard input to the\n"
             "secured socket and vice versa.\n\0"
-/*  4536 */ "gnutls-cli @VERSION@\0"
-/*  4557 */ "Usage: gnutls-cli [options] hostname\n"
+/*  4728 */ "gnutls-cli @VERSION@\0"
+/*  4749 */ "Usage: gnutls-cli [options] hostname\n"
             "gnutls-cli --help for usage instructions.\n";
 
 /**
@@ -552,14 +558,40 @@ static int const aStarttls_ProtoCantList[] = {
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /**
+ *  save-server-trace option description:
+ */
+/** Descriptive text for the save-server-trace option */
+#define SAVE_SERVER_TRACE_DESC      (gnutls_cli_opt_strs+2269)
+/** Upper-cased name for the save-server-trace option */
+#define SAVE_SERVER_TRACE_NAME      (gnutls_cli_opt_strs+2329)
+/** Name string for the save-server-trace option */
+#define SAVE_SERVER_TRACE_name      (gnutls_cli_opt_strs+2347)
+/** Compiled in flag settings for the save-server-trace option */
+#define SAVE_SERVER_TRACE_FLAGS     (OPTST_DISABLED \
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+
+/**
+ *  save-client-trace option description:
+ */
+/** Descriptive text for the save-client-trace option */
+#define SAVE_CLIENT_TRACE_DESC      (gnutls_cli_opt_strs+2365)
+/** Upper-cased name for the save-client-trace option */
+#define SAVE_CLIENT_TRACE_NAME      (gnutls_cli_opt_strs+2425)
+/** Name string for the save-client-trace option */
+#define SAVE_CLIENT_TRACE_name      (gnutls_cli_opt_strs+2443)
+/** Compiled in flag settings for the save-client-trace option */
+#define SAVE_CLIENT_TRACE_FLAGS     (OPTST_DISABLED \
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+
+/**
  *  dh-bits option description:
  */
 /** Descriptive text for the dh-bits option */
-#define DH_BITS_DESC      (gnutls_cli_opt_strs+2269)
+#define DH_BITS_DESC      (gnutls_cli_opt_strs+2461)
 /** Upper-cased name for the dh-bits option */
-#define DH_BITS_NAME      (gnutls_cli_opt_strs+2311)
+#define DH_BITS_NAME      (gnutls_cli_opt_strs+2503)
 /** Name string for the dh-bits option */
-#define DH_BITS_name      (gnutls_cli_opt_strs+2319)
+#define DH_BITS_name      (gnutls_cli_opt_strs+2511)
 /** Compiled in flag settings for the dh-bits option */
 #define DH_BITS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -568,11 +600,11 @@ static int const aStarttls_ProtoCantList[] = {
  *  priority option description:
  */
 /** Descriptive text for the priority option */
-#define PRIORITY_DESC      (gnutls_cli_opt_strs+2327)
+#define PRIORITY_DESC      (gnutls_cli_opt_strs+2519)
 /** Upper-cased name for the priority option */
-#define PRIORITY_NAME      (gnutls_cli_opt_strs+2345)
+#define PRIORITY_NAME      (gnutls_cli_opt_strs+2537)
 /** Name string for the priority option */
-#define PRIORITY_name      (gnutls_cli_opt_strs+2354)
+#define PRIORITY_name      (gnutls_cli_opt_strs+2546)
 /** Compiled in flag settings for the priority option */
 #define PRIORITY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -581,11 +613,11 @@ static int const aStarttls_ProtoCantList[] = {
  *  x509cafile option description:
  */
 /** Descriptive text for the x509cafile option */
-#define X509CAFILE_DESC      (gnutls_cli_opt_strs+2363)
+#define X509CAFILE_DESC      (gnutls_cli_opt_strs+2555)
 /** Upper-cased name for the x509cafile option */
-#define X509CAFILE_NAME      (gnutls_cli_opt_strs+2403)
+#define X509CAFILE_NAME      (gnutls_cli_opt_strs+2595)
 /** Name string for the x509cafile option */
-#define X509CAFILE_name      (gnutls_cli_opt_strs+2414)
+#define X509CAFILE_name      (gnutls_cli_opt_strs+2606)
 /** Compiled in flag settings for the x509cafile option */
 #define X509CAFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -594,11 +626,11 @@ static int const aStarttls_ProtoCantList[] = {
  *  x509crlfile option description:
  */
 /** Descriptive text for the x509crlfile option */
-#define X509CRLFILE_DESC      (gnutls_cli_opt_strs+2425)
+#define X509CRLFILE_DESC      (gnutls_cli_opt_strs+2617)
 /** Upper-cased name for the x509crlfile option */
-#define X509CRLFILE_NAME      (gnutls_cli_opt_strs+2441)
+#define X509CRLFILE_NAME      (gnutls_cli_opt_strs+2633)
 /** Name string for the x509crlfile option */
-#define X509CRLFILE_name      (gnutls_cli_opt_strs+2453)
+#define X509CRLFILE_name      (gnutls_cli_opt_strs+2645)
 /** Compiled in flag settings for the x509crlfile option */
 #define X509CRLFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
@@ -607,11 +639,11 @@ static int const aStarttls_ProtoCantList[] = {
  *  x509keyfile option description:
  */
 /** Descriptive text for the x509keyfile option */
-#define X509KEYFILE_DESC      (gnutls_cli_opt_strs+2465)
+#define X509KEYFILE_DESC      (gnutls_cli_opt_strs+2657)
 /** Upper-cased name for the x509keyfile option */
-#define X509KEYFILE_NAME      (gnutls_cli_opt_strs+2503)
+#define X509KEYFILE_NAME      (gnutls_cli_opt_strs+2695)
 /** Name string for the x509keyfile option */
-#define X509KEYFILE_name      (gnutls_cli_opt_strs+2515)
+#define X509KEYFILE_name      (gnutls_cli_opt_strs+2707)
 /** Compiled in flag settings for the x509keyfile option */
 #define X509KEYFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -621,11 +653,11 @@ static int const aStarttls_ProtoCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the x509certfile option */
-#define X509CERTFILE_DESC      (gnutls_cli_opt_strs+2527)
+#define X509CERTFILE_DESC      (gnutls_cli_opt_strs+2719)
 /** Upper-cased name for the x509certfile option */
-#define X509CERTFILE_NAME      (gnutls_cli_opt_strs+2573)
+#define X509CERTFILE_NAME      (gnutls_cli_opt_strs+2765)
 /** Name string for the x509certfile option */
-#define X509CERTFILE_name      (gnutls_cli_opt_strs+2586)
+#define X509CERTFILE_name      (gnutls_cli_opt_strs+2778)
 /** Other options that are required by the x509certfile option */
 static int const aX509certfileMustList[] = {
     INDEX_OPT_X509KEYFILE, NO_EQUIVALENT };
@@ -637,11 +669,11 @@ static int const aX509certfileMustList[] = {
  *  srpusername option description:
  */
 /** Descriptive text for the srpusername option */
-#define SRPUSERNAME_DESC      (gnutls_cli_opt_strs+2599)
+#define SRPUSERNAME_DESC      (gnutls_cli_opt_strs+2791)
 /** Upper-cased name for the srpusername option */
-#define SRPUSERNAME_NAME      (gnutls_cli_opt_strs+2619)
+#define SRPUSERNAME_NAME      (gnutls_cli_opt_strs+2811)
 /** Name string for the srpusername option */
-#define SRPUSERNAME_name      (gnutls_cli_opt_strs+2631)
+#define SRPUSERNAME_name      (gnutls_cli_opt_strs+2823)
 /** Compiled in flag settings for the srpusername option */
 #define SRPUSERNAME_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -650,11 +682,11 @@ static int const aX509certfileMustList[] = {
  *  srppasswd option description:
  */
 /** Descriptive text for the srppasswd option */
-#define SRPPASSWD_DESC      (gnutls_cli_opt_strs+2643)
+#define SRPPASSWD_DESC      (gnutls_cli_opt_strs+2835)
 /** Upper-cased name for the srppasswd option */
-#define SRPPASSWD_NAME      (gnutls_cli_opt_strs+2663)
+#define SRPPASSWD_NAME      (gnutls_cli_opt_strs+2855)
 /** Name string for the srppasswd option */
-#define SRPPASSWD_name      (gnutls_cli_opt_strs+2673)
+#define SRPPASSWD_name      (gnutls_cli_opt_strs+2865)
 /** Compiled in flag settings for the srppasswd option */
 #define SRPPASSWD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -663,11 +695,11 @@ static int const aX509certfileMustList[] = {
  *  pskusername option description:
  */
 /** Descriptive text for the pskusername option */
-#define PSKUSERNAME_DESC      (gnutls_cli_opt_strs+2683)
+#define PSKUSERNAME_DESC      (gnutls_cli_opt_strs+2875)
 /** Upper-cased name for the pskusername option */
-#define PSKUSERNAME_NAME      (gnutls_cli_opt_strs+2703)
+#define PSKUSERNAME_NAME      (gnutls_cli_opt_strs+2895)
 /** Name string for the pskusername option */
-#define PSKUSERNAME_name      (gnutls_cli_opt_strs+2715)
+#define PSKUSERNAME_name      (gnutls_cli_opt_strs+2907)
 /** Compiled in flag settings for the pskusername option */
 #define PSKUSERNAME_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -676,11 +708,11 @@ static int const aX509certfileMustList[] = {
  *  pskkey option description:
  */
 /** Descriptive text for the pskkey option */
-#define PSKKEY_DESC      (gnutls_cli_opt_strs+2727)
+#define PSKKEY_DESC      (gnutls_cli_opt_strs+2919)
 /** Upper-cased name for the pskkey option */
-#define PSKKEY_NAME      (gnutls_cli_opt_strs+2751)
+#define PSKKEY_NAME      (gnutls_cli_opt_strs+2943)
 /** Name string for the pskkey option */
-#define PSKKEY_name      (gnutls_cli_opt_strs+2758)
+#define PSKKEY_name      (gnutls_cli_opt_strs+2950)
 /** Compiled in flag settings for the pskkey option */
 #define PSKKEY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -689,11 +721,11 @@ static int const aX509certfileMustList[] = {
  *  port option description:
  */
 /** Descriptive text for the port option */
-#define PORT_DESC      (gnutls_cli_opt_strs+2765)
+#define PORT_DESC      (gnutls_cli_opt_strs+2957)
 /** Upper-cased name for the port option */
-#define PORT_NAME      (gnutls_cli_opt_strs+2799)
+#define PORT_NAME      (gnutls_cli_opt_strs+2991)
 /** Name string for the port option */
-#define PORT_name      (gnutls_cli_opt_strs+2804)
+#define PORT_name      (gnutls_cli_opt_strs+2996)
 /** Compiled in flag settings for the port option */
 #define PORT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -702,11 +734,11 @@ static int const aX509certfileMustList[] = {
  *  insecure option description:
  */
 /** Descriptive text for the insecure option */
-#define INSECURE_DESC      (gnutls_cli_opt_strs+2809)
+#define INSECURE_DESC      (gnutls_cli_opt_strs+3001)
 /** Upper-cased name for the insecure option */
-#define INSECURE_NAME      (gnutls_cli_opt_strs+2870)
+#define INSECURE_NAME      (gnutls_cli_opt_strs+3062)
 /** Name string for the insecure option */
-#define INSECURE_name      (gnutls_cli_opt_strs+2879)
+#define INSECURE_name      (gnutls_cli_opt_strs+3071)
 /** Compiled in flag settings for the insecure option */
 #define INSECURE_FLAGS     (OPTST_DISABLED)
 
@@ -714,11 +746,11 @@ static int const aX509certfileMustList[] = {
  *  verify-allow-broken option description:
  */
 /** Descriptive text for the verify-allow-broken option */
-#define VERIFY_ALLOW_BROKEN_DESC      (gnutls_cli_opt_strs+2888)
+#define VERIFY_ALLOW_BROKEN_DESC      (gnutls_cli_opt_strs+3080)
 /** Upper-cased name for the verify-allow-broken option */
-#define VERIFY_ALLOW_BROKEN_NAME      (gnutls_cli_opt_strs+2954)
+#define VERIFY_ALLOW_BROKEN_NAME      (gnutls_cli_opt_strs+3146)
 /** Name string for the verify-allow-broken option */
-#define VERIFY_ALLOW_BROKEN_name      (gnutls_cli_opt_strs+2974)
+#define VERIFY_ALLOW_BROKEN_name      (gnutls_cli_opt_strs+3166)
 /** Compiled in flag settings for the verify-allow-broken option */
 #define VERIFY_ALLOW_BROKEN_FLAGS     (OPTST_DISABLED)
 
@@ -726,11 +758,11 @@ static int const aX509certfileMustList[] = {
  *  ranges option description:
  */
 /** Descriptive text for the ranges option */
-#define RANGES_DESC      (gnutls_cli_opt_strs+2994)
+#define RANGES_DESC      (gnutls_cli_opt_strs+3186)
 /** Upper-cased name for the ranges option */
-#define RANGES_NAME      (gnutls_cli_opt_strs+3048)
+#define RANGES_NAME      (gnutls_cli_opt_strs+3240)
 /** Name string for the ranges option */
-#define RANGES_name      (gnutls_cli_opt_strs+3055)
+#define RANGES_name      (gnutls_cli_opt_strs+3247)
 /** Compiled in flag settings for the ranges option */
 #define RANGES_FLAGS     (OPTST_DISABLED)
 
@@ -738,11 +770,11 @@ static int const aX509certfileMustList[] = {
  *  benchmark-ciphers option description:
  */
 /** Descriptive text for the benchmark-ciphers option */
-#define BENCHMARK_CIPHERS_DESC      (gnutls_cli_opt_strs+3062)
+#define BENCHMARK_CIPHERS_DESC      (gnutls_cli_opt_strs+3254)
 /** Upper-cased name for the benchmark-ciphers option */
-#define BENCHMARK_CIPHERS_NAME      (gnutls_cli_opt_strs+3091)
+#define BENCHMARK_CIPHERS_NAME      (gnutls_cli_opt_strs+3283)
 /** Name string for the benchmark-ciphers option */
-#define BENCHMARK_CIPHERS_name      (gnutls_cli_opt_strs+3109)
+#define BENCHMARK_CIPHERS_name      (gnutls_cli_opt_strs+3301)
 /** Compiled in flag settings for the benchmark-ciphers option */
 #define BENCHMARK_CIPHERS_FLAGS     (OPTST_DISABLED)
 
@@ -750,11 +782,11 @@ static int const aX509certfileMustList[] = {
  *  benchmark-tls-kx option description:
  */
 /** Descriptive text for the benchmark-tls-kx option */
-#define BENCHMARK_TLS_KX_DESC      (gnutls_cli_opt_strs+3127)
+#define BENCHMARK_TLS_KX_DESC      (gnutls_cli_opt_strs+3319)
 /** Upper-cased name for the benchmark-tls-kx option */
-#define BENCHMARK_TLS_KX_NAME      (gnutls_cli_opt_strs+3162)
+#define BENCHMARK_TLS_KX_NAME      (gnutls_cli_opt_strs+3354)
 /** Name string for the benchmark-tls-kx option */
-#define BENCHMARK_TLS_KX_name      (gnutls_cli_opt_strs+3179)
+#define BENCHMARK_TLS_KX_name      (gnutls_cli_opt_strs+3371)
 /** Compiled in flag settings for the benchmark-tls-kx option */
 #define BENCHMARK_TLS_KX_FLAGS     (OPTST_DISABLED)
 
@@ -762,11 +794,11 @@ static int const aX509certfileMustList[] = {
  *  benchmark-tls-ciphers option description:
  */
 /** Descriptive text for the benchmark-tls-ciphers option */
-#define BENCHMARK_TLS_CIPHERS_DESC      (gnutls_cli_opt_strs+3196)
+#define BENCHMARK_TLS_CIPHERS_DESC      (gnutls_cli_opt_strs+3388)
 /** Upper-cased name for the benchmark-tls-ciphers option */
-#define BENCHMARK_TLS_CIPHERS_NAME      (gnutls_cli_opt_strs+3218)
+#define BENCHMARK_TLS_CIPHERS_NAME      (gnutls_cli_opt_strs+3410)
 /** Name string for the benchmark-tls-ciphers option */
-#define BENCHMARK_TLS_CIPHERS_name      (gnutls_cli_opt_strs+3240)
+#define BENCHMARK_TLS_CIPHERS_name      (gnutls_cli_opt_strs+3432)
 /** Compiled in flag settings for the benchmark-tls-ciphers option */
 #define BENCHMARK_TLS_CIPHERS_FLAGS     (OPTST_DISABLED)
 
@@ -775,11 +807,11 @@ static int const aX509certfileMustList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the list option */
-#define LIST_DESC      (gnutls_cli_opt_strs+3262)
+#define LIST_DESC      (gnutls_cli_opt_strs+3454)
 /** Upper-cased name for the list option */
-#define LIST_NAME      (gnutls_cli_opt_strs+3313)
+#define LIST_NAME      (gnutls_cli_opt_strs+3505)
 /** Name string for the list option */
-#define LIST_name      (gnutls_cli_opt_strs+3318)
+#define LIST_name      (gnutls_cli_opt_strs+3510)
 /** Other options that appear in conjunction with the list option */
 static int const aListCantList[] = {
     INDEX_OPT_PORT, NO_EQUIVALENT };
@@ -790,11 +822,11 @@ static int const aListCantList[] = {
  *  priority-list option description:
  */
 /** Descriptive text for the priority-list option */
-#define PRIORITY_LIST_DESC      (gnutls_cli_opt_strs+3323)
+#define PRIORITY_LIST_DESC      (gnutls_cli_opt_strs+3515)
 /** Upper-cased name for the priority-list option */
-#define PRIORITY_LIST_NAME      (gnutls_cli_opt_strs+3370)
+#define PRIORITY_LIST_NAME      (gnutls_cli_opt_strs+3562)
 /** Name string for the priority-list option */
-#define PRIORITY_LIST_name      (gnutls_cli_opt_strs+3384)
+#define PRIORITY_LIST_name      (gnutls_cli_opt_strs+3576)
 /** Compiled in flag settings for the priority-list option */
 #define PRIORITY_LIST_FLAGS     (OPTST_DISABLED)
 
@@ -802,11 +834,11 @@ static int const aListCantList[] = {
  *  noticket option description:
  */
 /** Descriptive text for the noticket option */
-#define NOTICKET_DESC      (gnutls_cli_opt_strs+3398)
+#define NOTICKET_DESC      (gnutls_cli_opt_strs+3590)
 /** Upper-cased name for the noticket option */
-#define NOTICKET_NAME      (gnutls_cli_opt_strs+3426)
+#define NOTICKET_NAME      (gnutls_cli_opt_strs+3618)
 /** Name string for the noticket option */
-#define NOTICKET_name      (gnutls_cli_opt_strs+3435)
+#define NOTICKET_name      (gnutls_cli_opt_strs+3627)
 /** Compiled in flag settings for the noticket option */
 #define NOTICKET_FLAGS     (OPTST_DISABLED)
 
@@ -814,11 +846,11 @@ static int const aListCantList[] = {
  *  srtp_profiles option description:
  */
 /** Descriptive text for the srtp_profiles option */
-#define SRTP_PROFILES_DESC      (gnutls_cli_opt_strs+3444)
+#define SRTP_PROFILES_DESC      (gnutls_cli_opt_strs+3636)
 /** Upper-cased name for the srtp_profiles option */
-#define SRTP_PROFILES_NAME      (gnutls_cli_opt_strs+3464)
+#define SRTP_PROFILES_NAME      (gnutls_cli_opt_strs+3656)
 /** Name string for the srtp_profiles option */
-#define SRTP_PROFILES_name      (gnutls_cli_opt_strs+3478)
+#define SRTP_PROFILES_name      (gnutls_cli_opt_strs+3670)
 /** Compiled in flag settings for the srtp_profiles option */
 #define SRTP_PROFILES_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -827,11 +859,11 @@ static int const aListCantList[] = {
  *  alpn option description:
  */
 /** Descriptive text for the alpn option */
-#define ALPN_DESC      (gnutls_cli_opt_strs+3492)
+#define ALPN_DESC      (gnutls_cli_opt_strs+3684)
 /** Upper-cased name for the alpn option */
-#define ALPN_NAME      (gnutls_cli_opt_strs+3519)
+#define ALPN_NAME      (gnutls_cli_opt_strs+3711)
 /** Name string for the alpn option */
-#define ALPN_name      (gnutls_cli_opt_strs+3524)
+#define ALPN_name      (gnutls_cli_opt_strs+3716)
 /** Compiled in flag settings for the alpn option */
 #define ALPN_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -840,11 +872,11 @@ static int const aListCantList[] = {
  *  heartbeat option description:
  */
 /** Descriptive text for the heartbeat option */
-#define HEARTBEAT_DESC      (gnutls_cli_opt_strs+3529)
+#define HEARTBEAT_DESC      (gnutls_cli_opt_strs+3721)
 /** Upper-cased name for the heartbeat option */
-#define HEARTBEAT_NAME      (gnutls_cli_opt_strs+3556)
+#define HEARTBEAT_NAME      (gnutls_cli_opt_strs+3748)
 /** Name string for the heartbeat option */
-#define HEARTBEAT_name      (gnutls_cli_opt_strs+3566)
+#define HEARTBEAT_name      (gnutls_cli_opt_strs+3758)
 /** Compiled in flag settings for the heartbeat option */
 #define HEARTBEAT_FLAGS     (OPTST_DISABLED)
 
@@ -852,11 +884,11 @@ static int const aListCantList[] = {
  *  recordsize option description:
  */
 /** Descriptive text for the recordsize option */
-#define RECORDSIZE_DESC      (gnutls_cli_opt_strs+3576)
+#define RECORDSIZE_DESC      (gnutls_cli_opt_strs+3768)
 /** Upper-cased name for the recordsize option */
-#define RECORDSIZE_NAME      (gnutls_cli_opt_strs+3613)
+#define RECORDSIZE_NAME      (gnutls_cli_opt_strs+3805)
 /** Name string for the recordsize option */
-#define RECORDSIZE_name      (gnutls_cli_opt_strs+3624)
+#define RECORDSIZE_name      (gnutls_cli_opt_strs+3816)
 /** Compiled in flag settings for the recordsize option */
 #define RECORDSIZE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -865,11 +897,11 @@ static int const aListCantList[] = {
  *  disable-sni option description:
  */
 /** Descriptive text for the disable-sni option */
-#define DISABLE_SNI_DESC      (gnutls_cli_opt_strs+3635)
+#define DISABLE_SNI_DESC      (gnutls_cli_opt_strs+3827)
 /** Upper-cased name for the disable-sni option */
-#define DISABLE_SNI_NAME      (gnutls_cli_opt_strs+3678)
+#define DISABLE_SNI_NAME      (gnutls_cli_opt_strs+3870)
 /** Name string for the disable-sni option */
-#define DISABLE_SNI_name      (gnutls_cli_opt_strs+3690)
+#define DISABLE_SNI_name      (gnutls_cli_opt_strs+3882)
 /** Compiled in flag settings for the disable-sni option */
 #define DISABLE_SNI_FLAGS     (OPTST_DISABLED)
 
@@ -877,11 +909,11 @@ static int const aListCantList[] = {
  *  disable-extensions option description:
  */
 /** Descriptive text for the disable-extensions option */
-#define DISABLE_EXTENSIONS_DESC      (gnutls_cli_opt_strs+3702)
+#define DISABLE_EXTENSIONS_DESC      (gnutls_cli_opt_strs+3894)
 /** Upper-cased name for the disable-extensions option */
-#define DISABLE_EXTENSIONS_NAME      (gnutls_cli_opt_strs+3733)
+#define DISABLE_EXTENSIONS_NAME      (gnutls_cli_opt_strs+3925)
 /** Name string for the disable-extensions option */
-#define DISABLE_EXTENSIONS_name      (gnutls_cli_opt_strs+3752)
+#define DISABLE_EXTENSIONS_name      (gnutls_cli_opt_strs+3944)
 /** Compiled in flag settings for the disable-extensions option */
 #define DISABLE_EXTENSIONS_FLAGS     (OPTST_DISABLED)
 
@@ -889,11 +921,11 @@ static int const aListCantList[] = {
  *  inline-commands option description:
  */
 /** Descriptive text for the inline-commands option */
-#define INLINE_COMMANDS_DESC      (gnutls_cli_opt_strs+3771)
+#define INLINE_COMMANDS_DESC      (gnutls_cli_opt_strs+3963)
 /** Upper-cased name for the inline-commands option */
-#define INLINE_COMMANDS_NAME      (gnutls_cli_opt_strs+3807)
+#define INLINE_COMMANDS_NAME      (gnutls_cli_opt_strs+3999)
 /** Name string for the inline-commands option */
-#define INLINE_COMMANDS_name      (gnutls_cli_opt_strs+3823)
+#define INLINE_COMMANDS_name      (gnutls_cli_opt_strs+4015)
 /** Compiled in flag settings for the inline-commands option */
 #define INLINE_COMMANDS_FLAGS     (OPTST_DISABLED)
 
@@ -901,11 +933,11 @@ static int const aListCantList[] = {
  *  inline-commands-prefix option description:
  */
 /** Descriptive text for the inline-commands-prefix option */
-#define INLINE_COMMANDS_PREFIX_DESC      (gnutls_cli_opt_strs+3839)
+#define INLINE_COMMANDS_PREFIX_DESC      (gnutls_cli_opt_strs+4031)
 /** Upper-cased name for the inline-commands-prefix option */
-#define INLINE_COMMANDS_PREFIX_NAME      (gnutls_cli_opt_strs+3889)
+#define INLINE_COMMANDS_PREFIX_NAME      (gnutls_cli_opt_strs+4081)
 /** Name string for the inline-commands-prefix option */
-#define INLINE_COMMANDS_PREFIX_name      (gnutls_cli_opt_strs+3912)
+#define INLINE_COMMANDS_PREFIX_name      (gnutls_cli_opt_strs+4104)
 /** Compiled in flag settings for the inline-commands-prefix option */
 #define INLINE_COMMANDS_PREFIX_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -914,11 +946,11 @@ static int const aListCantList[] = {
  *  provider option description:
  */
 /** Descriptive text for the provider option */
-#define PROVIDER_DESC      (gnutls_cli_opt_strs+3935)
+#define PROVIDER_DESC      (gnutls_cli_opt_strs+4127)
 /** Upper-cased name for the provider option */
-#define PROVIDER_NAME      (gnutls_cli_opt_strs+3973)
+#define PROVIDER_NAME      (gnutls_cli_opt_strs+4165)
 /** Name string for the provider option */
-#define PROVIDER_name      (gnutls_cli_opt_strs+3982)
+#define PROVIDER_name      (gnutls_cli_opt_strs+4174)
 /** Compiled in flag settings for the provider option */
 #define PROVIDER_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
@@ -927,22 +959,22 @@ static int const aListCantList[] = {
  *  fips140-mode option description:
  */
 /** Descriptive text for the fips140-mode option */
-#define FIPS140_MODE_DESC      (gnutls_cli_opt_strs+3991)
+#define FIPS140_MODE_DESC      (gnutls_cli_opt_strs+4183)
 /** Upper-cased name for the fips140-mode option */
-#define FIPS140_MODE_NAME      (gnutls_cli_opt_strs+4050)
+#define FIPS140_MODE_NAME      (gnutls_cli_opt_strs+4242)
 /** Name string for the fips140-mode option */
-#define FIPS140_MODE_name      (gnutls_cli_opt_strs+4063)
+#define FIPS140_MODE_name      (gnutls_cli_opt_strs+4255)
 /** Compiled in flag settings for the fips140-mode option */
 #define FIPS140_MODE_FLAGS     (OPTST_DISABLED)
 
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (gnutls_cli_opt_strs+4076)
-#define HELP_name       (gnutls_cli_opt_strs+4120)
+#define HELP_DESC       (gnutls_cli_opt_strs+4268)
+#define HELP_name       (gnutls_cli_opt_strs+4312)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (gnutls_cli_opt_strs+4125)
-#define MORE_HELP_name  (gnutls_cli_opt_strs+4170)
+#define MORE_HELP_DESC  (gnutls_cli_opt_strs+4317)
+#define MORE_HELP_name  (gnutls_cli_opt_strs+4362)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  HELP_DESC
@@ -955,8 +987,8 @@ static int const aListCantList[] = {
 #  define VER_FLAGS     (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
                          OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
 #endif
-#define VER_DESC        (gnutls_cli_opt_strs+4180)
-#define VER_name        (gnutls_cli_opt_strs+4216)
+#define VER_DESC        (gnutls_cli_opt_strs+4372)
+#define VER_name        (gnutls_cli_opt_strs+4408)
 /**
  *  Declare option callback procedures
  */
@@ -1241,8 +1273,32 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ SAVE_OCSP_DESC, SAVE_OCSP_NAME, SAVE_OCSP_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 22, VALUE_OPT_DH_BITS,
-     /* equiv idx, value */ 22, VALUE_OPT_DH_BITS,
+  {  /* entry idx, value */ 22, VALUE_OPT_SAVE_SERVER_TRACE,
+     /* equiv idx, value */ 22, VALUE_OPT_SAVE_SERVER_TRACE,
+     /* equivalenced to  */ NO_EQUIVALENT,
+     /* min, max, act ct */ 0, 1, 0,
+     /* opt state flags  */ SAVE_SERVER_TRACE_FLAGS, 0,
+     /* last opt argumnt */ { NULL }, /* --save-server-trace */
+     /* arg list/cookie  */ NULL,
+     /* must/cannot opts */ NULL, NULL,
+     /* option proc      */ NULL,
+     /* desc, NAME, name */ SAVE_SERVER_TRACE_DESC, SAVE_SERVER_TRACE_NAME, SAVE_SERVER_TRACE_name,
+     /* disablement strs */ NULL, NULL },
+
+  {  /* entry idx, value */ 23, VALUE_OPT_SAVE_CLIENT_TRACE,
+     /* equiv idx, value */ 23, VALUE_OPT_SAVE_CLIENT_TRACE,
+     /* equivalenced to  */ NO_EQUIVALENT,
+     /* min, max, act ct */ 0, 1, 0,
+     /* opt state flags  */ SAVE_CLIENT_TRACE_FLAGS, 0,
+     /* last opt argumnt */ { NULL }, /* --save-client-trace */
+     /* arg list/cookie  */ NULL,
+     /* must/cannot opts */ NULL, NULL,
+     /* option proc      */ NULL,
+     /* desc, NAME, name */ SAVE_CLIENT_TRACE_DESC, SAVE_CLIENT_TRACE_NAME, SAVE_CLIENT_TRACE_name,
+     /* disablement strs */ NULL, NULL },
+
+  {  /* entry idx, value */ 24, VALUE_OPT_DH_BITS,
+     /* equiv idx, value */ 24, VALUE_OPT_DH_BITS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ DH_BITS_FLAGS, 0,
@@ -1253,8 +1309,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ DH_BITS_DESC, DH_BITS_NAME, DH_BITS_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 23, VALUE_OPT_PRIORITY,
-     /* equiv idx, value */ 23, VALUE_OPT_PRIORITY,
+  {  /* entry idx, value */ 25, VALUE_OPT_PRIORITY,
+     /* equiv idx, value */ 25, VALUE_OPT_PRIORITY,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PRIORITY_FLAGS, 0,
@@ -1265,8 +1321,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ PRIORITY_DESC, PRIORITY_NAME, PRIORITY_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 24, VALUE_OPT_X509CAFILE,
-     /* equiv idx, value */ 24, VALUE_OPT_X509CAFILE,
+  {  /* entry idx, value */ 26, VALUE_OPT_X509CAFILE,
+     /* equiv idx, value */ 26, VALUE_OPT_X509CAFILE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ X509CAFILE_FLAGS, 0,
@@ -1277,8 +1333,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ X509CAFILE_DESC, X509CAFILE_NAME, X509CAFILE_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 25, VALUE_OPT_X509CRLFILE,
-     /* equiv idx, value */ 25, VALUE_OPT_X509CRLFILE,
+  {  /* entry idx, value */ 27, VALUE_OPT_X509CRLFILE,
+     /* equiv idx, value */ 27, VALUE_OPT_X509CRLFILE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ X509CRLFILE_FLAGS, 0,
@@ -1289,8 +1345,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ X509CRLFILE_DESC, X509CRLFILE_NAME, X509CRLFILE_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 26, VALUE_OPT_X509KEYFILE,
-     /* equiv idx, value */ 26, VALUE_OPT_X509KEYFILE,
+  {  /* entry idx, value */ 28, VALUE_OPT_X509KEYFILE,
+     /* equiv idx, value */ 28, VALUE_OPT_X509KEYFILE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ X509KEYFILE_FLAGS, 0,
@@ -1301,8 +1357,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ X509KEYFILE_DESC, X509KEYFILE_NAME, X509KEYFILE_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 27, VALUE_OPT_X509CERTFILE,
-     /* equiv idx, value */ 27, VALUE_OPT_X509CERTFILE,
+  {  /* entry idx, value */ 29, VALUE_OPT_X509CERTFILE,
+     /* equiv idx, value */ 29, VALUE_OPT_X509CERTFILE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ X509CERTFILE_FLAGS, 0,
@@ -1313,8 +1369,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ X509CERTFILE_DESC, X509CERTFILE_NAME, X509CERTFILE_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 28, VALUE_OPT_SRPUSERNAME,
-     /* equiv idx, value */ 28, VALUE_OPT_SRPUSERNAME,
+  {  /* entry idx, value */ 30, VALUE_OPT_SRPUSERNAME,
+     /* equiv idx, value */ 30, VALUE_OPT_SRPUSERNAME,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ SRPUSERNAME_FLAGS, 0,
@@ -1325,8 +1381,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ SRPUSERNAME_DESC, SRPUSERNAME_NAME, SRPUSERNAME_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 29, VALUE_OPT_SRPPASSWD,
-     /* equiv idx, value */ 29, VALUE_OPT_SRPPASSWD,
+  {  /* entry idx, value */ 31, VALUE_OPT_SRPPASSWD,
+     /* equiv idx, value */ 31, VALUE_OPT_SRPPASSWD,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ SRPPASSWD_FLAGS, 0,
@@ -1337,8 +1393,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ SRPPASSWD_DESC, SRPPASSWD_NAME, SRPPASSWD_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 30, VALUE_OPT_PSKUSERNAME,
-     /* equiv idx, value */ 30, VALUE_OPT_PSKUSERNAME,
+  {  /* entry idx, value */ 32, VALUE_OPT_PSKUSERNAME,
+     /* equiv idx, value */ 32, VALUE_OPT_PSKUSERNAME,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PSKUSERNAME_FLAGS, 0,
@@ -1349,8 +1405,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ PSKUSERNAME_DESC, PSKUSERNAME_NAME, PSKUSERNAME_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 31, VALUE_OPT_PSKKEY,
-     /* equiv idx, value */ 31, VALUE_OPT_PSKKEY,
+  {  /* entry idx, value */ 33, VALUE_OPT_PSKKEY,
+     /* equiv idx, value */ 33, VALUE_OPT_PSKKEY,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PSKKEY_FLAGS, 0,
@@ -1361,8 +1417,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ PSKKEY_DESC, PSKKEY_NAME, PSKKEY_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 32, VALUE_OPT_PORT,
-     /* equiv idx, value */ 32, VALUE_OPT_PORT,
+  {  /* entry idx, value */ 34, VALUE_OPT_PORT,
+     /* equiv idx, value */ 34, VALUE_OPT_PORT,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PORT_FLAGS, 0,
@@ -1373,8 +1429,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ PORT_DESC, PORT_NAME, PORT_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 33, VALUE_OPT_INSECURE,
-     /* equiv idx, value */ 33, VALUE_OPT_INSECURE,
+  {  /* entry idx, value */ 35, VALUE_OPT_INSECURE,
+     /* equiv idx, value */ 35, VALUE_OPT_INSECURE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ INSECURE_FLAGS, 0,
@@ -1385,8 +1441,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ INSECURE_DESC, INSECURE_NAME, INSECURE_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 34, VALUE_OPT_VERIFY_ALLOW_BROKEN,
-     /* equiv idx, value */ 34, VALUE_OPT_VERIFY_ALLOW_BROKEN,
+  {  /* entry idx, value */ 36, VALUE_OPT_VERIFY_ALLOW_BROKEN,
+     /* equiv idx, value */ 36, VALUE_OPT_VERIFY_ALLOW_BROKEN,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ VERIFY_ALLOW_BROKEN_FLAGS, 0,
@@ -1397,8 +1453,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ VERIFY_ALLOW_BROKEN_DESC, VERIFY_ALLOW_BROKEN_NAME, VERIFY_ALLOW_BROKEN_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 35, VALUE_OPT_RANGES,
-     /* equiv idx, value */ 35, VALUE_OPT_RANGES,
+  {  /* entry idx, value */ 37, VALUE_OPT_RANGES,
+     /* equiv idx, value */ 37, VALUE_OPT_RANGES,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ RANGES_FLAGS, 0,
@@ -1409,8 +1465,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ RANGES_DESC, RANGES_NAME, RANGES_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 36, VALUE_OPT_BENCHMARK_CIPHERS,
-     /* equiv idx, value */ 36, VALUE_OPT_BENCHMARK_CIPHERS,
+  {  /* entry idx, value */ 38, VALUE_OPT_BENCHMARK_CIPHERS,
+     /* equiv idx, value */ 38, VALUE_OPT_BENCHMARK_CIPHERS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ BENCHMARK_CIPHERS_FLAGS, 0,
@@ -1421,8 +1477,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ BENCHMARK_CIPHERS_DESC, BENCHMARK_CIPHERS_NAME, BENCHMARK_CIPHERS_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 37, VALUE_OPT_BENCHMARK_TLS_KX,
-     /* equiv idx, value */ 37, VALUE_OPT_BENCHMARK_TLS_KX,
+  {  /* entry idx, value */ 39, VALUE_OPT_BENCHMARK_TLS_KX,
+     /* equiv idx, value */ 39, VALUE_OPT_BENCHMARK_TLS_KX,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ BENCHMARK_TLS_KX_FLAGS, 0,
@@ -1433,8 +1489,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ BENCHMARK_TLS_KX_DESC, BENCHMARK_TLS_KX_NAME, BENCHMARK_TLS_KX_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 38, VALUE_OPT_BENCHMARK_TLS_CIPHERS,
-     /* equiv idx, value */ 38, VALUE_OPT_BENCHMARK_TLS_CIPHERS,
+  {  /* entry idx, value */ 40, VALUE_OPT_BENCHMARK_TLS_CIPHERS,
+     /* equiv idx, value */ 40, VALUE_OPT_BENCHMARK_TLS_CIPHERS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ BENCHMARK_TLS_CIPHERS_FLAGS, 0,
@@ -1445,8 +1501,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ BENCHMARK_TLS_CIPHERS_DESC, BENCHMARK_TLS_CIPHERS_NAME, BENCHMARK_TLS_CIPHERS_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 39, VALUE_OPT_LIST,
-     /* equiv idx, value */ 39, VALUE_OPT_LIST,
+  {  /* entry idx, value */ 41, VALUE_OPT_LIST,
+     /* equiv idx, value */ 41, VALUE_OPT_LIST,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ LIST_FLAGS, 0,
@@ -1457,8 +1513,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ LIST_DESC, LIST_NAME, LIST_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 40, VALUE_OPT_PRIORITY_LIST,
-     /* equiv idx, value */ 40, VALUE_OPT_PRIORITY_LIST,
+  {  /* entry idx, value */ 42, VALUE_OPT_PRIORITY_LIST,
+     /* equiv idx, value */ 42, VALUE_OPT_PRIORITY_LIST,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PRIORITY_LIST_FLAGS, 0,
@@ -1469,8 +1525,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ PRIORITY_LIST_DESC, PRIORITY_LIST_NAME, PRIORITY_LIST_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 41, VALUE_OPT_NOTICKET,
-     /* equiv idx, value */ 41, VALUE_OPT_NOTICKET,
+  {  /* entry idx, value */ 43, VALUE_OPT_NOTICKET,
+     /* equiv idx, value */ 43, VALUE_OPT_NOTICKET,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ NOTICKET_FLAGS, 0,
@@ -1481,8 +1537,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ NOTICKET_DESC, NOTICKET_NAME, NOTICKET_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 42, VALUE_OPT_SRTP_PROFILES,
-     /* equiv idx, value */ 42, VALUE_OPT_SRTP_PROFILES,
+  {  /* entry idx, value */ 44, VALUE_OPT_SRTP_PROFILES,
+     /* equiv idx, value */ 44, VALUE_OPT_SRTP_PROFILES,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ SRTP_PROFILES_FLAGS, 0,
@@ -1493,8 +1549,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ SRTP_PROFILES_DESC, SRTP_PROFILES_NAME, SRTP_PROFILES_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 43, VALUE_OPT_ALPN,
-     /* equiv idx, value */ 43, VALUE_OPT_ALPN,
+  {  /* entry idx, value */ 45, VALUE_OPT_ALPN,
+     /* equiv idx, value */ 45, VALUE_OPT_ALPN,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, NOLIMIT, 0,
      /* opt state flags  */ ALPN_FLAGS, 0,
@@ -1505,8 +1561,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ ALPN_DESC, ALPN_NAME, ALPN_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 44, VALUE_OPT_HEARTBEAT,
-     /* equiv idx, value */ 44, VALUE_OPT_HEARTBEAT,
+  {  /* entry idx, value */ 46, VALUE_OPT_HEARTBEAT,
+     /* equiv idx, value */ 46, VALUE_OPT_HEARTBEAT,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ HEARTBEAT_FLAGS, 0,
@@ -1517,8 +1573,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ HEARTBEAT_DESC, HEARTBEAT_NAME, HEARTBEAT_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 45, VALUE_OPT_RECORDSIZE,
-     /* equiv idx, value */ 45, VALUE_OPT_RECORDSIZE,
+  {  /* entry idx, value */ 47, VALUE_OPT_RECORDSIZE,
+     /* equiv idx, value */ 47, VALUE_OPT_RECORDSIZE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ RECORDSIZE_FLAGS, 0,
@@ -1529,8 +1585,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ RECORDSIZE_DESC, RECORDSIZE_NAME, RECORDSIZE_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 46, VALUE_OPT_DISABLE_SNI,
-     /* equiv idx, value */ 46, VALUE_OPT_DISABLE_SNI,
+  {  /* entry idx, value */ 48, VALUE_OPT_DISABLE_SNI,
+     /* equiv idx, value */ 48, VALUE_OPT_DISABLE_SNI,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ DISABLE_SNI_FLAGS, 0,
@@ -1541,8 +1597,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ DISABLE_SNI_DESC, DISABLE_SNI_NAME, DISABLE_SNI_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 47, VALUE_OPT_DISABLE_EXTENSIONS,
-     /* equiv idx, value */ 47, VALUE_OPT_DISABLE_EXTENSIONS,
+  {  /* entry idx, value */ 49, VALUE_OPT_DISABLE_EXTENSIONS,
+     /* equiv idx, value */ 49, VALUE_OPT_DISABLE_EXTENSIONS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ DISABLE_EXTENSIONS_FLAGS, 0,
@@ -1553,8 +1609,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ DISABLE_EXTENSIONS_DESC, DISABLE_EXTENSIONS_NAME, DISABLE_EXTENSIONS_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 48, VALUE_OPT_INLINE_COMMANDS,
-     /* equiv idx, value */ 48, VALUE_OPT_INLINE_COMMANDS,
+  {  /* entry idx, value */ 50, VALUE_OPT_INLINE_COMMANDS,
+     /* equiv idx, value */ 50, VALUE_OPT_INLINE_COMMANDS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ INLINE_COMMANDS_FLAGS, 0,
@@ -1565,8 +1621,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ INLINE_COMMANDS_DESC, INLINE_COMMANDS_NAME, INLINE_COMMANDS_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 49, VALUE_OPT_INLINE_COMMANDS_PREFIX,
-     /* equiv idx, value */ 49, VALUE_OPT_INLINE_COMMANDS_PREFIX,
+  {  /* entry idx, value */ 51, VALUE_OPT_INLINE_COMMANDS_PREFIX,
+     /* equiv idx, value */ 51, VALUE_OPT_INLINE_COMMANDS_PREFIX,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ INLINE_COMMANDS_PREFIX_FLAGS, 0,
@@ -1577,8 +1633,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ INLINE_COMMANDS_PREFIX_DESC, INLINE_COMMANDS_PREFIX_NAME, INLINE_COMMANDS_PREFIX_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 50, VALUE_OPT_PROVIDER,
-     /* equiv idx, value */ 50, VALUE_OPT_PROVIDER,
+  {  /* entry idx, value */ 52, VALUE_OPT_PROVIDER,
+     /* equiv idx, value */ 52, VALUE_OPT_PROVIDER,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PROVIDER_FLAGS, 0,
@@ -1589,8 +1645,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ PROVIDER_DESC, PROVIDER_NAME, PROVIDER_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 51, VALUE_OPT_FIPS140_MODE,
-     /* equiv idx, value */ 51, VALUE_OPT_FIPS140_MODE,
+  {  /* entry idx, value */ 53, VALUE_OPT_FIPS140_MODE,
+     /* equiv idx, value */ 53, VALUE_OPT_FIPS140_MODE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ FIPS140_MODE_FLAGS, 0,
@@ -1643,21 +1699,21 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** Reference to the upper cased version of gnutls-cli. */
-#define zPROGNAME       (gnutls_cli_opt_strs+4224)
+#define zPROGNAME       (gnutls_cli_opt_strs+4416)
 /** Reference to the title line for gnutls-cli usage. */
-#define zUsageTitle     (gnutls_cli_opt_strs+4235)
+#define zUsageTitle     (gnutls_cli_opt_strs+4427)
 /** There is no gnutls-cli configuration file. */
 #define zRcName         NULL
 /** There are no directories to search for gnutls-cli config files. */
 #define apzHomeList     NULL
 /** The gnutls-cli program bug email address. */
-#define zBugsAddr       (gnutls_cli_opt_strs+4331)
+#define zBugsAddr       (gnutls_cli_opt_strs+4523)
 /** Clarification/explanation of what gnutls-cli does. */
-#define zExplain        (gnutls_cli_opt_strs+4351)
+#define zExplain        (gnutls_cli_opt_strs+4543)
 /** Extra detail explaining what gnutls-cli does. */
-#define zDetail         (gnutls_cli_opt_strs+4353)
+#define zDetail         (gnutls_cli_opt_strs+4545)
 /** The full version string for gnutls-cli. */
-#define zFullVersion    (gnutls_cli_opt_strs+4536)
+#define zFullVersion    (gnutls_cli_opt_strs+4728)
 /* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
@@ -1669,7 +1725,7 @@ static tOptDesc optDesc[OPTION_CT] = {
 #endif /* ENABLE_NLS */
 
 #define gnutls_cli_full_usage (NULL)
-#define gnutls_cli_short_usage (gnutls_cli_opt_strs+4557)
+#define gnutls_cli_short_usage (gnutls_cli_opt_strs+4749)
 
 #endif /* not defined __doxygen__ */
 
@@ -1928,7 +1984,7 @@ tOptions gnutls_cliOptions = {
       NO_EQUIVALENT, /* '-#' option index */
       NO_EQUIVALENT /* index of default opt */
     },
-    55 /* full option count */, 52 /* user option count */,
+    57 /* full option count */, 54 /* user option count */,
     gnutls_cli_full_usage, gnutls_cli_short_usage,
     NULL, NULL,
     PKGDATADIR, gnutls_cli_packager_info
@@ -2149,6 +2205,12 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.\n"));
   puts(_("Save the peer's OCSP status response in the provided file"));
 
   /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+  puts(_("Save the server-side TLS message trace in the provided file"));
+
+  /* referenced via gnutls_cliOptions.pOptDesc->pzText */
+  puts(_("Save the client-side TLS message trace in the provided file"));
+
+  /* referenced via gnutls_cliOptions.pOptDesc->pzText */
   puts(_("The minimum number of bits allowed for DH"));
 
   /* referenced via gnutls_cliOptions.pOptDesc->pzText */
diff --git a/src/cli-args.h.bak b/src/cli-args.h.bak
index 83ef522baf..d76804c8e9 100644
--- a/src/cli-args.h.bak
+++ b/src/cli-args.h.bak
@@ -88,42 +88,44 @@ typedef enum {
     INDEX_OPT_PRINT_CERT              = 19,
     INDEX_OPT_SAVE_CERT               = 20,
     INDEX_OPT_SAVE_OCSP               = 21,
-    INDEX_OPT_DH_BITS                 = 22,
-    INDEX_OPT_PRIORITY                = 23,
-    INDEX_OPT_X509CAFILE              = 24,
-    INDEX_OPT_X509CRLFILE             = 25,
-    INDEX_OPT_X509KEYFILE             = 26,
-    INDEX_OPT_X509CERTFILE            = 27,
-    INDEX_OPT_SRPUSERNAME             = 28,
-    INDEX_OPT_SRPPASSWD               = 29,
-    INDEX_OPT_PSKUSERNAME             = 30,
-    INDEX_OPT_PSKKEY                  = 31,
-    INDEX_OPT_PORT                    = 32,
-    INDEX_OPT_INSECURE                = 33,
-    INDEX_OPT_VERIFY_ALLOW_BROKEN     = 34,
-    INDEX_OPT_RANGES                  = 35,
-    INDEX_OPT_BENCHMARK_CIPHERS       = 36,
-    INDEX_OPT_BENCHMARK_TLS_KX        = 37,
-    INDEX_OPT_BENCHMARK_TLS_CIPHERS   = 38,
-    INDEX_OPT_LIST                    = 39,
-    INDEX_OPT_PRIORITY_LIST           = 40,
-    INDEX_OPT_NOTICKET                = 41,
-    INDEX_OPT_SRTP_PROFILES           = 42,
-    INDEX_OPT_ALPN                    = 43,
-    INDEX_OPT_HEARTBEAT               = 44,
-    INDEX_OPT_RECORDSIZE              = 45,
-    INDEX_OPT_DISABLE_SNI             = 46,
-    INDEX_OPT_DISABLE_EXTENSIONS      = 47,
-    INDEX_OPT_INLINE_COMMANDS         = 48,
-    INDEX_OPT_INLINE_COMMANDS_PREFIX  = 49,
-    INDEX_OPT_PROVIDER                = 50,
-    INDEX_OPT_FIPS140_MODE            = 51,
-    INDEX_OPT_VERSION                 = 52,
-    INDEX_OPT_HELP                    = 53,
-    INDEX_OPT_MORE_HELP               = 54
+    INDEX_OPT_SAVE_SERVER_TRACE       = 22,
+    INDEX_OPT_SAVE_CLIENT_TRACE       = 23,
+    INDEX_OPT_DH_BITS                 = 24,
+    INDEX_OPT_PRIORITY                = 25,
+    INDEX_OPT_X509CAFILE              = 26,
+    INDEX_OPT_X509CRLFILE             = 27,
+    INDEX_OPT_X509KEYFILE             = 28,
+    INDEX_OPT_X509CERTFILE            = 29,
+    INDEX_OPT_SRPUSERNAME             = 30,
+    INDEX_OPT_SRPPASSWD               = 31,
+    INDEX_OPT_PSKUSERNAME             = 32,
+    INDEX_OPT_PSKKEY                  = 33,
+    INDEX_OPT_PORT                    = 34,
+    INDEX_OPT_INSECURE                = 35,
+    INDEX_OPT_VERIFY_ALLOW_BROKEN     = 36,
+    INDEX_OPT_RANGES                  = 37,
+    INDEX_OPT_BENCHMARK_CIPHERS       = 38,
+    INDEX_OPT_BENCHMARK_TLS_KX        = 39,
+    INDEX_OPT_BENCHMARK_TLS_CIPHERS   = 40,
+    INDEX_OPT_LIST                    = 41,
+    INDEX_OPT_PRIORITY_LIST           = 42,
+    INDEX_OPT_NOTICKET                = 43,
+    INDEX_OPT_SRTP_PROFILES           = 44,
+    INDEX_OPT_ALPN                    = 45,
+    INDEX_OPT_HEARTBEAT               = 46,
+    INDEX_OPT_RECORDSIZE              = 47,
+    INDEX_OPT_DISABLE_SNI             = 48,
+    INDEX_OPT_DISABLE_EXTENSIONS      = 49,
+    INDEX_OPT_INLINE_COMMANDS         = 50,
+    INDEX_OPT_INLINE_COMMANDS_PREFIX  = 51,
+    INDEX_OPT_PROVIDER                = 52,
+    INDEX_OPT_FIPS140_MODE            = 53,
+    INDEX_OPT_VERSION                 = 54,
+    INDEX_OPT_HELP                    = 55,
+    INDEX_OPT_MORE_HELP               = 56
 } teOptIndex;
 /** count of all options for gnutls-cli */
-#define OPTION_CT    55
+#define OPTION_CT    57
 /** gnutls-cli version */
 #define GNUTLS_CLI_VERSION       "@VERSION@"
 /** Full gnutls-cli version text */
@@ -204,40 +206,42 @@ typedef enum {
 #define VALUE_OPT_PRINT_CERT     0x100E
 #define VALUE_OPT_SAVE_CERT      0x100F
 #define VALUE_OPT_SAVE_OCSP      0x1010
-#define VALUE_OPT_DH_BITS        0x1011
+#define VALUE_OPT_SAVE_SERVER_TRACE 0x1011
+#define VALUE_OPT_SAVE_CLIENT_TRACE 0x1012
+#define VALUE_OPT_DH_BITS        0x1013
 
 #define OPT_VALUE_DH_BITS        (DESC(DH_BITS).optArg.argInt)
-#define VALUE_OPT_PRIORITY       0x1012
-#define VALUE_OPT_X509CAFILE     0x1013
-#define VALUE_OPT_X509CRLFILE    0x1014
-#define VALUE_OPT_X509KEYFILE    0x1015
-#define VALUE_OPT_X509CERTFILE   0x1016
-#define VALUE_OPT_SRPUSERNAME    0x1017
-#define VALUE_OPT_SRPPASSWD      0x1018
-#define VALUE_OPT_PSKUSERNAME    0x1019
-#define VALUE_OPT_PSKKEY         0x101A
+#define VALUE_OPT_PRIORITY       0x1014
+#define VALUE_OPT_X509CAFILE     0x1015
+#define VALUE_OPT_X509CRLFILE    0x1016
+#define VALUE_OPT_X509KEYFILE    0x1017
+#define VALUE_OPT_X509CERTFILE   0x1018
+#define VALUE_OPT_SRPUSERNAME    0x1019
+#define VALUE_OPT_SRPPASSWD      0x101A
+#define VALUE_OPT_PSKUSERNAME    0x101B
+#define VALUE_OPT_PSKKEY         0x101C
 #define VALUE_OPT_PORT           'p'
-#define VALUE_OPT_INSECURE       0x101B
-#define VALUE_OPT_VERIFY_ALLOW_BROKEN 0x101C
-#define VALUE_OPT_RANGES         0x101D
-#define VALUE_OPT_BENCHMARK_CIPHERS 0x101E
-#define VALUE_OPT_BENCHMARK_TLS_KX 0x101F
-#define VALUE_OPT_BENCHMARK_TLS_CIPHERS 0x1020
+#define VALUE_OPT_INSECURE       0x101D
+#define VALUE_OPT_VERIFY_ALLOW_BROKEN 0x101E
+#define VALUE_OPT_RANGES         0x101F
+#define VALUE_OPT_BENCHMARK_CIPHERS 0x1020
+#define VALUE_OPT_BENCHMARK_TLS_KX 0x1021
+#define VALUE_OPT_BENCHMARK_TLS_CIPHERS 0x1022
 #define VALUE_OPT_LIST           'l'
-#define VALUE_OPT_PRIORITY_LIST  0x1021
-#define VALUE_OPT_NOTICKET       0x1022
-#define VALUE_OPT_SRTP_PROFILES  0x1023
-#define VALUE_OPT_ALPN           0x1024
+#define VALUE_OPT_PRIORITY_LIST  0x1023
+#define VALUE_OPT_NOTICKET       0x1024
+#define VALUE_OPT_SRTP_PROFILES  0x1025
+#define VALUE_OPT_ALPN           0x1026
 #define VALUE_OPT_HEARTBEAT      'b'
-#define VALUE_OPT_RECORDSIZE     0x1025
+#define VALUE_OPT_RECORDSIZE     0x1027
 
 #define OPT_VALUE_RECORDSIZE     (DESC(RECORDSIZE).optArg.argInt)
-#define VALUE_OPT_DISABLE_SNI    0x1026
-#define VALUE_OPT_DISABLE_EXTENSIONS 0x1027
-#define VALUE_OPT_INLINE_COMMANDS 0x1028
-#define VALUE_OPT_INLINE_COMMANDS_PREFIX 0x1029
-#define VALUE_OPT_PROVIDER       0x102A
-#define VALUE_OPT_FIPS140_MODE   0x102B
+#define VALUE_OPT_DISABLE_SNI    0x1028
+#define VALUE_OPT_DISABLE_EXTENSIONS 0x1029
+#define VALUE_OPT_INLINE_COMMANDS 0x102A
+#define VALUE_OPT_INLINE_COMMANDS_PREFIX 0x102B
+#define VALUE_OPT_PROVIDER       0x102C
+#define VALUE_OPT_FIPS140_MODE   0x102D
 /** option flag (value) for help-value option */
 #define VALUE_OPT_HELP          'h'
 /** option flag (value) for more-help-value option */