The status-request option was eliminated. Check OCSP only when the status response in the handshake was invalid.

4 files changed, 340 insertions, 379 deletions

diff --git a/src/cli-args.c b/src/cli-args.c
index 1a9efa93f4..065894cf26 100644
--- a/src/cli-args.c
+++ b/src/cli-args.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (cli-args.c)
  *  
- *  It has been AutoGen-ed  November  8, 2012 at 11:35:50 PM by AutoGen 5.16
+ *  It has been AutoGen-ed  November  9, 2012 at 05:12:10 PM by AutoGen 5.16
  *  From the definitions    cli-args.def
  *  and the template file   options
  *
@@ -67,7 +67,7 @@ extern FILE * option_usage_fp;
 /*
  *  gnutls-cli option static const strings
  */
-static char const gnutls_cli_opt_strs[3856] =
+static char const gnutls_cli_opt_strs[3786] =
 /*     0 */ "gnutls-cli @VERSION@\n"
             "Copyright (C) 2000-2012 Free Software Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
@@ -118,119 +118,116 @@ static char const gnutls_cli_opt_strs[3856] =
 /*  1415 */ "Don't accept session tickets\0"
 /*  1444 */ "NOTICKET\0"
 /*  1453 */ "noticket\0"
-/*  1462 */ "Enable OCSP status request\0"
-/*  1489 */ "OCSP_STATUS_REQUEST\0"
-/*  1509 */ "no-ocsp-status-request\0"
-/*  1532 */ "Connect, establish a plain session and start TLS.\0"
-/*  1582 */ "STARTTLS\0"
-/*  1591 */ "starttls\0"
-/*  1600 */ "Use DTLS (datagram TLS) over UDP\0"
-/*  1633 */ "UDP\0"
-/*  1637 */ "udp\0"
-/*  1641 */ "Set MTU for datagram TLS\0"
-/*  1666 */ "MTU\0"
-/*  1670 */ "mtu\0"
-/*  1674 */ "Offer SRTP profiles\0"
-/*  1694 */ "SRTP_PROFILES\0"
-/*  1708 */ "srtp-profiles\0"
-/*  1722 */ "Send CR LF instead of LF\0"
-/*  1747 */ "CRLF\0"
-/*  1752 */ "crlf\0"
-/*  1757 */ "Use DER format for certificates to read from\0"
-/*  1802 */ "X509FMTDER\0"
-/*  1813 */ "x509fmtder\0"
-/*  1824 */ "Send the openpgp fingerprint, instead of the key\0"
-/*  1873 */ "FINGERPRINT\0"
-/*  1885 */ "fingerprint\0"
-/*  1897 */ "Disable all the TLS extensions\0"
-/*  1928 */ "DISABLE_EXTENSIONS\0"
-/*  1947 */ "disable-extensions\0"
-/*  1966 */ "Print peer's certificate in PEM format\0"
-/*  2005 */ "PRINT_CERT\0"
-/*  2016 */ "print-cert\0"
-/*  2027 */ "The maximum record size to advertize\0"
-/*  2064 */ "RECORDSIZE\0"
-/*  2075 */ "recordsize\0"
-/*  2086 */ "The minimum number of bits allowed for DH\0"
-/*  2128 */ "DH_BITS\0"
-/*  2136 */ "dh-bits\0"
-/*  2144 */ "Priorities string\0"
-/*  2162 */ "PRIORITY\0"
-/*  2171 */ "priority\0"
-/*  2180 */ "Certificate file or PKCS #11 URL to use\0"
-/*  2220 */ "X509CAFILE\0"
-/*  2231 */ "x509cafile\0"
-/*  2242 */ "CRL file to use\0"
-/*  2258 */ "X509CRLFILE\0"
-/*  2270 */ "x509crlfile\0"
-/*  2282 */ "PGP Key file to use\0"
-/*  2302 */ "PGPKEYFILE\0"
-/*  2313 */ "pgpkeyfile\0"
-/*  2324 */ "PGP Key ring file to use\0"
-/*  2349 */ "PGPKEYRING\0"
-/*  2360 */ "pgpkeyring\0"
-/*  2371 */ "PGP Public Key (certificate) file to use\0"
-/*  2412 */ "PGPCERTFILE\0"
-/*  2424 */ "pgpcertfile\0"
-/*  2436 */ "X.509 key file or PKCS #11 URL to use\0"
-/*  2474 */ "X509KEYFILE\0"
-/*  2486 */ "x509keyfile\0"
-/*  2498 */ "X.509 Certificate file or PKCS #11 URL to use\0"
-/*  2544 */ "X509CERTFILE\0"
-/*  2557 */ "x509certfile\0"
-/*  2570 */ "PGP subkey to use (hex or auto)\0"
-/*  2602 */ "PGPSUBKEY\0"
-/*  2612 */ "pgpsubkey\0"
-/*  2622 */ "SRP username to use\0"
-/*  2642 */ "SRPUSERNAME\0"
-/*  2654 */ "srpusername\0"
-/*  2666 */ "SRP password to use\0"
-/*  2686 */ "SRPPASSWD\0"
-/*  2696 */ "srppasswd\0"
-/*  2706 */ "PSK username to use\0"
-/*  2726 */ "PSKUSERNAME\0"
-/*  2738 */ "pskusername\0"
-/*  2750 */ "PSK key (in hex) to use\0"
-/*  2774 */ "PSKKEY\0"
-/*  2781 */ "pskkey\0"
-/*  2788 */ "The port or service to connect to\0"
-/*  2822 */ "PORT\0"
-/*  2827 */ "port\0"
-/*  2832 */ "Don't abort program if server certificate can't be validated\0"
-/*  2893 */ "INSECURE\0"
-/*  2902 */ "insecure\0"
-/*  2911 */ "Benchmark individual ciphers\0"
-/*  2940 */ "BENCHMARK_CIPHERS\0"
-/*  2958 */ "benchmark-ciphers\0"
-/*  2976 */ "Benchmark individual software ciphers (no hw acceleration)\0"
-/*  3035 */ "BENCHMARK_SOFT_CIPHERS\0"
-/*  3058 */ "benchmark-soft-ciphers\0"
-/*  3081 */ "Benchmark TLS key exchange methods\0"
-/*  3116 */ "BENCHMARK_TLS_KX\0"
-/*  3133 */ "benchmark-tls-kx\0"
-/*  3150 */ "Benchmark TLS ciphers\0"
-/*  3172 */ "BENCHMARK_TLS_CIPHERS\0"
-/*  3194 */ "benchmark-tls-ciphers\0"
-/*  3216 */ "Print a list of the supported algorithms and modes\0"
-/*  3267 */ "LIST\0"
-/*  3272 */ "list\0"
-/*  3277 */ "Display extended usage information and exit\0"
-/*  3321 */ "help\0"
-/*  3326 */ "Extended usage information passed thru pager\0"
-/*  3371 */ "more-help\0"
-/*  3381 */ "Output version information and exit\0"
-/*  3417 */ "version\0"
-/*  3425 */ "GNUTLS_CLI\0"
-/*  3436 */ "gnutls-cli - GnuTLS client - Ver. @VERSION@\n"
+/*  1462 */ "Connect, establish a plain session and start TLS.\0"
+/*  1512 */ "STARTTLS\0"
+/*  1521 */ "starttls\0"
+/*  1530 */ "Use DTLS (datagram TLS) over UDP\0"
+/*  1563 */ "UDP\0"
+/*  1567 */ "udp\0"
+/*  1571 */ "Set MTU for datagram TLS\0"
+/*  1596 */ "MTU\0"
+/*  1600 */ "mtu\0"
+/*  1604 */ "Offer SRTP profiles\0"
+/*  1624 */ "SRTP_PROFILES\0"
+/*  1638 */ "srtp-profiles\0"
+/*  1652 */ "Send CR LF instead of LF\0"
+/*  1677 */ "CRLF\0"
+/*  1682 */ "crlf\0"
+/*  1687 */ "Use DER format for certificates to read from\0"
+/*  1732 */ "X509FMTDER\0"
+/*  1743 */ "x509fmtder\0"
+/*  1754 */ "Send the openpgp fingerprint, instead of the key\0"
+/*  1803 */ "FINGERPRINT\0"
+/*  1815 */ "fingerprint\0"
+/*  1827 */ "Disable all the TLS extensions\0"
+/*  1858 */ "DISABLE_EXTENSIONS\0"
+/*  1877 */ "disable-extensions\0"
+/*  1896 */ "Print peer's certificate in PEM format\0"
+/*  1935 */ "PRINT_CERT\0"
+/*  1946 */ "print-cert\0"
+/*  1957 */ "The maximum record size to advertize\0"
+/*  1994 */ "RECORDSIZE\0"
+/*  2005 */ "recordsize\0"
+/*  2016 */ "The minimum number of bits allowed for DH\0"
+/*  2058 */ "DH_BITS\0"
+/*  2066 */ "dh-bits\0"
+/*  2074 */ "Priorities string\0"
+/*  2092 */ "PRIORITY\0"
+/*  2101 */ "priority\0"
+/*  2110 */ "Certificate file or PKCS #11 URL to use\0"
+/*  2150 */ "X509CAFILE\0"
+/*  2161 */ "x509cafile\0"
+/*  2172 */ "CRL file to use\0"
+/*  2188 */ "X509CRLFILE\0"
+/*  2200 */ "x509crlfile\0"
+/*  2212 */ "PGP Key file to use\0"
+/*  2232 */ "PGPKEYFILE\0"
+/*  2243 */ "pgpkeyfile\0"
+/*  2254 */ "PGP Key ring file to use\0"
+/*  2279 */ "PGPKEYRING\0"
+/*  2290 */ "pgpkeyring\0"
+/*  2301 */ "PGP Public Key (certificate) file to use\0"
+/*  2342 */ "PGPCERTFILE\0"
+/*  2354 */ "pgpcertfile\0"
+/*  2366 */ "X.509 key file or PKCS #11 URL to use\0"
+/*  2404 */ "X509KEYFILE\0"
+/*  2416 */ "x509keyfile\0"
+/*  2428 */ "X.509 Certificate file or PKCS #11 URL to use\0"
+/*  2474 */ "X509CERTFILE\0"
+/*  2487 */ "x509certfile\0"
+/*  2500 */ "PGP subkey to use (hex or auto)\0"
+/*  2532 */ "PGPSUBKEY\0"
+/*  2542 */ "pgpsubkey\0"
+/*  2552 */ "SRP username to use\0"
+/*  2572 */ "SRPUSERNAME\0"
+/*  2584 */ "srpusername\0"
+/*  2596 */ "SRP password to use\0"
+/*  2616 */ "SRPPASSWD\0"
+/*  2626 */ "srppasswd\0"
+/*  2636 */ "PSK username to use\0"
+/*  2656 */ "PSKUSERNAME\0"
+/*  2668 */ "pskusername\0"
+/*  2680 */ "PSK key (in hex) to use\0"
+/*  2704 */ "PSKKEY\0"
+/*  2711 */ "pskkey\0"
+/*  2718 */ "The port or service to connect to\0"
+/*  2752 */ "PORT\0"
+/*  2757 */ "port\0"
+/*  2762 */ "Don't abort program if server certificate can't be validated\0"
+/*  2823 */ "INSECURE\0"
+/*  2832 */ "insecure\0"
+/*  2841 */ "Benchmark individual ciphers\0"
+/*  2870 */ "BENCHMARK_CIPHERS\0"
+/*  2888 */ "benchmark-ciphers\0"
+/*  2906 */ "Benchmark individual software ciphers (no hw acceleration)\0"
+/*  2965 */ "BENCHMARK_SOFT_CIPHERS\0"
+/*  2988 */ "benchmark-soft-ciphers\0"
+/*  3011 */ "Benchmark TLS key exchange methods\0"
+/*  3046 */ "BENCHMARK_TLS_KX\0"
+/*  3063 */ "benchmark-tls-kx\0"
+/*  3080 */ "Benchmark TLS ciphers\0"
+/*  3102 */ "BENCHMARK_TLS_CIPHERS\0"
+/*  3124 */ "benchmark-tls-ciphers\0"
+/*  3146 */ "Print a list of the supported algorithms and modes\0"
+/*  3197 */ "LIST\0"
+/*  3202 */ "list\0"
+/*  3207 */ "Display extended usage information and exit\0"
+/*  3251 */ "help\0"
+/*  3256 */ "Extended usage information passed thru pager\0"
+/*  3301 */ "more-help\0"
+/*  3311 */ "Output version information and exit\0"
+/*  3347 */ "version\0"
+/*  3355 */ "GNUTLS_CLI\0"
+/*  3366 */ "gnutls-cli - GnuTLS client - Ver. @VERSION@\n"
             "USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [hostname]\n\0"
