summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/Makefile.am8
-rw-r--r--doc/invoke-gnutls-cli.texi18
-rw-r--r--doc/manpages/Makefile.am4
-rw-r--r--src/common.c2
4 files changed, 14 insertions, 18 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c0fd98c874..85f892f991 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1003,6 +1003,8 @@ FUNCS += functions/gnutls_ocsp_status_request_enable_client
FUNCS += functions/gnutls_ocsp_status_request_enable_client.short
FUNCS += functions/gnutls_ocsp_status_request_get
FUNCS += functions/gnutls_ocsp_status_request_get.short
+FUNCS += functions/gnutls_ocsp_status_request_is_checked
+FUNCS += functions/gnutls_ocsp_status_request_is_checked.short
FUNCS += functions/gnutls_openpgp_crt_check_hostname
FUNCS += functions/gnutls_openpgp_crt_check_hostname.short
FUNCS += functions/gnutls_openpgp_crt_deinit
@@ -1599,6 +1601,8 @@ FUNCS += functions/gnutls_sign_get_name
FUNCS += functions/gnutls_sign_get_name.short
FUNCS += functions/gnutls_sign_get_pk_algorithm
FUNCS += functions/gnutls_sign_get_pk_algorithm.short
+FUNCS += functions/gnutls_sign_is_secure
+FUNCS += functions/gnutls_sign_is_secure.short
FUNCS += functions/gnutls_sign_list
FUNCS += functions/gnutls_sign_list.short
FUNCS += functions/gnutls_srp_allocate_client_credentials
@@ -1633,12 +1637,16 @@ FUNCS += functions/gnutls_srp_verifier
FUNCS += functions/gnutls_srp_verifier.short
FUNCS += functions/gnutls_srtp_get_keys
FUNCS += functions/gnutls_srtp_get_keys.short
+FUNCS += functions/gnutls_srtp_get_mki
+FUNCS += functions/gnutls_srtp_get_mki.short
FUNCS += functions/gnutls_srtp_get_profile_id
FUNCS += functions/gnutls_srtp_get_profile_id.short
FUNCS += functions/gnutls_srtp_get_profile_name
FUNCS += functions/gnutls_srtp_get_profile_name.short
FUNCS += functions/gnutls_srtp_get_selected_profile
FUNCS += functions/gnutls_srtp_get_selected_profile.short
+FUNCS += functions/gnutls_srtp_set_mki
+FUNCS += functions/gnutls_srtp_set_mki.short
FUNCS += functions/gnutls_srtp_set_profile
FUNCS += functions/gnutls_srtp_set_profile.short
FUNCS += functions/gnutls_srtp_set_profile_direct
diff --git a/doc/invoke-gnutls-cli.texi b/doc/invoke-gnutls-cli.texi
index 5179dae7da..c4e9a6856b 100644
--- a/doc/invoke-gnutls-cli.texi
+++ b/doc/invoke-gnutls-cli.texi
@@ -6,7 +6,7 @@
#
# DO NOT EDIT THIS FILE (invoke-gnutls-cli.texi)
#
-# It has been AutoGen-ed November 8, 2012 at 11:40:16 PM by AutoGen 5.16
+# It has been AutoGen-ed November 10, 2012 at 12:25:39 AM by AutoGen 5.16
# From the definitions ../src/cli-args.def
# and the template file agtexi-cmd.tpl
@end ignore
@@ -57,9 +57,6 @@ USAGE: gnutls-cli [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [hostname]
-b, --heartbeat Activate heartbeat support
-e, --rehandshake Establish a session and rehandshake
--noticket Don't accept session tickets
- --ocsp-status-request Enable OCSP status request
- - disabled as --no-ocsp-status-request
- - enabled by default
-s, --starttls Connect, establish a plain session and start TLS.
-u, --udp Use DTLS (datagram TLS) over UDP
--mtu=num Set MTU for datagram TLS
@@ -169,19 +166,6 @@ Connect, establish a session, reconnect and resume.
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
-
-This is the ``enable ocsp status request'' option.
-
-@noindent
-This option has some usage constraints. It:
-@itemize @bullet
-@item
-is enabled by default.
-@end itemize
-
-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)
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 3b56904105..562a1428c9 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -309,6 +309,7 @@ APIMANS += gnutls_ocsp_resp_verify.3
APIMANS += gnutls_ocsp_resp_verify_direct.3
APIMANS += gnutls_ocsp_status_request_enable_client.3
APIMANS += gnutls_ocsp_status_request_get.3
+APIMANS += gnutls_ocsp_status_request_is_checked.3
APIMANS += gnutls_openpgp_crt_check_hostname.3
APIMANS += gnutls_openpgp_crt_deinit.3
APIMANS += gnutls_openpgp_crt_export.3
@@ -607,6 +608,7 @@ APIMANS += gnutls_sign_get_hash_algorithm.3
APIMANS += gnutls_sign_get_id.3
APIMANS += gnutls_sign_get_name.3
APIMANS += gnutls_sign_get_pk_algorithm.3
+APIMANS += gnutls_sign_is_secure.3
APIMANS += gnutls_sign_list.3
APIMANS += gnutls_srp_allocate_client_credentials.3
APIMANS += gnutls_srp_allocate_server_credentials.3
@@ -624,9 +626,11 @@ APIMANS += gnutls_srp_set_server_credentials_file.3
APIMANS += gnutls_srp_set_server_credentials_function.3
APIMANS += gnutls_srp_verifier.3
APIMANS += gnutls_srtp_get_keys.3
+APIMANS += gnutls_srtp_get_mki.3
APIMANS += gnutls_srtp_get_profile_id.3
APIMANS += gnutls_srtp_get_profile_name.3
APIMANS += gnutls_srtp_get_selected_profile.3
+APIMANS += gnutls_srtp_set_mki.3
APIMANS += gnutls_srtp_set_profile.3
APIMANS += gnutls_srtp_set_profile_direct.3
APIMANS += gnutls_store_commitment.3
diff --git a/src/common.c b/src/common.c
index 7eca925b32..412e776dc8 100644
--- a/src/common.c
+++ b/src/common.c
@@ -340,7 +340,7 @@ cert_verify (gnutls_session_t session, const char* hostname)
return 0;
}
- printf ("- %s\n", out.data);
+ printf ("- Status: %s\n", out.data);
gnutls_free(out.data);