doc update

13 files changed, 24 insertions, 66 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f5569d1363..849034eb74 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -541,9 +541,11 @@ ENUMS += enums/gnutls_pkcs11_obj_type_t
 ENUMS += enums/gnutls_pkcs11_token_info_t
 ENUMS += enums/gnutls_pkcs12_bag_type_t
 ENUMS += enums/gnutls_pkcs_encrypt_flags_t
+ENUMS += enums/gnutls_privkey_flags_t
 ENUMS += enums/gnutls_privkey_type_t
 ENUMS += enums/gnutls_protocol_t
 ENUMS += enums/gnutls_psk_key_flags
+ENUMS += enums/gnutls_pubkey_flags_t
 ENUMS += enums/gnutls_rnd_level_t
 ENUMS += enums/gnutls_sec_param_t
 ENUMS += enums/gnutls_server_name_type_t
@@ -696,8 +698,12 @@ FUNCS += functions/gnutls_certificate_set_x509_key
 FUNCS += functions/gnutls_certificate_set_x509_key.short
 FUNCS += functions/gnutls_certificate_set_x509_key_file
 FUNCS += functions/gnutls_certificate_set_x509_key_file.short
+FUNCS += functions/gnutls_certificate_set_x509_key_file2
+FUNCS += functions/gnutls_certificate_set_x509_key_file2.short
 FUNCS += functions/gnutls_certificate_set_x509_key_mem
 FUNCS += functions/gnutls_certificate_set_x509_key_mem.short
+FUNCS += functions/gnutls_certificate_set_x509_key_mem2
+FUNCS += functions/gnutls_certificate_set_x509_key_mem2.short
 FUNCS += functions/gnutls_certificate_set_x509_simple_pkcs12_file
 FUNCS += functions/gnutls_certificate_set_x509_simple_pkcs12_file.short
 FUNCS += functions/gnutls_certificate_set_x509_simple_pkcs12_mem
@@ -1648,6 +1654,8 @@ FUNCS += functions/gnutls_set_default_priority
 FUNCS += functions/gnutls_set_default_priority.short
 FUNCS += functions/gnutls_sign_algorithm_get
 FUNCS += functions/gnutls_sign_algorithm_get.short
+FUNCS += functions/gnutls_sign_algorithm_get_client
+FUNCS += functions/gnutls_sign_algorithm_get_client.short
 FUNCS += functions/gnutls_sign_algorithm_get_requested
 FUNCS += functions/gnutls_sign_algorithm_get_requested.short
 FUNCS += functions/gnutls_sign_callback_get
diff --git a/doc/invoke-certtool.texi b/doc/invoke-certtool.texi
index bf37477c28..c54685475a 100644
--- a/doc/invoke-certtool.texi
+++ b/doc/invoke-certtool.texi
@@ -6,7 +6,7 @@
 # 
 # DO NOT EDIT THIS FILE   (invoke-certtool.texi)
 # 
-# It has been AutoGen-ed  March 22, 2013 at 07:23:24 PM by AutoGen 5.16
+# It has been AutoGen-ed  May  9, 2013 at 01:39:30 PM by AutoGen 5.16
 # From the definitions    ../src/certtool-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/doc/invoke-danetool.texi b/doc/invoke-danetool.texi
index 4550f595b1..8857ed60d7 100644
--- a/doc/invoke-danetool.texi
+++ b/doc/invoke-danetool.texi
@@ -6,7 +6,7 @@
 # 
 # DO NOT EDIT THIS FILE   (invoke-danetool.texi)
 # 
-# It has been AutoGen-ed  March 22, 2013 at 07:23:31 PM by AutoGen 5.16
+# It has been AutoGen-ed  May  9, 2013 at 01:39:37 PM by AutoGen 5.16
 # From the definitions    ../src/danetool-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/doc/invoke-gnutls-cli-debug.texi b/doc/invoke-gnutls-cli-debug.texi
index 33b1ce5aa9..80757c8c57 100644
--- a/doc/invoke-gnutls-cli-debug.texi
+++ b/doc/invoke-gnutls-cli-debug.texi
@@ -6,7 +6,7 @@
 # 
 # DO NOT EDIT THIS FILE   (invoke-gnutls-cli-debug.texi)
 # 