-/*  3549 */ "bug-gnutls@gnu.org\0"
-/*  3568 */ "\n\n\0"
-/*  3571 */ "\n"
+/*  3479 */ "bug-gnutls@gnu.org\0"
+/*  3498 */ "\n\n\0"
+/*  3501 */ "\n"
             "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"
-/*  3755 */ "gnutls-cli @VERSION@\0"
-/*  3776 */ "Usage: gnutls-cli [options] hostname\n"
+/*  3685 */ "gnutls-cli @VERSION@\0"
+/*  3706 */ "Usage: gnutls-cli [options] hostname\n"
             "gnutls-cli --help for usage instructions.\n";
 
 /*
@@ -333,289 +330,279 @@ static char const gnutls_cli_opt_strs[3856] =
 #define NOTICKET_FLAGS     (OPTST_DISABLED)
 
 /*
- *  ocsp-status-request option description:
- */
-#define OCSP_STATUS_REQUEST_DESC      (gnutls_cli_opt_strs+1462)
-#define OCSP_STATUS_REQUEST_NAME      (gnutls_cli_opt_strs+1489)
-#define NOT_OCSP_STATUS_REQUEST_name  (gnutls_cli_opt_strs+1509)
-#define NOT_OCSP_STATUS_REQUEST_PFX   (gnutls_cli_opt_strs+1010)
-#define OCSP_STATUS_REQUEST_name      (NOT_OCSP_STATUS_REQUEST_name + 3)
-#define OCSP_STATUS_REQUEST_FLAGS     (OPTST_INITENABLED)
-
-/*
  *  starttls option description:
  */
-#define STARTTLS_DESC      (gnutls_cli_opt_strs+1532)
-#define STARTTLS_NAME      (gnutls_cli_opt_strs+1582)
-#define STARTTLS_name      (gnutls_cli_opt_strs+1591)
+#define STARTTLS_DESC      (gnutls_cli_opt_strs+1462)
+#define STARTTLS_NAME      (gnutls_cli_opt_strs+1512)
+#define STARTTLS_name      (gnutls_cli_opt_strs+1521)
 #define STARTTLS_FLAGS     (OPTST_DISABLED)
 
 /*
  *  udp option description:
  */
