[SCM] GNU gnutls branch, master, updated. gnutls_3_1_3-103-geef95e3
"Nikos Mavrogiannopoulos" <[email protected]> Fri, 09 Nov 2012 16:21:39 +0000
| Newsgroups | gmane.comp.encryption.gpg.gnutls.cvs |
|---|---|
| Message-ID | <[email protected]> |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".
http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=eef95e36ebbc485e0a839b29c2a2d161b56ea95d
The branch, master has been updated
via eef95e36ebbc485e0a839b29c2a2d161b56ea95d (commit)
via 6b31f4a0043f2e4e98c561da106c9f881ce4ed70 (commit)
via 260c2a25f26ab57f68f4f781164c826d239c44b7 (commit)
via c887a4461ff428d6a8e34ba675b227221993b257 (commit)
via 751729abe8f6f8e31620324a5dc088663e79cb79 (commit)
from 5f9d3a2b2f618e4369d7851b6c0ec0806e5162c2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit eef95e36ebbc485e0a839b29c2a2d161b56ea95d
Author: Nikos Mavrogiannopoulos <[email protected]>
Date: Fri Nov 9 17:21:29 2012 +0100
Corrected indication of OCSP check failure.
commit 6b31f4a0043f2e4e98c561da106c9f881ce4ed70
Author: Nikos Mavrogiannopoulos <[email protected]>
Date: Fri Nov 9 17:12:52 2012 +0100
The status-request option was eliminated. Check OCSP only when the status response in the handshake was invalid.
commit 260c2a25f26ab57f68f4f781164c826d239c44b7
Author: Nikos Mavrogiannopoulos <[email protected]>
Date: Fri Nov 9 17:06:19 2012 +0100
Added Martin
commit c887a4461ff428d6a8e34ba675b227221993b257
Author: Nikos Mavrogiannopoulos <[email protected]>
Date: Fri Nov 9 17:04:35 2012 +0100
updated
commit 751729abe8f6f8e31620324a5dc088663e79cb79
Author: Nikos Mavrogiannopoulos <[email protected]>
Date: Thu Nov 8 23:35:00 2012 +0100
remove @cindex from the invoke-* files.
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 3 +
NEWS | 3 +-
doc/invoke-certtool.texi | 22 +--
doc/invoke-danetool.texi | 17 +-
doc/invoke-gnutls-cli-debug.texi | 4 +-
doc/invoke-gnutls-cli.texi | 17 +-
doc/invoke-gnutls-serv.texi | 8 +-
doc/invoke-ocsptool.texi | 5 +-
doc/invoke-p11tool.texi | 13 +-
doc/invoke-psktool.texi | 4 +-
doc/invoke-srptool.texi | 7 +-
doc/invoke-tpmtool.texi | 10 +-
doc/manpages/tpmtool.1 | 4 +-
doc/scripts/cleanup-autogen.pl | 6 +
lib/gnutls_x509.c | 12 +-
src/certtool-args.c | 2 +-
src/certtool-args.h | 2 +-
src/cli-args.c | 579 ++++++++++++++++++--------------------
src/cli-args.def | 8 -
src/cli-args.h | 126 ++++-----
src/cli-debug-args.c | 2 +-
src/cli-debug-args.h | 2 +-
src/cli.c | 6 +-
src/danetool-args.c | 2 +-
src/danetool-args.h | 2 +-
src/ocsptool-args.c | 2 +-
src/ocsptool-args.h | 2 +-
src/p11tool-args.c | 2 +-
src/p11tool-args.h | 2 +-
src/psk-args.c | 2 +-
src/psk-args.h | 2 +-
src/serv-args.c | 2 +-
src/serv-args.h | 2 +-
src/srptool-args.c | 2 +-
src/srptool-args.h | 2 +-
src/tpmtool-args.c | 2 +-
src/tpmtool-args.h | 2 +-
37 files changed, 390 insertions(+), 500 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 65ad8f4..e85fd7a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -83,6 +83,9 @@ DTLS/TLS heartbeat implementation.
Ilya Tumaykin *itumaykin [at] gmail.com*
Elliptic curve support improvements (wmNAF implementation and others).
+Martin Storjo *martin [at] martin.st*
+DTLS-SRTP support.
+
----------------------------------------------------------------------
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
diff --git a/NEWS b/NEWS
index 20a675a..2fef156 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ a function to print the verification status code in human readable text.
gnutls_certificate_verify_peers3().
** libgnutls: Added support for extension to establish keys for SRTP.
+Contributed by Martin Storsjo.
** libgnutls: The X.509 verification functions check the key
usage bits and pathlen constraints and on failure output
@@ -40,7 +41,7 @@ a site's DANE data.
** API and ABI modifications:
gnutls_session_get_id2: Added
-+gnutls_sign_is_secure: Added
+gnutls_sign_is_secure: Added
gnutls_certificate_verify_peers3: Added
gnutls_ocsp_status_request_is_checked: Added
gnutls_certificate_verification_status_print: Added
diff --git a/doc/invoke-certtool.texi b/doc/invoke-certtool.texi
index 044c3ab..b72286a 100644
--- a/doc/invoke-certtool.texi
+++ b/doc/invoke-certtool.texi
@@ -1,13 +1,12 @@
@node certtool Invocation
@section Invoking certtool
@pindex certtool
-@cindex GnuTLS certificate tool
@ignore
# -*- buffer-read-only: t -*- vi: set ro:
#
# DO NOT EDIT THIS FILE (invoke-certtool.texi)
#
-# It has been AutoGen-ed October 13, 2012 at 10:33:53 PM by AutoGen 5.16
+# It has been AutoGen-ed November 8, 2012 at 11:40:17 PM by AutoGen 5.16
# From the definitions ../src/certtool-args.def
# and the template file agtexi-cmd.tpl
@end ignore
@@ -127,20 +126,17 @@ please send bug reports to: bug-gnutls@@gnu.org
@anchor{certtool debug}
@subheading debug option (-d)
-@cindex certtool-debug
This is the ``enable debugging.'' option.
This option takes an argument number.
Specifies the debug level.
@anchor{certtool verify-chain}
@subheading verify-chain option (-e)
-@cindex certtool-verify-chain
This is the ``verify a pem encoded certificate chain.'' option.
The last certificate in the chain must be a self signed one.
@anchor{certtool verify}
@subheading verify option
-@cindex certtool-verify
This is the ``verify a pem encoded certificate chain using a trusted list.'' option.
@@ -155,7 +151,6 @@ load-ca-certificate.
The trusted certificate list must be loaded with --load-ca-certificate.
@anchor{certtool verify-crl}
@subheading verify-crl option
-@cindex certtool-verify-crl
This is the ``verify a crl using a trusted list.'' option.
@@ -170,55 +165,47 @@ load-ca-certificate.
The trusted certificate list must be loaded with --load-ca-certificate.
@anchor{certtool get-dh-params}
@subheading get-dh-params option
-@cindex certtool-get-dh-params
This is the ``get the included pkcs #3 encoded diffie-hellman parameters.'' option.
Returns stored DH parameters in GnuTLS. Those parameters are used in the SRP protocol. The parameters returned by fresh generation
are more efficient since GnuTLS 3.0.9.
@anchor{certtool load-privkey}
@subheading load-privkey option
-@cindex certtool-load-privkey
This is the ``loads a private key file'' option.
This option takes an argument string.
This can be either a file or a PKCS #11 URL
@anchor{certtool load-pubkey}
@subheading load-pubkey option
-@cindex certtool-load-pubkey
This is the ``loads a public key file'' option.
This option takes an argument string.
This can be either a file or a PKCS #11 URL
@anchor{certtool load-certificate}
@subheading load-certificate option
-@cindex certtool-load-certificate
This is the ``loads a certificate file'' option.
This option takes an argument string.
This can be either a file or a PKCS #11 URL
@anchor{certtool load-ca-privkey}
@subheading load-ca-privkey option
-@cindex certtool-load-ca-privkey
This is the ``loads the certificate authority's private key file'' option.
This option takes an argument string.
This can be either a file or a PKCS #11 URL
@anchor{certtool load-ca-certificate}
@subheading load-ca-certificate option
-@cindex certtool-load-ca-certificate
This is the ``loads the certificate authority's certificate file'' option.
This option takes an argument string.
This can be either a file or a PKCS #11 URL
@anchor{certtool null-password}
@subheading null-password option
-@cindex certtool-null-password
This is the ``enforce a null password'' option.
This option enforces a NULL password. This may be different than the empty password in some schemas.
@anchor{certtool to-p12}
@subheading to-p12 option
-@cindex certtool-to-p12
This is the ``generate a pkcs #12 structure'' option.
@@ -233,14 +220,12 @@ load-certificate.
It requires a certificate, a private key and possibly a CA certificate to be specified.
@anchor{certtool hash}
@subheading hash option
-@cindex certtool-hash
This is the ``hash algorithm to use for signing.'' option.
This option takes an argument string.
Available hash functions are SHA1, RMD160, SHA256, SHA384, SHA512.
@anchor{certtool inder}
@subheading inder option
-@cindex certtool-inder
This is the ``use der format for input certificates and private keys.'' option.
The input files will be assumed to be in DER or RAW format.
@@ -248,34 +233,29 @@ Unlike options that in PEM input would allow multiple input data (e.g. multiple
certificates), when reading in DER format a single data structure is read.
@anchor{certtool inraw}
@subheading inraw option
-@cindex certtool-inraw
This is an alias for the inder option,
@pxref{certtool inder, the inder option documentation}.
@anchor{certtool outder}
@subheading outder option
-@cindex certtool-outder
This is the ``use der format for output certificates and private keys'' option.
The output will be in DER or RAW format.
@anchor{certtool outraw}
@subheading outraw option
-@cindex certtool-outraw
This is an alias for the outder option,
@pxref{certtool outder, the outder option documentation}.
@anchor{certtool sec-param}
@subheading sec-param option
-@cindex certtool-sec-param
This is the ``specify the security level [low, legacy, normal, high, ultra].'' option.
This option takes an argument string @file{Security parameter}.
This is alternative to the bits option.
@anchor{certtool pkcs-cipher}
@subheading pkcs-cipher option
-@cindex certtool-pkcs-cipher
This is the ``cipher to use for pkcs #8 and #12 operations'' option.
This option takes an argument string @file{Cipher}.
diff --git a/doc/invoke-danetool.texi b/doc/invoke-danetool.texi
index 9d99a89..79ff397 100644
--- a/doc/invoke-danetool.texi
+++ b/doc/invoke-danetool.texi
@@ -1,13 +1,12 @@
@node danetool Invocation
@section Invoking danetool
@pindex danetool
-@cindex GnuTLS DANE tool
@ignore
# -*- buffer-read-only: t -*- vi: set ro:
#
# DO NOT EDIT THIS FILE (invoke-danetool.texi)
#
-# It has been AutoGen-ed November 4, 2012 at 05:36:02 PM by AutoGen 5.16
+# It has been AutoGen-ed November 8, 2012 at 11:40:20 PM by AutoGen 5.16
# From the definitions ../src/danetool-args.def
# and the template file agtexi-cmd.tpl
@end ignore
@@ -81,49 +80,42 @@ please send bug reports to: bug-gnutls@@gnu.org
@anchor{danetool debug}
@subheading debug option (-d)
-@cindex danetool-debug
This is the ``enable debugging.'' option.
This option takes an argument number.
Specifies the debug level.
@anchor{danetool load-pubkey}
@subheading load-pubkey option
-@cindex danetool-load-pubkey
This is the ``loads a public key file'' option.
This option takes an argument string.
This can be either a file or a PKCS #11 URL
@anchor{danetool load-certificate}
@subheading load-certificate option
-@cindex danetool-load-certificate
This is the ``loads a certificate file'' option.
This option takes an argument string.
This can be either a file or a PKCS #11 URL
@anchor{danetool hash}
@subheading hash option
-@cindex danetool-hash
This is the ``hash algorithm to use for signing.'' option.
This option takes an argument string.
Available hash functions are SHA1, RMD160, SHA256, SHA384, SHA512.
@anchor{danetool check}
@subheading check option
-@cindex danetool-check
This is the ``check dane tlsa entry.'' option.
This option takes an argument string.
Obtains the DANE TLSA entry from the given hostname and prints information.
@anchor{danetool local-dns}
@subheading local-dns option
-@cindex danetool-local-dns
This is the ``use the local dns server for dnssec resolving.'' option.
This option will use the local DNS server for DNSSEC.
This is disabled by default due to many servers not allowing DNSSEC.
@anchor{danetool inder}
@subheading inder option
-@cindex danetool-inder
This is the ``use der format for input certificates and private keys.'' option.
The input files will be assumed to be in DER or RAW format.
@@ -131,14 +123,12 @@ Unlike options that in PEM input would allow multiple input data (e.g. multiple
certificates), when reading in DER format a single data structure is read.
@anchor{danetool inraw}
@subheading inraw option
-@cindex danetool-inraw
This is an alias for the inder option,
@pxref{danetool inder, the inder option documentation}.
@anchor{danetool tlsa-rr}
@subheading tlsa-rr option
-@cindex danetool-tlsa-rr
This is the ``print the dane rr data on a certificate or public key'' option.
@@ -153,33 +143,28 @@ host.
This command prints the DANE RR data needed to enable DANE on a DNS server.
@anchor{danetool host}
@subheading host option
-@cindex danetool-host
This is the ``specify the hostname to be used in the dane rr'' option.
This option takes an argument string @file{Hostname}.
This command sets the hostname for the DANE RR.
@anchor{danetool proto}
@subheading proto option
-@cindex danetool-proto
This is the ``the protocol set for dane data (tcp, udp etc.)'' option.
This option takes an argument string @file{Protocol}.
This command specifies the protocol for the service set in the DANE data.
@anchor{danetool ca}
@subheading ca option
-@cindex danetool-ca
This is the ``whether the provided certificate or public key is a certificate authority.'' option.
Marks the DANE RR as a CA certificate if specified.
@anchor{danetool x509}
@subheading x509 option
-@cindex danetool-x509
This is the ``use the hash of the x.509 certificate, rather than the public key.'' option.
This option forces the generated record to contain the hash of the full X.509 certificate. By default only the hash of the public key is used.
@anchor{danetool local}
@subheading local option
-@cindex danetool-local
This is the ``the provided certificate or public key is a local entity.'' option.
DANE distinguishes certificates and public keys offered via the DNSSEC to trusted and local entities. Use this flag if this is a local (and possibly unsigned) entity.
diff --git a/doc/invoke-gnutls-cli-debug.texi b/doc/invoke-gnutls-cli-debug.texi
index 0c7152a..d86be71 100644
--- a/doc/invoke-gnutls-cli-debug.texi
+++ b/doc/invoke-gnutls-cli-debug.texi
@@ -1,13 +1,12 @@
@node gnutls-cli-debug Invocation
@section Invoking gnutls-cli-debug
@pindex gnutls-cli-debug
-@cindex GnuTLS debug client
@ignore
# -*- buffer-read-only: t -*- vi: set ro:
#
# DO NOT EDIT THIS FILE (invoke-gnutls-cli-debug.texi)
#
-# It has been AutoGen-ed May 9, 2012 at 08:06:11 PM by AutoGen 5.16
+# It has been AutoGen-ed November 8, 2012 at 11:40:16 PM by AutoGen 5.16
# From the definitions ../src/cli-debug-args.def
# and the template file agtexi-cmd.tpl
@end ignore
@@ -73,7 +72,6 @@ please send bug reports to: bug-gnutls@@gnu.org
@anchor{gnutls-cli-debug debug}
@subheading debug option (-d)
-@cindex gnutls-cli-debug-debug
This is the ``enable debugging.'' option.
This option takes an argument number.
diff --git a/doc/invoke-gnutls-cli.texi b/doc/invoke-gnutls-cli.texi
index 07e2337..5179dae 100644
--- a/doc/invoke-gnutls-cli.texi
+++ b/doc/invoke-gnutls-cli.texi
@@ -1,13 +1,12 @@
@node gnutls-cli Invocation
@section Invoking gnutls-cli
@pindex gnutls-cli
-@cindex GnuTLS client
@ignore
# -*- buffer-read-only: t -*- vi: set ro:
#
# DO NOT EDIT THIS FILE (invoke-gnutls-cli.texi)
#
-# It has been AutoGen-ed November 1, 2012 at 03:48:00 PM by AutoGen 5.16
+# It has been AutoGen-ed November 8, 2012 at 11:40:16 PM by AutoGen 5.16
# From the definitions ../src/cli-args.def
# and the template file agtexi-cmd.tpl
@end ignore
@@ -120,20 +119,17 @@ please send bug reports to: bug-gnutls@@gnu.org
@anchor{gnutls-cli debug}
@subheading debug option (-d)
-@cindex gnutls-cli-debug
This is the ``enable debugging.'' option.
This option takes an argument number.
Specifies the debug level.
@anchor{gnutls-cli tofu}
@subheading tofu option
-@cindex gnutls-cli-tofu
This is the ``enable trust on first use authentication'' option.
This option will, in addition to certificate authentication, perform authentication based on previously seen public keys, a model similar to SSH authentication.
@anchor{gnutls-cli dane}
@subheading dane option
-@cindex gnutls-cli-dane
This is the ``enable dane certificate verification (dnssec)'' option.
This option will, in addition to certificate authentication using
@@ -141,14 +137,12 @@ the trusted CAs, verify the server certificates using on the DANE information
available via DNSSEC.
@anchor{gnutls-cli local-dns}
@subheading local-dns option
-@cindex gnutls-cli-local-dns
This is the ``use the local dns server for dnssec resolving.'' option.
This option will use the local DNS server for DNSSEC.
This is disabled by default due to many servers not allowing DNSSEC.
@anchor{gnutls-cli ca-verification}
@subheading ca-verification option
-@cindex gnutls-cli-ca-verification
This is the ``disable ca certificate verification'' option.
@@ -162,25 +156,21 @@ is enabled by default.
This option will disable CA certificate verification. It is to be used with the --dane or --tofu options.
@anchor{gnutls-cli ocsp}
@subheading ocsp option
-@cindex gnutls-cli-ocsp
This is the ``enable ocsp certificate verification'' option.
This option will enable verification of the peer's certificate using ocsp
@anchor{gnutls-cli resume}
@subheading resume option (-r)
-@cindex gnutls-cli-resume
This is the ``establish a session and resume'' option.
Connect, establish a session, reconnect and resume.
@anchor{gnutls-cli rehandshake}
@subheading rehandshake option (-e)
-@cindex gnutls-cli-rehandshake
This is the ``establish a session and rehandshake'' option.
Connect, establish a session and rehandshake immediately.
@anchor{gnutls-cli ocsp-status-request}
@subheading ocsp-status-request option
-@cindex gnutls-cli-ocsp-status-request
This is the ``enable ocsp status request'' option.
@@ -194,26 +184,22 @@ is enabled by default.
The client will indicate to the server in a TLS extension that it wants a OCSP status request.
@anchor{gnutls-cli starttls}
@subheading starttls option (-s)
-@cindex gnutls-cli-starttls
This is the ``connect, establish a plain session and start tls.'' option.
The TLS session will be initiated when EOF or a SIGALRM is received.
@anchor{gnutls-cli disable-extensions}
@subheading disable-extensions option
-@cindex gnutls-cli-disable-extensions
This is the ``disable all the tls extensions'' option.
This option disables all TLS extensions. Deprecated option. Use the priority string.
@anchor{gnutls-cli dh-bits}
@subheading dh-bits option
-@cindex gnutls-cli-dh-bits
This is the ``the minimum number of bits allowed for dh'' option.
This option takes an argument number.
This option sets the minimum number of bits allowed for a Diffie-Hellman key exchange. You may want to lower the default value if the peer sends a weak prime and you get an connection error with unacceptable prime.
@anchor{gnutls-cli priority}
@subheading priority option
-@cindex gnutls-cli-priority
This is the ``priorities string'' option.
This option takes an argument string.
@@ -225,7 +211,6 @@ Check the GnuTLS manual on section ``Priority strings'' for more
information on allowed keywords
@anchor{gnutls-cli list}
@subheading list option (-l)
-@cindex gnutls-cli-list
This is the ``print a list of the supported algorithms and modes'' option.
Print a list of the supported algorithms and modes. If a priority string is given then only the enabled ciphersuites are shown.
diff --git a/doc/invoke-gnutls-serv.texi b/doc/invoke-gnutls-serv.texi
index 1702432..29dad48 100644
--- a/doc/invoke-gnutls-serv.texi
+++ b/doc/invoke-gnutls-serv.texi
@@ -1,13 +1,12 @@
@node gnutls-serv Invocation
@section Invoking gnutls-serv
@pindex gnutls-serv
-@cindex GnuTLS server
@ignore
# -*- buffer-read-only: t -*- vi: set ro:
#
# DO NOT EDIT THIS FILE (invoke-gnutls-serv.texi)
#
-# It has been AutoGen-ed November 1, 2012 at 03:47:59 PM by AutoGen 5.16
+# It has been AutoGen-ed November 8, 2012 at 11:40:16 PM by AutoGen 5.16
# From the definitions ../src/serv-args.def
# and the template file agtexi-cmd.tpl
@end ignore
@@ -102,20 +101,17 @@ please send bug reports to: bug-gnutls@@gnu.org
@anchor{gnutls-serv debug}
@subheading debug option (-d)
-@cindex gnutls-serv-debug
This is the ``enable debugging.'' option.
This option takes an argument number.
Specifies the debug level.
@anchor{gnutls-serv heartbeat}
@subheading heartbeat option (-b)
-@cindex gnutls-serv-heartbeat
This is the ``activate heartbeat support'' option.
Regularly ping client via heartbeat extension messages
@anchor{gnutls-serv priority}
@subheading priority option
-@cindex gnutls-serv-priority
This is the ``priorities string'' option.
This option takes an argument string.
@@ -127,14 +123,12 @@ Check the GnuTLS manual on section ``Priority strings'' for more
information on allowed keywords
@anchor{gnutls-serv ocsp-response}
@subheading ocsp-response option
-@cindex gnutls-serv-ocsp-response
This is the ``the ocsp response to send to client'' option.
This option takes an argument file.
If the client requested an OCSP response, return data from this file to the client.
@anchor{gnutls-serv list}
@subheading list option (-l)
-@cindex gnutls-serv-list
This is the ``print a list of the supported algorithms and modes'' option.
Print a list of the supported algorithms and modes. If a priority string is given then only the enabled ciphersuites are shown.
diff --git a/doc/invoke-ocsptool.texi b/doc/invoke-ocsptool.texi
index e353492..c344dcd 100644
--- a/doc/invoke-ocsptool.texi
+++ b/doc/invoke-ocsptool.texi
@@ -1,13 +1,12 @@
@node ocsptool Invocation
@section Invoking ocsptool
@pindex ocsptool
-@cindex GnuTLS OCSP tool
@ignore
# -*- buffer-read-only: t -*- vi: set ro:
#
# DO NOT EDIT THIS FILE (invoke-ocsptool.texi)
#
-# It has been AutoGen-ed May 9, 2012 at 08:06:13 PM by AutoGen 5.16
+# It has been AutoGen-ed November 8, 2012 at 11:40:17 PM by AutoGen 5.16
# From the definitions ../src/ocsptool-args.def
# and the template file agtexi-cmd.tpl
@end ignore
@@ -93,14 +92,12 @@ please send bug reports to: bug-gnutls@@gnu.org
@anchor{ocsptool debug}
@subheading debug option (-d)
-@cindex ocsptool-debug
This is the ``enable debugging.'' option.
This option takes an argument number.
Specifies the debug level.
@anchor{ocsptool ask}
@subheading ask option
-@cindex ocsptool-ask
This is the ``ask an ocsp/http server on a certificate validity'' option.
This option takes an optional argument string @file{server name|url}.
diff --git a/doc/invoke-p11tool.texi b/doc/invoke-p11tool.texi
index e40de1b..b09e00b 100644
--- a/doc/invoke-p11tool.texi
+++ b/doc/invoke-p11tool.texi
@@ -1,13 +1,12 @@
@node p11tool Invocation
@subsection Invoking p11tool
@pindex p11tool
-@cindex GnuTLS PKCS #11 tool
@ignore
# -*- buffer-read-only: t -*- vi: set ro:
#
# DO NOT EDIT THIS FILE (invoke-p11tool.texi)
#
-# It has been AutoGen-ed May 9, 2012 at 08:06:14 PM by AutoGen 5.16
+# It has been AutoGen-ed November 8, 2012 at 11:40:19 PM by AutoGen 5.16
# From the definitions ../src/p11tool-args.def
# and the template file agtexi-cmd.tpl
@end ignore
@@ -108,38 +107,32 @@ please send bug reports to: bug-gnutls@@gnu.org
@anchor{p11tool debug}
@subsubheading debug option (-d)
-@cindex p11tool-debug
This is the ``enable debugging.'' option.
This option takes an argument number.
Specifies the debug level.
@anchor{p11tool write}
@subsubheading write option
-@cindex p11tool-write
This is the ``writes the loaded objects to a pkcs #11 token'' option.
It can be used to write private keys, certificates or secret keys to a token.
@anchor{p11tool generate-rsa}
@subsubheading generate-rsa option
-@cindex p11tool-generate-rsa
This is the ``generate an rsa private-public key pair'' option.
Generates an RSA private-public key pair on the specified token.
@anchor{p11tool generate-dsa}
@subsubheading generate-dsa option
-@cindex p11tool-generate-dsa
This is the ``generate an rsa private-public key pair'' option.
Generates an RSA private-public key pair on the specified token.
@anchor{p11tool generate-ecc}
@subsubheading generate-ecc option
-@cindex p11tool-generate-ecc
This is the ``generate an rsa private-public key pair'' option.
Generates an RSA private-public key pair on the specified token.
@anchor{p11tool private}
@subsubheading private option
-@cindex p11tool-private
This is the ``marks the object to be written as private'' option.
@@ -153,27 +146,23 @@ is enabled by default.
The written object will require a PIN to be used.
@anchor{p11tool sec-param}
@subsubheading sec-param option
-@cindex p11tool-sec-param
This is the ``specify the security level'' option.
This option takes an argument string @file{Security parameter}.
This is alternative to the bits option. Available options are [low, legacy, normal, high, ultra].
@anchor{p11tool inder}
@subsubheading inder option
-@cindex p11tool-inder
This is the ``use der/raw format for input'' option.
Use DER/RAW format for input certificates and private keys.
@anchor{p11tool inraw}
@subsubheading inraw option
-@cindex p11tool-inraw
This is an alias for the inder option,
@pxref{p11tool inder, the inder option documentation}.
@anchor{p11tool provider}
@subsubheading provider option
-@cindex p11tool-provider
This is the ``specify the pkcs #11 provider library'' option.
This option takes an argument file.
diff --git a/doc/invoke-psktool.texi b/doc/invoke-psktool.texi
index 41dd9d0..27f45a4 100644
--- a/doc/invoke-psktool.texi
+++ b/doc/invoke-psktool.texi
@@ -1,13 +1,12 @@
@node psktool Invocation
@subsection Invoking psktool
@pindex psktool
-@cindex GnuTLS PSK tool
@ignore
# -*- buffer-read-only: t -*- vi: set ro:
#
# DO NOT EDIT THIS FILE (invoke-psktool.texi)
#
-# It has been AutoGen-ed May 9, 2012 at 08:06:14 PM by AutoGen 5.16
+# It has been AutoGen-ed November 8, 2012 at 11:40:18 PM by AutoGen 5.16
# From the definitions ../src/psk-args.def
# and the template file agtexi-cmd.tpl
@end ignore
@@ -64,7 +63,6 @@ please send bug reports to: bug-gnutls@@gnu.org
@anchor{psktool debug}
@subsubheading debug option (-d)
-@cindex psktool-debug
This is the ``enable debugging.'' option.
This option takes an argument number.
diff --git a/doc/invoke-srptool.texi b/doc/invoke-srptool.texi
index a0fafbd..3b19a4a 100644
--- a/doc/invoke-srptool.texi
+++ b/doc/invoke-srptool.texi
@@ -1,13 +1,12 @@
@node srptool Invocation
@subsection Invoking srptool
@pindex srptool
-@cindex GnuTLS SRP tool
@ignore
# -*- buffer-read-only: t -*- vi: set ro:
#
# DO NOT EDIT THIS FILE (invoke-srptool.texi)
#
-# It has been AutoGen-ed May 9, 2012 at 08:06:13 PM by AutoGen 5.16
+# It has been AutoGen-ed November 8, 2012 at 11:40:17 PM by AutoGen 5.16
# From the definitions ../src/srptool-args.def
# and the template file agtexi-cmd.tpl
@end ignore
@@ -76,27 +75,23 @@ please send bug reports to: bug-gnutls@@gnu.org
@anchor{srptool debug}
@subsubheading debug option (-d)
-@cindex srptool-debug
This is the ``enable debugging.'' option.
This option takes an argument number.
Specifies the debug level.
@anchor{srptool verify}
@subsubheading verify option
-@cindex srptool-verify
This is the ``just verify the password.'' option.
Verifies the password provided against the password file.
@anchor{srptool passwd-conf}
@subsubheading passwd-conf option (-v)
-@cindex srptool-passwd-conf
This is the ``specify a password conf file.'' option.
This option takes an argument string.
Specify a filename or a PKCS #11 URL to read the CAs from.
@anchor{srptool create-conf}
@subsubheading create-conf option
-@cindex srptool-create-conf
This is the ``generate a password configuration file.'' option.
This option takes an argument string.
diff --git a/doc/invoke-tpmtool.texi b/doc/invoke-tpmtool.texi
index 3a30e4b..bf8d7fc 100644
--- a/doc/invoke-tpmtool.texi
+++ b/doc/invoke-tpmtool.texi
@@ -1,13 +1,12 @@
@node tpmtool Invocation
@subsection Invoking tpmtool
@pindex tpmtool
-@cindex GnuTLS TPM tool
@ignore
# -*- buffer-read-only: t -*- vi: set ro:
#
# DO NOT EDIT THIS FILE (invoke-tpmtool.texi)
#
-# It has been AutoGen-ed July 21, 2012 at 10:14:33 PM by AutoGen 5.16
+# It has been AutoGen-ed November 8, 2012 at 11:40:19 PM by AutoGen 5.16
# From the definitions ../src/tpmtool-args.def
# and the template file agtexi-cmd.tpl
@end ignore
@@ -93,14 +92,12 @@ please send bug reports to: bug-gnutls@@gnu.org
@anchor{tpmtool debug}
@subsubheading debug option (-d)
-@cindex tpmtool-debug
This is the ``enable debugging.'' option.
This option takes an argument number.
Specifies the debug level.
@anchor{tpmtool generate-rsa}
@subsubheading generate-rsa option
-@cindex tpmtool-generate-rsa
This is the ``generate an rsa private-public key pair'' option.
Generates an RSA private-public key pair in the TPM chip.
@@ -108,7 +105,6 @@ The key may be stored in filesystem and protected by a PIN, or stored (registere
in the TPM chip flash.
@anchor{tpmtool user}
@subsubheading user option
-@cindex tpmtool-user
This is the ``any registered key will be a user key'' option.
@@ -126,7 +122,6 @@ system.
The generated key will be stored in a user specific persistent storage.
@anchor{tpmtool system}
@subsubheading system option
-@cindex tpmtool-system
This is the ``any registred key will be a system key'' option.
@@ -144,7 +139,6 @@ user.
The generated key will be stored in system persistent storage.
@anchor{tpmtool sec-param}
@subsubheading sec-param option
-@cindex tpmtool-sec-param
This is the ``specify the security level [low, legacy, normal, high, ultra].'' option.
This option takes an argument string @file{Security parameter}.
@@ -152,7 +146,6 @@ This is alternative to the bits option. Note however that the
values allowed by the TPM chip are quantized and given values may be rounded up.
@anchor{tpmtool inder}
@subsubheading inder option
-@cindex tpmtool-inder
This is the ``use the der format for keys.'' option.
The input files will be assumed to be in the portable
@@ -160,7 +153,6 @@ DER format of TPM. The default format is a custom format used by various
TPM tools
@anchor{tpmtool outder}
@subsubheading outder option
-@cindex tpmtool-outder
This is the ``use der format for output keys'' option.
The output will be in the TPM portable DER format.
diff --git a/doc/manpages/tpmtool.1 b/doc/manpages/tpmtool.1
index ba613e1..455f1aa 100644
--- a/doc/manpages/tpmtool.1
+++ b/doc/manpages/tpmtool.1
@@ -1,8 +1,8 @@
-.TH tpmtool 1 "21 Jul 2012" "@VERSION@" "User Commands"
+.TH tpmtool 1 "08 Nov 2012" "@VERSION@" "User Commands"
.\"
.\" DO NOT EDIT THIS FILE (tpmtool-args.man)
.\"
-.\" It has been AutoGen-ed July 21, 2012 at 10:13:55 PM by AutoGen 5.16
+.\" It has been AutoGen-ed November 8, 2012 at 11:35:17 PM by AutoGen 5.16
.\" From the definitions ../../src/tpmtool-args.def.tmp
.\" and the template file agman-cmd.tpl
.\"
diff --git a/doc/scripts/cleanup-autogen.pl b/doc/scripts/cleanup-autogen.pl
index fdc9ecd..6f38f5e 100755
--- a/doc/scripts/cleanup-autogen.pl
+++ b/doc/scripts/cleanup-autogen.pl
@@ -51,6 +51,12 @@ while ($line = <>) {
$line = "\@subheading $1\n";
}
+ if ($line =~ /\@cindex\s(.*)/) {
+ if ($line !~ /help/) {
+ next;
+ }
+ }
+
print $line;
$i++;
}
diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 1f6363a..b650ce7 100644
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -102,7 +102,7 @@ check_ocsp_response (gnutls_session_t session, gnutls_x509_crt_t cert,
int ret;
unsigned int status, cert_status;
time_t rtime, vtime, ntime, now;
- int check_failed;
+ int check_failed = 0;
now = gnutls_time(0);
@@ -130,7 +130,12 @@ check_ocsp_response (gnutls_session_t session, gnutls_x509_crt_t cert,
ret = gnutls_ocsp_resp_verify_direct( resp, issuer, &status, 0);
if (ret < 0)
- return gnutls_assert_val(ret);
+ {
+ ret = gnutls_assert_val(0);
+ gnutls_assert();
+ check_failed = 1;
+ goto cleanup;
+ }
/* do not consider revocation data if response was not verified */
if (status != 0)
@@ -153,6 +158,7 @@ check_ocsp_response (gnutls_session_t session, gnutls_x509_crt_t cert,
if (cert_status == GNUTLS_OCSP_CERT_REVOKED)
{
_gnutls_audit_log(session, "The certificate was revoked via OCSP\n");
+ check_failed = 1;
*ostatus |= GNUTLS_CERT_REVOKED;
ret = gnutls_assert_val(0);
goto cleanup;
@@ -181,7 +187,7 @@ check_ocsp_response (gnutls_session_t session, gnutls_x509_crt_t cert,
goto cleanup;
}
}
-
+
ret = 0;
cleanup:
if (check_failed == 0)
diff --git a/src/certtool-args.c b/src/certtool-args.c
index 3608bbf..016c786 100644
--- a/src/certtool-args.c
+++ b/src/certtool-args.c
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (certtool-args.c)
*
- * It has been AutoGen-ed October 13, 2012 at 10:33:30 PM by AutoGen 5.16
+ * It has been AutoGen-ed November 8, 2012 at 11:35:51 PM by AutoGen 5.16
* From the definitions certtool-args.def
* and the template file options
*
diff --git a/src/certtool-args.h b/src/certtool-args.h
index 0339b00..d10c14d 100644
--- a/src/certtool-args.h
+++ b/src/certtool-args.h
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (certtool-args.h)
*
- * It has been AutoGen-ed October 13, 2012 at 10:33:30 PM by AutoGen 5.16
+ * It has been AutoGen-ed November 8, 2012 at 11:35:51 PM by AutoGen 5.16
* From the definitions certtool-args.def
* and the template file options
*
diff --git a/src/cli-args.c b/src/cli-args.c
index d02345d..065894c 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 1, 2012 at 03:36:16 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 */ "[email protected]\0"
-/* 3568 */ "\n\n\0"
-/* 3571 */ "\n"
+/* 3479 */ "[email protected]\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 8fafbf4..052cd59 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 384c7d0..576f11e 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 1, 2012 at 03:36:16 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-debug-args.c b/src/cli-debug-args.c
index f0df874..c841ff9 100644
--- a/src/cli-debug-args.c
+++ b/src/cli-debug-args.c
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (cli-debug-args.c)
*
- * It has been AutoGen-ed May 9, 2012 at 08:04:46 PM by AutoGen 5.16
+ * It has been AutoGen-ed November 8, 2012 at 11:35:50 PM by AutoGen 5.16
* From the definitions cli-debug-args.def
* and the template file options
*
diff --git a/src/cli-debug-args.h b/src/cli-debug-args.h
index b902acd..2336263 100644
--- a/src/cli-debug-args.h
+++ b/src/cli-debug-args.h
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (cli-debug-args.h)
*
- * It has been AutoGen-ed May 9, 2012 at 08:04:46 PM by AutoGen 5.16
+ * It has been AutoGen-ed November 8, 2012 at 11:35:50 PM by AutoGen 5.16
* From the definitions cli-debug-args.def
* and the template file options
*
diff --git a/src/cli.c b/src/cli.c
index 074adeb..95fe8e0 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);
diff --git a/src/danetool-args.c b/src/danetool-args.c
index 4eca21f..d9f305b 100644
--- a/src/danetool-args.c
+++ b/src/danetool-args.c
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (danetool-args.c)
*
- * It has been AutoGen-ed November 4, 2012 at 05:31:43 PM by AutoGen 5.16
+ * It has been AutoGen-ed November 8, 2012 at 11:35:55 PM by AutoGen 5.16
* From the definitions danetool-args.def
* and the template file options
*
diff --git a/src/danetool-args.h b/src/danetool-args.h
index 139727b..0cb2354 100644
--- a/src/danetool-args.h
+++ b/src/danetool-args.h
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (danetool-args.h)
*
- * It has been AutoGen-ed November 4, 2012 at 05:31:43 PM by AutoGen 5.16
+ * It has been AutoGen-ed November 8, 2012 at 11:35:55 PM by AutoGen 5.16
* From the definitions danetool-args.def
* and the template file options
*
diff --git a/src/ocsptool-args.c b/src/ocsptool-args.c
index 99860e3..68521c3 100644
--- a/src/ocsptool-args.c
+++ b/src/ocsptool-args.c
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (ocsptool-args.c)
*
- * It has been AutoGen-ed May 9, 2012 at 08:04:44 PM by AutoGen 5.16
+ * It has been AutoGen-ed November 8, 2012 at 11:35:48 PM by AutoGen 5.16
* From the definitions ocsptool-args.def
* and the template file options
*
diff --git a/src/ocsptool-args.h b/src/ocsptool-args.h
index 0367f1b..9344413 100644
--- a/src/ocsptool-args.h
+++ b/src/ocsptool-args.h
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (ocsptool-args.h)
*
- * It has been AutoGen-ed May 9, 2012 at 08:04:44 PM by AutoGen 5.16
+ * It has been AutoGen-ed November 8, 2012 at 11:35:48 PM by AutoGen 5.16
* From the definitions ocsptool-args.def
* and the template file options
*
diff --git a/src/p11tool-args.c b/src/p11tool-args.c
index 91eed27..25e9258 100644
--- a/src/p11tool-args.c
+++ b/src/p11tool-args.c
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (p11tool-args.c)
*
- * It has been AutoGen-ed May 9, 2012 at 08:04:48 PM by AutoGen 5.16
+ * It has been AutoGen-ed November 8, 2012 at 11:35:48 PM by AutoGen 5.16
* From the definitions p11tool-args.def
* and the template file options
*
diff --git a/src/p11tool-args.h b/src/p11tool-args.h
index 0e92da6..6f83e64 100644
--- a/src/p11tool-args.h
+++ b/src/p11tool-args.h
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (p11tool-args.h)
*
- * It has been AutoGen-ed May 9, 2012 at 08:04:48 PM by AutoGen 5.16
+ * It has been AutoGen-ed November 8, 2012 at 11:35:48 PM by AutoGen 5.16
* From the definitions p11tool-args.def
* and the template file options
*
diff --git a/src/psk-args.c b/src/psk-args.c
index 232dd76..35630e9 100644
--- a/src/psk-args.c
+++ b/src/psk-args.c
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (psk-args.c)
*
- * It has been AutoGen-ed May 9, 2012 at 08:04:46 PM by AutoGen 5.16
+ * It has been AutoGen-ed November 8, 2012 at 11:35:48 PM by AutoGen 5.16
* From the definitions psk-args.def
* and the template file options
*
diff --git a/src/psk-args.h b/src/psk-args.h
index e682e2c..1c01f70 100644
--- a/src/psk-args.h
+++ b/src/psk-args.h
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (psk-args.h)
*
- * It has been AutoGen-ed May 9, 2012 at 08:04:46 PM by AutoGen 5.16
+ * It has been AutoGen-ed November 8, 2012 at 11:35:48 PM by AutoGen 5.16
* From the definitions psk-args.def
* and the template file options
*
diff --git a/src/serv-args.c b/src/serv-args.c
index 9f9f3aa..61e4221 100644
--- a/src/serv-args.c
+++ b/src/serv-args.c
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (serv-args.c)
*
- * It has been AutoGen-ed November 1, 2012 at 03:36:17 PM by AutoGen 5.16
+ * It has been AutoGen-ed November 8, 2012 at 11:35:50 PM by AutoGen 5.16
* From the definitions serv-args.def
* and the template file options
*
diff --git a/src/serv-args.h b/src/serv-args.h
index 63e7ff8..27e4765 100644
--- a/src/serv-args.h
+++ b/src/serv-args.h
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (serv-args.h)
*
- * It has been AutoGen-ed November 1, 2012 at 03:36:17 PM by AutoGen 5.16
+ * It has been AutoGen-ed November 8, 2012 at 11:35:50 PM by AutoGen 5.16
* From the definitions serv-args.def
* and the template file options
*
diff --git a/src/srptool-args.c b/src/srptool-args.c
index 9e31a59..204520e 100644
--- a/src/srptool-args.c
+++ b/src/srptool-args.c
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (srptool-args.c)
*
- * It has been AutoGen-ed May 9, 2012 at 08:04:44 PM by AutoGen 5.16
+ * It has been AutoGen-ed November 8, 2012 at 11:35:51 PM by AutoGen 5.16
* From the definitions srptool-args.def
* and the template file options
*
diff --git a/src/srptool-args.h b/src/srptool-args.h
index 95a9da0..0e1dd4f 100644
--- a/src/srptool-args.h
+++ b/src/srptool-args.h
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (srptool-args.h)
*
- * It has been AutoGen-ed May 9, 2012 at 08:04:44 PM by AutoGen 5.16
+ * It has been AutoGen-ed November 8, 2012 at 11:35:51 PM by AutoGen 5.16
* From the definitions srptool-args.def
* and the template file options
*
diff --git a/src/tpmtool-args.c b/src/tpmtool-args.c
index 886e522..749633e 100644
--- a/src/tpmtool-args.c
+++ b/src/tpmtool-args.c
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (tpmtool-args.c)
*
- * It has been AutoGen-ed July 21, 2012 at 10:09:08 PM by AutoGen 5.16
+ * It has been AutoGen-ed November 8, 2012 at 11:35:56 PM by AutoGen 5.16
* From the definitions tpmtool-args.def
* and the template file options
*
diff --git a/src/tpmtool-args.h b/src/tpmtool-args.h
index 6666794..8a4ec73 100644
--- a/src/tpmtool-args.h
+++ b/src/tpmtool-args.h
@@ -2,7 +2,7 @@
*
* DO NOT EDIT THIS FILE (tpmtool-args.h)
*
- * It has been AutoGen-ed July 21, 2012 at 10:09:08 PM by AutoGen 5.16
+ * It has been AutoGen-ed November 8, 2012 at 11:35:56 PM by AutoGen 5.16
* From the definitions tpmtool-args.def
* and the template file options
*
hooks/post-receive
--
GNU gnutls