-# It has been AutoGen-ed  March 22, 2013 at 07:23:21 PM by AutoGen 5.16
+# It has been AutoGen-ed  May  9, 2013 at 01:39:22 PM by AutoGen 5.16
 # From the definitions    ../src/cli-debug-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/doc/invoke-gnutls-cli.texi b/doc/invoke-gnutls-cli.texi
index 55bf894522..60f44daf0d 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  March 22, 2013 at 07:23:20 PM by AutoGen 5.16
+# It has been AutoGen-ed  May  9, 2013 at 01:39:20 PM by AutoGen 5.16
 # From the definitions    ../src/cli-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/doc/invoke-gnutls-serv.texi b/doc/invoke-gnutls-serv.texi
index 8812f1c994..3789bc3c6c 100644
--- a/doc/invoke-gnutls-serv.texi
+++ b/doc/invoke-gnutls-serv.texi
@@ -6,7 +6,7 @@
 # 
 # DO NOT EDIT THIS FILE   (invoke-gnutls-serv.texi)
 # 
-# It has been AutoGen-ed  March 22, 2013 at 07:23:22 PM by AutoGen 5.16
+# It has been AutoGen-ed  May  9, 2013 at 01:39:23 PM by AutoGen 5.16
 # From the definitions    ../src/serv-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/doc/invoke-ocsptool.texi b/doc/invoke-ocsptool.texi
index 52e26f57e3..0d84d1bb07 100644
--- a/doc/invoke-ocsptool.texi
+++ b/doc/invoke-ocsptool.texi
@@ -6,7 +6,7 @@
 # 
 # DO NOT EDIT THIS FILE   (invoke-ocsptool.texi)
 # 
-# It has been AutoGen-ed  March 22, 2013 at 07:23:26 PM by AutoGen 5.16
+# It has been AutoGen-ed  May  9, 2013 at 01:39:33 PM by AutoGen 5.16
 # From the definitions    ../src/ocsptool-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/doc/invoke-p11tool.texi b/doc/invoke-p11tool.texi
index 9f4069a043..ba26b880d6 100644
--- a/doc/invoke-p11tool.texi
+++ b/doc/invoke-p11tool.texi
@@ -6,7 +6,7 @@
 # 
 # DO NOT EDIT THIS FILE   (invoke-p11tool.texi)
 # 
-# It has been AutoGen-ed  March 22, 2013 at 07:23:29 PM by AutoGen 5.16
+# It has been AutoGen-ed  May  9, 2013 at 01:39:35 PM by AutoGen 5.16
 # From the definitions    ../src/p11tool-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/doc/invoke-psktool.texi b/doc/invoke-psktool.texi
index 60d5d9f193..12b60f6f58 100644
--- a/doc/invoke-psktool.texi
+++ b/doc/invoke-psktool.texi
@@ -6,7 +6,7 @@
 # 
 # DO NOT EDIT THIS FILE   (invoke-psktool.texi)
 # 
-# It has been AutoGen-ed  March 22, 2013 at 07:23:27 PM by AutoGen 5.16
+# It has been AutoGen-ed  May  9, 2013 at 01:39:34 PM by AutoGen 5.16
 # From the definitions    ../src/psk-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/doc/invoke-srptool.texi b/doc/invoke-srptool.texi
index eda94ec849..70174260d7 100644
--- a/doc/invoke-srptool.texi
+++ b/doc/invoke-srptool.texi
@@ -6,7 +6,7 @@
 # 
 # DO NOT EDIT THIS FILE   (invoke-srptool.texi)
 # 
-# It has been AutoGen-ed  March 22, 2013 at 07:23:25 PM by AutoGen 5.16
+# It has been AutoGen-ed  May  9, 2013 at 01:39:32 PM by AutoGen 5.16
 # From the definitions    ../src/srptool-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/doc/invoke-tpmtool.texi b/doc/invoke-tpmtool.texi
index ad49fe9eb2..3e8167b59b 100644
--- a/doc/invoke-tpmtool.texi
+++ b/doc/invoke-tpmtool.texi
@@ -6,7 +6,7 @@
 # 
 # DO NOT EDIT THIS FILE   (invoke-tpmtool.texi)
 # 
-# It has been AutoGen-ed  March 22, 2013 at 07:23:30 PM by AutoGen 5.16
+# It has been AutoGen-ed  May  9, 2013 at 01:39:36 PM by AutoGen 5.16
 # From the definitions    ../src/tpmtool-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -33,60 +33,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-tpmtool - GnuTLS TPM tool - Ver. @@VERSION@@