-#define UDP_DESC      (gnutls_cli_opt_strs+1600)
-#define UDP_NAME      (gnutls_cli_opt_strs+1633)
-#define UDP_name      (gnutls_cli_opt_strs+1637)
+#define UDP_DESC      (gnutls_cli_opt_strs+1530)
+#define UDP_NAME      (gnutls_cli_opt_strs+1563)
+#define UDP_name      (gnutls_cli_opt_strs+1567)
 #define UDP_FLAGS     (OPTST_DISABLED)
 
 /*
  *  mtu option description:
  */
-#define MTU_DESC      (gnutls_cli_opt_strs+1641)
-#define MTU_NAME      (gnutls_cli_opt_strs+1666)
-#define MTU_name      (gnutls_cli_opt_strs+1670)
+#define MTU_DESC      (gnutls_cli_opt_strs+1571)
+#define MTU_NAME      (gnutls_cli_opt_strs+1596)
+#define MTU_name      (gnutls_cli_opt_strs+1600)
 #define MTU_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
 /*
  *  srtp_profiles option description:
  */
-#define SRTP_PROFILES_DESC      (gnutls_cli_opt_strs+1674)
-#define SRTP_PROFILES_NAME      (gnutls_cli_opt_strs+1694)
-#define SRTP_PROFILES_name      (gnutls_cli_opt_strs+1708)
+#define SRTP_PROFILES_DESC      (gnutls_cli_opt_strs+1604)
+#define SRTP_PROFILES_NAME      (gnutls_cli_opt_strs+1624)
+#define SRTP_PROFILES_name      (gnutls_cli_opt_strs+1638)
 #define SRTP_PROFILES_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  crlf option description:
  */
-#define CRLF_DESC      (gnutls_cli_opt_strs+1722)
-#define CRLF_NAME      (gnutls_cli_opt_strs+1747)
-#define CRLF_name      (gnutls_cli_opt_strs+1752)
+#define CRLF_DESC      (gnutls_cli_opt_strs+1652)
+#define CRLF_NAME      (gnutls_cli_opt_strs+1677)
+#define CRLF_name      (gnutls_cli_opt_strs+1682)
 #define CRLF_FLAGS     (OPTST_DISABLED)
 
 /*
  *  x509fmtder option description:
  */
-#define X509FMTDER_DESC      (gnutls_cli_opt_strs+1757)
-#define X509FMTDER_NAME      (gnutls_cli_opt_strs+1802)
-#define X509FMTDER_name      (gnutls_cli_opt_strs+1813)
+#define X509FMTDER_DESC      (gnutls_cli_opt_strs+1687)
+#define X509FMTDER_NAME      (gnutls_cli_opt_strs+1732)
+#define X509FMTDER_name      (gnutls_cli_opt_strs+1743)
 #define X509FMTDER_FLAGS     (OPTST_DISABLED)
 
 /*
  *  fingerprint option description:
  */
-#define FINGERPRINT_DESC      (gnutls_cli_opt_strs+1824)
-#define FINGERPRINT_NAME      (gnutls_cli_opt_strs+1873)
-#define FINGERPRINT_name      (gnutls_cli_opt_strs+1885)
+#define FINGERPRINT_DESC      (gnutls_cli_opt_strs+1754)
+#define FINGERPRINT_NAME      (gnutls_cli_opt_strs+1803)
+#define FINGERPRINT_name      (gnutls_cli_opt_strs+1815)
 #define FINGERPRINT_FLAGS     (OPTST_DISABLED)
 
 /*
  *  disable-extensions option description:
  */
-#define DISABLE_EXTENSIONS_DESC      (gnutls_cli_opt_strs+1897)
-#define DISABLE_EXTENSIONS_NAME      (gnutls_cli_opt_strs+1928)
-#define DISABLE_EXTENSIONS_name      (gnutls_cli_opt_strs+1947)
+#define DISABLE_EXTENSIONS_DESC      (gnutls_cli_opt_strs+1827)
+#define DISABLE_EXTENSIONS_NAME      (gnutls_cli_opt_strs+1858)
+#define DISABLE_EXTENSIONS_name      (gnutls_cli_opt_strs+1877)
 #define DISABLE_EXTENSIONS_FLAGS     (OPTST_DISABLED)
 
 /*
  *  print-cert option description:
  */
-#define PRINT_CERT_DESC      (gnutls_cli_opt_strs+1966)
-#define PRINT_CERT_NAME      (gnutls_cli_opt_strs+2005)
-#define PRINT_CERT_name      (gnutls_cli_opt_strs+2016)
+#define PRINT_CERT_DESC      (gnutls_cli_opt_strs+1896)
+#define PRINT_CERT_NAME      (gnutls_cli_opt_strs+1935)
+#define PRINT_CERT_name      (gnutls_cli_opt_strs+1946)
 #define PRINT_CERT_FLAGS     (OPTST_DISABLED)
 
 /*
  *  recordsize option description:
  */
-#define RECORDSIZE_DESC      (gnutls_cli_opt_strs+2027)
-#define RECORDSIZE_NAME      (gnutls_cli_opt_strs+2064)
-#define RECORDSIZE_name      (gnutls_cli_opt_strs+2075)
+#define RECORDSIZE_DESC      (gnutls_cli_opt_strs+1957)
+#define RECORDSIZE_NAME      (gnutls_cli_opt_strs+1994)
+#define RECORDSIZE_name      (gnutls_cli_opt_strs+2005)
 #define RECORDSIZE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
 /*
  *  dh-bits option description:
  */
-#define DH_BITS_DESC      (gnutls_cli_opt_strs+2086)
-#define DH_BITS_NAME      (gnutls_cli_opt_strs+2128)
-#define DH_BITS_name      (gnutls_cli_opt_strs+2136)
+#define DH_BITS_DESC      (gnutls_cli_opt_strs+2016)
+#define DH_BITS_NAME      (gnutls_cli_opt_strs+2058)
+#define DH_BITS_name      (gnutls_cli_opt_strs+2066)
 #define DH_BITS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
 /*
  *  priority option description:
  */
-#define PRIORITY_DESC      (gnutls_cli_opt_strs+2144)
-#define PRIORITY_NAME      (gnutls_cli_opt_strs+2162)
-#define PRIORITY_name      (gnutls_cli_opt_strs+2171)
+#define PRIORITY_DESC      (gnutls_cli_opt_strs+2074)
+#define PRIORITY_NAME      (gnutls_cli_opt_strs+2092)
+#define PRIORITY_name      (gnutls_cli_opt_strs+2101)
 #define PRIORITY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  x509cafile option description:
  */
-#define X509CAFILE_DESC      (gnutls_cli_opt_strs+2180)
-#define X509CAFILE_NAME      (gnutls_cli_opt_strs+2220)
-#define X509CAFILE_name      (gnutls_cli_opt_strs+2231)
+#define X509CAFILE_DESC      (gnutls_cli_opt_strs+2110)
+#define X509CAFILE_NAME      (gnutls_cli_opt_strs+2150)
+#define X509CAFILE_name      (gnutls_cli_opt_strs+2161)
 #define X509CAFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  x509crlfile option description:
  */
-#define X509CRLFILE_DESC      (gnutls_cli_opt_strs+2242)
-#define X509CRLFILE_NAME      (gnutls_cli_opt_strs+2258)
-#define X509CRLFILE_name      (gnutls_cli_opt_strs+2270)
+#define X509CRLFILE_DESC      (gnutls_cli_opt_strs+2172)
+#define X509CRLFILE_NAME      (gnutls_cli_opt_strs+2188)
+#define X509CRLFILE_name      (gnutls_cli_opt_strs+2200)
 #define X509CRLFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
 
 /*
  *  pgpkeyfile option description:
  */
-#define PGPKEYFILE_DESC      (gnutls_cli_opt_strs+2282)
-#define PGPKEYFILE_NAME      (gnutls_cli_opt_strs+2302)
-#define PGPKEYFILE_name      (gnutls_cli_opt_strs+2313)
+#define PGPKEYFILE_DESC      (gnutls_cli_opt_strs+2212)
+#define PGPKEYFILE_NAME      (gnutls_cli_opt_strs+2232)
+#define PGPKEYFILE_name      (gnutls_cli_opt_strs+2243)
 #define PGPKEYFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
 
 /*
  *  pgpkeyring option description:
  */
-#define PGPKEYRING_DESC      (gnutls_cli_opt_strs+2324)
-#define PGPKEYRING_NAME      (gnutls_cli_opt_strs+2349)
-#define PGPKEYRING_name      (gnutls_cli_opt_strs+2360)
+#define PGPKEYRING_DESC      (gnutls_cli_opt_strs+2254)
+#define PGPKEYRING_NAME      (gnutls_cli_opt_strs+2279)
+#define PGPKEYRING_name      (gnutls_cli_opt_strs+2290)
 #define PGPKEYRING_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
 
 /*
  *  pgpcertfile option description:
  */
-#define PGPCERTFILE_DESC      (gnutls_cli_opt_strs+2371)
-#define PGPCERTFILE_NAME      (gnutls_cli_opt_strs+2412)
-#define PGPCERTFILE_name      (gnutls_cli_opt_strs+2424)
+#define PGPCERTFILE_DESC      (gnutls_cli_opt_strs+2301)
+#define PGPCERTFILE_NAME      (gnutls_cli_opt_strs+2342)
+#define PGPCERTFILE_name      (gnutls_cli_opt_strs+2354)
 #define PGPCERTFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
 
 /*
  *  x509keyfile option description:
  */
-#define X509KEYFILE_DESC      (gnutls_cli_opt_strs+2436)
-#define X509KEYFILE_NAME      (gnutls_cli_opt_strs+2474)
-#define X509KEYFILE_name      (gnutls_cli_opt_strs+2486)
+#define X509KEYFILE_DESC      (gnutls_cli_opt_strs+2366)
+#define X509KEYFILE_NAME      (gnutls_cli_opt_strs+2404)
+#define X509KEYFILE_name      (gnutls_cli_opt_strs+2416)
 #define X509KEYFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  x509certfile option description:
  */
-#define X509CERTFILE_DESC      (gnutls_cli_opt_strs+2498)
-#define X509CERTFILE_NAME      (gnutls_cli_opt_strs+2544)
-#define X509CERTFILE_name      (gnutls_cli_opt_strs+2557)
+#define X509CERTFILE_DESC      (gnutls_cli_opt_strs+2428)
+#define X509CERTFILE_NAME      (gnutls_cli_opt_strs+2474)
+#define X509CERTFILE_name      (gnutls_cli_opt_strs+2487)
 #define X509CERTFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  pgpsubkey option description:
  */
-#define PGPSUBKEY_DESC      (gnutls_cli_opt_strs+2570)
-#define PGPSUBKEY_NAME      (gnutls_cli_opt_strs+2602)
-#define PGPSUBKEY_name      (gnutls_cli_opt_strs+2612)
+#define PGPSUBKEY_DESC      (gnutls_cli_opt_strs+2500)
+#define PGPSUBKEY_NAME      (gnutls_cli_opt_strs+2532)
+#define PGPSUBKEY_name      (gnutls_cli_opt_strs+2542)
 #define PGPSUBKEY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  srpusername option description:
  */
-#define SRPUSERNAME_DESC      (gnutls_cli_opt_strs+2622)
-#define SRPUSERNAME_NAME      (gnutls_cli_opt_strs+2642)
-#define SRPUSERNAME_name      (gnutls_cli_opt_strs+2654)
+#define SRPUSERNAME_DESC      (gnutls_cli_opt_strs+2552)
+#define SRPUSERNAME_NAME      (gnutls_cli_opt_strs+2572)
+#define SRPUSERNAME_name      (gnutls_cli_opt_strs+2584)
 #define SRPUSERNAME_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  srppasswd option description:
  */
-#define SRPPASSWD_DESC      (gnutls_cli_opt_strs+2666)
-#define SRPPASSWD_NAME      (gnutls_cli_opt_strs+2686)
-#define SRPPASSWD_name      (gnutls_cli_opt_strs+2696)
+#define SRPPASSWD_DESC      (gnutls_cli_opt_strs+2596)
+#define SRPPASSWD_NAME      (gnutls_cli_opt_strs+2616)
+#define SRPPASSWD_name      (gnutls_cli_opt_strs+2626)
 #define SRPPASSWD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  pskusername option description:
  */
-#define PSKUSERNAME_DESC      (gnutls_cli_opt_strs+2706)
-#define PSKUSERNAME_NAME      (gnutls_cli_opt_strs+2726)
-#define PSKUSERNAME_name      (gnutls_cli_opt_strs+2738)
+#define PSKUSERNAME_DESC      (gnutls_cli_opt_strs+2636)
+#define PSKUSERNAME_NAME      (gnutls_cli_opt_strs+2656)
+#define PSKUSERNAME_name      (gnutls_cli_opt_strs+2668)
 #define PSKUSERNAME_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  pskkey option description:
  */
-#define PSKKEY_DESC      (gnutls_cli_opt_strs+2750)
-#define PSKKEY_NAME      (gnutls_cli_opt_strs+2774)
-#define PSKKEY_name      (gnutls_cli_opt_strs+2781)
+#define PSKKEY_DESC      (gnutls_cli_opt_strs+2680)
+#define PSKKEY_NAME      (gnutls_cli_opt_strs+2704)
+#define PSKKEY_name      (gnutls_cli_opt_strs+2711)
 #define PSKKEY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  port option description:
  */
-#define PORT_DESC      (gnutls_cli_opt_strs+2788)
-#define PORT_NAME      (gnutls_cli_opt_strs+2822)
-#define PORT_name      (gnutls_cli_opt_strs+2827)
+#define PORT_DESC      (gnutls_cli_opt_strs+2718)
+#define PORT_NAME      (gnutls_cli_opt_strs+2752)
+#define PORT_name      (gnutls_cli_opt_strs+2757)
 #define PORT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  insecure option description:
  */
-#define INSECURE_DESC      (gnutls_cli_opt_strs+2832)
-#define INSECURE_NAME      (gnutls_cli_opt_strs+2893)
-#define INSECURE_name      (gnutls_cli_opt_strs+2902)
+#define INSECURE_DESC      (gnutls_cli_opt_strs+2762)
+#define INSECURE_NAME      (gnutls_cli_opt_strs+2823)
+#define INSECURE_name      (gnutls_cli_opt_strs+2832)
 #define INSECURE_FLAGS     (OPTST_DISABLED)
 
 /*
  *  benchmark-ciphers option description:
  */
-#define BENCHMARK_CIPHERS_DESC      (gnutls_cli_opt_strs+2911)
-#define BENCHMARK_CIPHERS_NAME      (gnutls_cli_opt_strs+2940)
-#define BENCHMARK_CIPHERS_name      (gnutls_cli_opt_strs+2958)
+#define BENCHMARK_CIPHERS_DESC      (gnutls_cli_opt_strs+2841)
+#define BENCHMARK_CIPHERS_NAME      (gnutls_cli_opt_strs+2870)
+#define BENCHMARK_CIPHERS_name      (gnutls_cli_opt_strs+2888)
 #define BENCHMARK_CIPHERS_FLAGS     (OPTST_DISABLED)
 
 /*
  *  benchmark-soft-ciphers option description:
  */