-USAGE:  tpmtool [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
-
-   -d, --debug=num            Enable debugging.
-                                - It must be in the range:
-                                  0 to 9999
-       --infile=file          Input file
-                                - file must pre-exist
-       --outfile=str          Output file
-       --generate-rsa         Generate an RSA private-public key pair
-       --register             Any generated key will be registered in the TPM
-                                - requires these options:
-                                generate-rsa
-       --signing              Any generated key will be a signing key
-                                - requires these options:
-                                generate-rsa
-                                -- and prohibits these options:
-                                legacy
-       --legacy               Any generated key will be a legacy key
-                                - requires these options:
-                                generate-rsa
-                                -- and prohibits these options:
-                                signing
-       --user                 Any registered key will be a user key
-                                - requires these options:
-                                register
-                                -- and prohibits these options:
-                                system
-       --system               Any registred key will be a system key
-                                - requires these options:
-                                register
-                                -- and prohibits these options:
-                                user
-       --pubkey=str           Prints the public key of the provided key
-       --list                 Lists all stored keys in the TPM
-       --delete=str           Delete the key identified by the given URL (UUID).
-       --sec-param=str        Specify the security level [low, legacy, normal, high, ultra].
-       --bits=num             Specify the number of bits for key generate
-       --inder                Use the DER format for keys.
-                                - disabled as --no-inder
-       --outder               Use DER format for output keys
-                                - disabled as --no-outder
-   -v, --version[=arg]        Output version information and exit
-   -h, --help                 Display extended usage information and exit
-   -!, --more-help            Extended usage information passed thru pager
-
-Options are specified by doubled hyphens and their name or by a single
-hyphen and the flag character.
-
-
-
-Program that allows handling cryptographic data from the TPM chip.
-
-please send bug reports to:  bug-gnutls@@gnu.org
+tpmtool is unavailable - no -h
 @end example
 @exampleindent 4
 
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index dacb361d20..6dbd769de5 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -145,7 +145,9 @@ APIMANS += gnutls_certificate_set_x509_crl_file.3
 APIMANS += gnutls_certificate_set_x509_crl_mem.3
 APIMANS += gnutls_certificate_set_x509_key.3
 APIMANS += gnutls_certificate_set_x509_key_file.3
+APIMANS += gnutls_certificate_set_x509_key_file2.3
 APIMANS += gnutls_certificate_set_x509_key_mem.3
+APIMANS += gnutls_certificate_set_x509_key_mem2.3
 APIMANS += gnutls_certificate_set_x509_simple_pkcs12_file.3
 APIMANS += gnutls_certificate_set_x509_simple_pkcs12_mem.3
 APIMANS += gnutls_certificate_set_x509_system_trust.3
@@ -621,6 +623,7 @@ APIMANS += gnutls_session_ticket_key_generate.3
 APIMANS += gnutls_set_default_export_priority.3
 APIMANS += gnutls_set_default_priority.3
 APIMANS += gnutls_sign_algorithm_get.3
+APIMANS += gnutls_sign_algorithm_get_client.3
 APIMANS += gnutls_sign_algorithm_get_requested.3
 APIMANS += gnutls_sign_callback_get.3
 APIMANS += gnutls_sign_callback_set.3
diff --git a/doc/manpages/tpmtool.1 b/doc/manpages/tpmtool.1
index 40fbf23c9d..aff1357bf2 100644
--- a/doc/manpages/tpmtool.1
+++ b/doc/manpages/tpmtool.1
@@ -1,8 +1,8 @@
-.TH tpmtool 1 "22 Mar 2013" "@VERSION@" "User Commands"
+.TH tpmtool 1 "09 May 2013" "@VERSION@" "User Commands"
 .\"
 .\"  DO NOT EDIT THIS FILE   (tpmtool-args.man)
 .\"  
-.\"  It has been AutoGen-ed  March 22, 2013 at 09:21:57 AM by AutoGen 5.16
+.\"  It has been AutoGen-ed  May  9, 2013 at 01:40:00 PM by AutoGen 5.16
 .\"  From the definitions    ../../src/tpmtool-args.def.tmp
 .\"  and the template file   agman-cmd.tpl
 .\"