-#define BENCHMARK_SOFT_CIPHERS_DESC      (gnutls_cli_opt_strs+2976)
-#define BENCHMARK_SOFT_CIPHERS_NAME      (gnutls_cli_opt_strs+3035)
-#define BENCHMARK_SOFT_CIPHERS_name      (gnutls_cli_opt_strs+3058)
+#define BENCHMARK_SOFT_CIPHERS_DESC      (gnutls_cli_opt_strs+2906)
+#define BENCHMARK_SOFT_CIPHERS_NAME      (gnutls_cli_opt_strs+2965)
+#define BENCHMARK_SOFT_CIPHERS_name      (gnutls_cli_opt_strs+2988)
 #define BENCHMARK_SOFT_CIPHERS_FLAGS     (OPTST_DISABLED)
 
 /*
  *  benchmark-tls-kx option description:
  */
-#define BENCHMARK_TLS_KX_DESC      (gnutls_cli_opt_strs+3081)
-#define BENCHMARK_TLS_KX_NAME      (gnutls_cli_opt_strs+3116)
-#define BENCHMARK_TLS_KX_name      (gnutls_cli_opt_strs+3133)
+#define BENCHMARK_TLS_KX_DESC      (gnutls_cli_opt_strs+3011)
+#define BENCHMARK_TLS_KX_NAME      (gnutls_cli_opt_strs+3046)
+#define BENCHMARK_TLS_KX_name      (gnutls_cli_opt_strs+3063)
 #define BENCHMARK_TLS_KX_FLAGS     (OPTST_DISABLED)
 
 /*
  *  benchmark-tls-ciphers option description:
  */
-#define BENCHMARK_TLS_CIPHERS_DESC      (gnutls_cli_opt_strs+3150)
-#define BENCHMARK_TLS_CIPHERS_NAME      (gnutls_cli_opt_strs+3172)
-#define BENCHMARK_TLS_CIPHERS_name      (gnutls_cli_opt_strs+3194)
+#define BENCHMARK_TLS_CIPHERS_DESC      (gnutls_cli_opt_strs+3080)
+#define BENCHMARK_TLS_CIPHERS_NAME      (gnutls_cli_opt_strs+3102)
+#define BENCHMARK_TLS_CIPHERS_name      (gnutls_cli_opt_strs+3124)
 #define BENCHMARK_TLS_CIPHERS_FLAGS     (OPTST_DISABLED)
 
 /*
  *  list option description:
  */
-#define LIST_DESC      (gnutls_cli_opt_strs+3216)
-#define LIST_NAME      (gnutls_cli_opt_strs+3267)
-#define LIST_name      (gnutls_cli_opt_strs+3272)
+#define LIST_DESC      (gnutls_cli_opt_strs+3146)
+#define LIST_NAME      (gnutls_cli_opt_strs+3197)
+#define LIST_name      (gnutls_cli_opt_strs+3202)
 #define LIST_FLAGS     (OPTST_DISABLED)
 
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (gnutls_cli_opt_strs+3277)
-#define HELP_name       (gnutls_cli_opt_strs+3321)
+#define HELP_DESC       (gnutls_cli_opt_strs+3207)
+#define HELP_name       (gnutls_cli_opt_strs+3251)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (gnutls_cli_opt_strs+3326)
-#define MORE_HELP_name  (gnutls_cli_opt_strs+3371)
+#define MORE_HELP_DESC  (gnutls_cli_opt_strs+3256)
+#define MORE_HELP_name  (gnutls_cli_opt_strs+3301)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  NULL
@@ -628,8 +615,8 @@ static char const gnutls_cli_opt_strs[3856] =
 #  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+3381)
-#define VER_name        (gnutls_cli_opt_strs+3417)
+#define VER_DESC        (gnutls_cli_opt_strs+3311)
+#define VER_name        (gnutls_cli_opt_strs+3347)
 /*
  *  Declare option callback procedures
  */
@@ -782,20 +769,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ NOTICKET_DESC, NOTICKET_NAME, NOTICKET_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 11, VALUE_OPT_OCSP_STATUS_REQUEST,
-     /* equiv idx, value */ 11, VALUE_OPT_OCSP_STATUS_REQUEST,
-     /* equivalenced to  */ NO_EQUIVALENT,
-     /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ OCSP_STATUS_REQUEST_FLAGS, 0,
-     /* last opt argumnt */ { NULL }, /* --ocsp-status-request */
-     /* arg list/cookie  */ NULL,
-     /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ NULL,
-     /* desc, NAME, name */ OCSP_STATUS_REQUEST_DESC, OCSP_STATUS_REQUEST_NAME, OCSP_STATUS_REQUEST_name,
-     /* disablement strs */ NOT_OCSP_STATUS_REQUEST_name, NOT_OCSP_STATUS_REQUEST_PFX },
-
-  {  /* entry idx, value */ 12, VALUE_OPT_STARTTLS,
-     /* equiv idx, value */ 12, VALUE_OPT_STARTTLS,
+  {  /* entry idx, value */ 11, VALUE_OPT_STARTTLS,
+     /* equiv idx, value */ 11, VALUE_OPT_STARTTLS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ STARTTLS_FLAGS, 0,
@@ -806,8 +781,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ STARTTLS_DESC, STARTTLS_NAME, STARTTLS_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 13, VALUE_OPT_UDP,
-     /* equiv idx, value */ 13, VALUE_OPT_UDP,
+  {  /* entry idx, value */ 12, VALUE_OPT_UDP,
+     /* equiv idx, value */ 12, VALUE_OPT_UDP,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ UDP_FLAGS, 0,
@@ -818,8 +793,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ UDP_DESC, UDP_NAME, UDP_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 14, VALUE_OPT_MTU,
-     /* equiv idx, value */ 14, VALUE_OPT_MTU,
+  {  /* entry idx, value */ 13, VALUE_OPT_MTU,
+     /* equiv idx, value */ 13, VALUE_OPT_MTU,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ MTU_FLAGS, 0,
@@ -830,8 +805,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ MTU_DESC, MTU_NAME, MTU_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 15, VALUE_OPT_SRTP_PROFILES,
-     /* equiv idx, value */ 15, VALUE_OPT_SRTP_PROFILES,
+  {  /* entry idx, value */ 14, VALUE_OPT_SRTP_PROFILES,
+     /* equiv idx, value */ 14, VALUE_OPT_SRTP_PROFILES,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ SRTP_PROFILES_FLAGS, 0,
@@ -842,8 +817,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 */ 16, VALUE_OPT_CRLF,
-     /* equiv idx, value */ 16, VALUE_OPT_CRLF,
+  {  /* entry idx, value */ 15, VALUE_OPT_CRLF,
+     /* equiv idx, value */ 15, VALUE_OPT_CRLF,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ CRLF_FLAGS, 0,
@@ -854,8 +829,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ CRLF_DESC, CRLF_NAME, CRLF_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 17, VALUE_OPT_X509FMTDER,
-     /* equiv idx, value */ 17, VALUE_OPT_X509FMTDER,
+  {  /* entry idx, value */ 16, VALUE_OPT_X509FMTDER,
+     /* equiv idx, value */ 16, VALUE_OPT_X509FMTDER,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ X509FMTDER_FLAGS, 0,
@@ -866,8 +841,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ X509FMTDER_DESC, X509FMTDER_NAME, X509FMTDER_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 18, VALUE_OPT_FINGERPRINT,
-     /* equiv idx, value */ 18, VALUE_OPT_FINGERPRINT,
+  {  /* entry idx, value */ 17, VALUE_OPT_FINGERPRINT,
+     /* equiv idx, value */ 17, VALUE_OPT_FINGERPRINT,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ FINGERPRINT_FLAGS, 0,
@@ -878,8 +853,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ FINGERPRINT_DESC, FINGERPRINT_NAME, FINGERPRINT_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 19, VALUE_OPT_DISABLE_EXTENSIONS,
-     /* equiv idx, value */ 19, VALUE_OPT_DISABLE_EXTENSIONS,
+  {  /* entry idx, value */ 18, VALUE_OPT_DISABLE_EXTENSIONS,
+     /* equiv idx, value */ 18, VALUE_OPT_DISABLE_EXTENSIONS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ DISABLE_EXTENSIONS_FLAGS, 0,
@@ -890,8 +865,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 */ 20, VALUE_OPT_PRINT_CERT,
-     /* equiv idx, value */ 20, VALUE_OPT_PRINT_CERT,
+  {  /* entry idx, value */ 19, VALUE_OPT_PRINT_CERT,
+     /* equiv idx, value */ 19, VALUE_OPT_PRINT_CERT,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PRINT_CERT_FLAGS, 0,
@@ -902,8 +877,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ PRINT_CERT_DESC, PRINT_CERT_NAME, PRINT_CERT_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 21, VALUE_OPT_RECORDSIZE,
-     /* equiv idx, value */ 21, VALUE_OPT_RECORDSIZE,
+  {  /* entry idx, value */ 20, VALUE_OPT_RECORDSIZE,
+     /* equiv idx, value */ 20, VALUE_OPT_RECORDSIZE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ RECORDSIZE_FLAGS, 0,
@@ -914,8 +889,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ RECORDSIZE_DESC, RECORDSIZE_NAME, RECORDSIZE_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 22, VALUE_OPT_DH_BITS,
-     /* equiv idx, value */ 22, VALUE_OPT_DH_BITS,
+  {  /* entry idx, value */ 21, VALUE_OPT_DH_BITS,
+     /* equiv idx, value */ 21, VALUE_OPT_DH_BITS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ DH_BITS_FLAGS, 0,
@@ -926,8 +901,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 */ 22, VALUE_OPT_PRIORITY,
+     /* equiv idx, value */ 22, VALUE_OPT_PRIORITY,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PRIORITY_FLAGS, 0,
@@ -938,8 +913,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 */ 23, VALUE_OPT_X509CAFILE,
+     /* equiv idx, value */ 23, VALUE_OPT_X509CAFILE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ X509CAFILE_FLAGS, 0,
@@ -950,8 +925,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 */ 24, VALUE_OPT_X509CRLFILE,
+     /* equiv idx, value */ 24, VALUE_OPT_X509CRLFILE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ X509CRLFILE_FLAGS, 0,
@@ -962,8 +937,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_PGPKEYFILE,
-     /* equiv idx, value */ 26, VALUE_OPT_PGPKEYFILE,
+  {  /* entry idx, value */ 25, VALUE_OPT_PGPKEYFILE,
+     /* equiv idx, value */ 25, VALUE_OPT_PGPKEYFILE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PGPKEYFILE_FLAGS, 0,
@@ -974,8 +949,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ PGPKEYFILE_DESC, PGPKEYFILE_NAME, PGPKEYFILE_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 27, VALUE_OPT_PGPKEYRING,
-     /* equiv idx, value */ 27, VALUE_OPT_PGPKEYRING,
+  {  /* entry idx, value */ 26, VALUE_OPT_PGPKEYRING,
+     /* equiv idx, value */ 26, VALUE_OPT_PGPKEYRING,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PGPKEYRING_FLAGS, 0,
@@ -986,8 +961,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ PGPKEYRING_DESC, PGPKEYRING_NAME, PGPKEYRING_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 28, VALUE_OPT_PGPCERTFILE,
-     /* equiv idx, value */ 28, VALUE_OPT_PGPCERTFILE,
+  {  /* entry idx, value */ 27, VALUE_OPT_PGPCERTFILE,
+     /* equiv idx, value */ 27, VALUE_OPT_PGPCERTFILE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PGPCERTFILE_FLAGS, 0,
@@ -998,8 +973,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ PGPCERTFILE_DESC, PGPCERTFILE_NAME, PGPCERTFILE_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 29, VALUE_OPT_X509KEYFILE,
-     /* equiv idx, value */ 29, 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,
@@ -1010,8 +985,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ X509KEYFILE_DESC, X509KEYFILE_NAME, X509KEYFILE_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 30, VALUE_OPT_X509CERTFILE,
-     /* equiv idx, value */ 30, 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,
@@ -1022,8 +997,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ X509CERTFILE_DESC, X509CERTFILE_NAME, X509CERTFILE_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 31, VALUE_OPT_PGPSUBKEY,
-     /* equiv idx, value */ 31, VALUE_OPT_PGPSUBKEY,
+  {  /* entry idx, value */ 30, VALUE_OPT_PGPSUBKEY,
+     /* equiv idx, value */ 30, VALUE_OPT_PGPSUBKEY,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PGPSUBKEY_FLAGS, 0,
@@ -1034,8 +1009,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ PGPSUBKEY_DESC, PGPSUBKEY_NAME, PGPSUBKEY_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 32, VALUE_OPT_SRPUSERNAME,
-     /* equiv idx, value */ 32, VALUE_OPT_SRPUSERNAME,
+  {  /* entry idx, value */ 31, VALUE_OPT_SRPUSERNAME,
+     /* equiv idx, value */ 31, VALUE_OPT_SRPUSERNAME,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ SRPUSERNAME_FLAGS, 0,
@@ -1046,8 +1021,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ SRPUSERNAME_DESC, SRPUSERNAME_NAME, SRPUSERNAME_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 33, VALUE_OPT_SRPPASSWD,
-     /* equiv idx, value */ 33, VALUE_OPT_SRPPASSWD,
+  {  /* entry idx, value */ 32, VALUE_OPT_SRPPASSWD,
+     /* equiv idx, value */ 32, VALUE_OPT_SRPPASSWD,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ SRPPASSWD_FLAGS, 0,
@@ -1058,8 +1033,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ SRPPASSWD_DESC, SRPPASSWD_NAME, SRPPASSWD_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 34, VALUE_OPT_PSKUSERNAME,
-     /* equiv idx, value */ 34, VALUE_OPT_PSKUSERNAME,
+  {  /* entry idx, value */ 33, VALUE_OPT_PSKUSERNAME,
+     /* equiv idx, value */ 33, VALUE_OPT_PSKUSERNAME,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PSKUSERNAME_FLAGS, 0,
@@ -1070,8 +1045,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ PSKUSERNAME_DESC, PSKUSERNAME_NAME, PSKUSERNAME_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 35, VALUE_OPT_PSKKEY,
-     /* equiv idx, value */ 35, VALUE_OPT_PSKKEY,
+  {  /* entry idx, value */ 34, VALUE_OPT_PSKKEY,
+     /* equiv idx, value */ 34, VALUE_OPT_PSKKEY,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PSKKEY_FLAGS, 0,
@@ -1082,8 +1057,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ PSKKEY_DESC, PSKKEY_NAME, PSKKEY_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 36, VALUE_OPT_PORT,
-     /* equiv idx, value */ 36, VALUE_OPT_PORT,
+  {  /* entry idx, value */ 35, VALUE_OPT_PORT,
+     /* equiv idx, value */ 35, VALUE_OPT_PORT,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PORT_FLAGS, 0,
@@ -1094,8 +1069,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ PORT_DESC, PORT_NAME, PORT_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 37, VALUE_OPT_INSECURE,
-     /* equiv idx, value */ 37, VALUE_OPT_INSECURE,
+  {  /* entry idx, value */ 36, VALUE_OPT_INSECURE,
+     /* equiv idx, value */ 36, VALUE_OPT_INSECURE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ INSECURE_FLAGS, 0,
@@ -1106,8 +1081,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ INSECURE_DESC, INSECURE_NAME, INSECURE_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 38, VALUE_OPT_BENCHMARK_CIPHERS,
-     /* equiv idx, value */ 38, VALUE_OPT_BENCHMARK_CIPHERS,
+  {  /* entry idx, value */ 37, VALUE_OPT_BENCHMARK_CIPHERS,
+     /* equiv idx, value */ 37, VALUE_OPT_BENCHMARK_CIPHERS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ BENCHMARK_CIPHERS_FLAGS, 0,
@@ -1118,8 +1093,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 */ 39, VALUE_OPT_BENCHMARK_SOFT_CIPHERS,
-     /* equiv idx, value */ 39, VALUE_OPT_BENCHMARK_SOFT_CIPHERS,
+  {  /* entry idx, value */ 38, VALUE_OPT_BENCHMARK_SOFT_CIPHERS,
+     /* equiv idx, value */ 38, VALUE_OPT_BENCHMARK_SOFT_CIPHERS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ BENCHMARK_SOFT_CIPHERS_FLAGS, 0,
@@ -1130,8 +1105,8 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* desc, NAME, name */ BENCHMARK_SOFT_CIPHERS_DESC, BENCHMARK_SOFT_CIPHERS_NAME, BENCHMARK_SOFT_CIPHERS_name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 40, VALUE_OPT_BENCHMARK_TLS_KX,
-     /* equiv idx, value */ 40, 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,
@@ -1142,8 +1117,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 */ 41, VALUE_OPT_BENCHMARK_TLS_CIPHERS,
-     /* equiv idx, value */ 41, 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,
@@ -1154,8 +1129,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 */ 42, VALUE_OPT_LIST,
-     /* equiv idx, value */ 42, 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,
@@ -1210,14 +1185,14 @@ static tOptDesc optDesc[OPTION_CT] = {
  *
  *  Define the gnutls-cli Option Environment
  */
-#define zPROGNAME       (gnutls_cli_opt_strs+3425)
-#define zUsageTitle     (gnutls_cli_opt_strs+3436)
+#define zPROGNAME       (gnutls_cli_opt_strs+3355)
+#define zUsageTitle     (gnutls_cli_opt_strs+3366)
 #define zRcName         NULL
 #define apzHomeList     NULL
-#define zBugsAddr       (gnutls_cli_opt_strs+3549)
-#define zExplain        (gnutls_cli_opt_strs+3568)
-#define zDetail         (gnutls_cli_opt_strs+3571)
-#define zFullVersion    (gnutls_cli_opt_strs+3755)
+#define zBugsAddr       (gnutls_cli_opt_strs+3479)
+#define zExplain        (gnutls_cli_opt_strs+3498)
+#define zDetail         (gnutls_cli_opt_strs+3501)
+#define zFullVersion    (gnutls_cli_opt_strs+3685)
 /* extracted from optcode.tlib near line 350 */
 
 #if defined(ENABLE_NLS)
@@ -1231,7 +1206,7 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 #define gnutls_cli_full_usage (NULL)
 
-#define gnutls_cli_short_usage (gnutls_cli_opt_strs+3776)
+#define gnutls_cli_short_usage (gnutls_cli_opt_strs+3706)
 
 #endif /* not defined __doxygen__ */
 
@@ -1509,7 +1484,7 @@ tOptions gnutls_cliOptions = {
       NO_EQUIVALENT, /* '-#' option index */
       NO_EQUIVALENT /* index of default opt */
     },
-    46 /* full option count */, 43 /* user option count */,
+    45 /* full option count */, 42 /* user option count */,
     gnutls_cli_full_usage, gnutls_cli_short_usage,
     NULL, NULL,
     PKGDATADIR, gnutls_cli_packager_info
diff --git a/src/cli-args.def b/src/cli-args.def
index 8fafbf4f64..052cd59950 100644
--- a/src/cli-args.def
+++ b/src/cli-args.def
@@ -83,14 +83,6 @@ flag = {
 };
 
 flag = {
-    name      = ocsp-status-request;
-    descrip   = "Enable OCSP status request";
-    enabled;
-    disable   = "no";
-    doc       = "The client will indicate to the server in a TLS extension that it wants a OCSP status request.";
-};
-
-flag = {
     name      = starttls;
     value     = s;
     descrip   = "Connect, establish a plain session and start TLS.";
diff --git a/src/cli-args.h b/src/cli-args.h
index 1dfdc35f8e..576f11e3ba 100644
--- a/src/cli-args.h
+++ b/src/cli-args.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (cli-args.h)
  *  
- *  It has been AutoGen-ed  November  8, 2012 at 11:35:50 PM by AutoGen 5.16
+ *  It has been AutoGen-ed  November  9, 2012 at 05:12:09 PM by AutoGen 5.16
  *  From the definitions    cli-args.def
  *  and the template file   options
  *
@@ -78,44 +78,43 @@ typedef enum {
     INDEX_OPT_HEARTBEAT               =  8,
     INDEX_OPT_REHANDSHAKE             =  9,
     INDEX_OPT_NOTICKET                = 10,
-    INDEX_OPT_OCSP_STATUS_REQUEST     = 11,
-    INDEX_OPT_STARTTLS                = 12,
-    INDEX_OPT_UDP                     = 13,
-    INDEX_OPT_MTU                     = 14,
-    INDEX_OPT_SRTP_PROFILES           = 15,
-    INDEX_OPT_CRLF                    = 16,
-    INDEX_OPT_X509FMTDER              = 17,
-    INDEX_OPT_FINGERPRINT             = 18,
-    INDEX_OPT_DISABLE_EXTENSIONS      = 19,
-    INDEX_OPT_PRINT_CERT              = 20,
-    INDEX_OPT_RECORDSIZE              = 21,
-    INDEX_OPT_DH_BITS                 = 22,
-    INDEX_OPT_PRIORITY                = 23,
-    INDEX_OPT_X509CAFILE              = 24,
-    INDEX_OPT_X509CRLFILE             = 25,
-    INDEX_OPT_PGPKEYFILE              = 26,
-    INDEX_OPT_PGPKEYRING              = 27,
-    INDEX_OPT_PGPCERTFILE             = 28,
-    INDEX_OPT_X509KEYFILE             = 29,
-    INDEX_OPT_X509CERTFILE            = 30,
-    INDEX_OPT_PGPSUBKEY               = 31,
-    INDEX_OPT_SRPUSERNAME             = 32,
-    INDEX_OPT_SRPPASSWD               = 33,
-    INDEX_OPT_PSKUSERNAME             = 34,
-    INDEX_OPT_PSKKEY                  = 35,
-    INDEX_OPT_PORT                    = 36,
-    INDEX_OPT_INSECURE                = 37,
-    INDEX_OPT_BENCHMARK_CIPHERS       = 38,
-    INDEX_OPT_BENCHMARK_SOFT_CIPHERS  = 39,
-    INDEX_OPT_BENCHMARK_TLS_KX        = 40,
-    INDEX_OPT_BENCHMARK_TLS_CIPHERS   = 41,
-    INDEX_OPT_LIST                    = 42,
-    INDEX_OPT_VERSION                 = 43,
-    INDEX_OPT_HELP                    = 44,
-    INDEX_OPT_MORE_HELP               = 45
+    INDEX_OPT_STARTTLS                = 11,
+    INDEX_OPT_UDP                     = 12,
+    INDEX_OPT_MTU                     = 13,
+    INDEX_OPT_SRTP_PROFILES           = 14,
+    INDEX_OPT_CRLF                    = 15,
+    INDEX_OPT_X509FMTDER              = 16,
+    INDEX_OPT_FINGERPRINT             = 17,
+    INDEX_OPT_DISABLE_EXTENSIONS      = 18,
+    INDEX_OPT_PRINT_CERT              = 19,
+    INDEX_OPT_RECORDSIZE              = 20,
+    INDEX_OPT_DH_BITS                 = 21,
+    INDEX_OPT_PRIORITY                = 22,
+    INDEX_OPT_X509CAFILE              = 23,
+    INDEX_OPT_X509CRLFILE             = 24,
+    INDEX_OPT_PGPKEYFILE              = 25,
+    INDEX_OPT_PGPKEYRING              = 26,
+    INDEX_OPT_PGPCERTFILE             = 27,
+    INDEX_OPT_X509KEYFILE             = 28,
+    INDEX_OPT_X509CERTFILE            = 29,
+    INDEX_OPT_PGPSUBKEY               = 30,
+    INDEX_OPT_SRPUSERNAME             = 31,
+    INDEX_OPT_SRPPASSWD               = 32,
+    INDEX_OPT_PSKUSERNAME             = 33,
+    INDEX_OPT_PSKKEY                  = 34,
+    INDEX_OPT_PORT                    = 35,
+    INDEX_OPT_INSECURE                = 36,
+    INDEX_OPT_BENCHMARK_CIPHERS       = 37,
+    INDEX_OPT_BENCHMARK_SOFT_CIPHERS  = 38,
+    INDEX_OPT_BENCHMARK_TLS_KX        = 39,
+    INDEX_OPT_BENCHMARK_TLS_CIPHERS   = 40,
+    INDEX_OPT_LIST                    = 41,
+    INDEX_OPT_VERSION                 = 42,
+    INDEX_OPT_HELP                    = 43,
+    INDEX_OPT_MORE_HELP               = 44
 } teOptIndex;
 
-#define OPTION_CT    46
+#define OPTION_CT    45
 #define GNUTLS_CLI_VERSION       "@VERSION@"
 #define GNUTLS_CLI_FULL_VERSION  "gnutls-cli @VERSION@"
 
@@ -166,43 +165,42 @@ typedef enum {
 #define VALUE_OPT_HEARTBEAT      'b'
 #define VALUE_OPT_REHANDSHAKE    'e'
 #define VALUE_OPT_NOTICKET       10
-#define VALUE_OPT_OCSP_STATUS_REQUEST 11
 #define VALUE_OPT_STARTTLS       's'
 #define VALUE_OPT_UDP            'u'
-#define VALUE_OPT_MTU            14
+#define VALUE_OPT_MTU            13
 
 #define OPT_VALUE_MTU            (DESC(MTU).optArg.argInt)
-#define VALUE_OPT_SRTP_PROFILES  15
-#define VALUE_OPT_CRLF           16
-#define VALUE_OPT_X509FMTDER     17
+#define VALUE_OPT_SRTP_PROFILES  14
+#define VALUE_OPT_CRLF           15
+#define VALUE_OPT_X509FMTDER     16
 #define VALUE_OPT_FINGERPRINT    'f'
-#define VALUE_OPT_DISABLE_EXTENSIONS 19
-#define VALUE_OPT_PRINT_CERT     20
-#define VALUE_OPT_RECORDSIZE     21
+#define VALUE_OPT_DISABLE_EXTENSIONS 18
+#define VALUE_OPT_PRINT_CERT     19
+#define VALUE_OPT_RECORDSIZE     20
 
 #define OPT_VALUE_RECORDSIZE     (DESC(RECORDSIZE).optArg.argInt)
-#define VALUE_OPT_DH_BITS        22
+#define VALUE_OPT_DH_BITS        21
 
 #define OPT_VALUE_DH_BITS        (DESC(DH_BITS).optArg.argInt)
-#define VALUE_OPT_PRIORITY       23
-#define VALUE_OPT_X509CAFILE     24
-#define VALUE_OPT_X509CRLFILE    25
-#define VALUE_OPT_PGPKEYFILE     26
-#define VALUE_OPT_PGPKEYRING     27
-#define VALUE_OPT_PGPCERTFILE    28
-#define VALUE_OPT_X509KEYFILE    29
-#define VALUE_OPT_X509CERTFILE   30
-#define VALUE_OPT_PGPSUBKEY      31
-#define VALUE_OPT_SRPUSERNAME    32
-#define VALUE_OPT_SRPPASSWD      129
-#define VALUE_OPT_PSKUSERNAME    130
-#define VALUE_OPT_PSKKEY         131
+#define VALUE_OPT_PRIORITY       22
+#define VALUE_OPT_X509CAFILE     23
+#define VALUE_OPT_X509CRLFILE    24
+#define VALUE_OPT_PGPKEYFILE     25
+#define VALUE_OPT_PGPKEYRING     26
+#define VALUE_OPT_PGPCERTFILE    27
+#define VALUE_OPT_X509KEYFILE    28
+#define VALUE_OPT_X509CERTFILE   29
+#define VALUE_OPT_PGPSUBKEY      30
+#define VALUE_OPT_SRPUSERNAME    31
+#define VALUE_OPT_SRPPASSWD      32
+#define VALUE_OPT_PSKUSERNAME    129
+#define VALUE_OPT_PSKKEY         130
 #define VALUE_OPT_PORT           'p'
-#define VALUE_OPT_INSECURE       133
-#define VALUE_OPT_BENCHMARK_CIPHERS 134
-#define VALUE_OPT_BENCHMARK_SOFT_CIPHERS 135
-#define VALUE_OPT_BENCHMARK_TLS_KX 136
-#define VALUE_OPT_BENCHMARK_TLS_CIPHERS 137
+#define VALUE_OPT_INSECURE       132
+#define VALUE_OPT_BENCHMARK_CIPHERS 133
+#define VALUE_OPT_BENCHMARK_SOFT_CIPHERS 134
+#define VALUE_OPT_BENCHMARK_TLS_KX 135
+#define VALUE_OPT_BENCHMARK_TLS_CIPHERS 136
 #define VALUE_OPT_LIST           'l'
 #define VALUE_OPT_HELP          'h'
 #define VALUE_OPT_MORE_HELP     '!'
diff --git a/src/cli.c b/src/cli.c
index 074adebd78..95fe8e0ce5 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -72,7 +72,6 @@ int resume, starttls, insecure, rehandshake, udp, mtu;
 const char *hostname = NULL;
 const char *service = NULL;
 int record_max_size;
-int status_request_ocsp;
 int fingerprint;
 int crlf;
 unsigned int verbose = 0;
@@ -416,7 +415,7 @@ cert_verify_callback (gnutls_session_t session)
           if (!insecure && !ssh)
             return -1;
         }
-      else if (ENABLED_OPT(OCSP))
+      else if (ENABLED_OPT(OCSP) && gnutls_ocsp_status_request_is_checked(session, 0) == 0)
         { /* off-line verification succeeded. Try OCSP */
           rc = cert_verify_ocsp(session);
           if (rc == 0)
@@ -1146,9 +1145,6 @@ const char* rest = NULL;
     }
 
   record_max_size = OPT_VALUE_RECORDSIZE;
-  status_request_ocsp = ENABLED_OPT(OCSP_STATUS_REQUEST);
-  if (ENABLED_OPT(OCSP))
-    status_request_ocsp = 1;
   
   fingerprint = HAVE_OPT(FINGERPRINT);