From: Simon Josefsson <simon@josefsson.org>
Date: Mon, 10 Oct 2011 12:27:46 +0000 (+0200)
Subject: More doc fixes.
X-Git-Tag: gnutls_3_0_4~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=449d2e9f559bcf2598e1b56cc6085a1cdad0b237;p=thirdparty%2Fgnutls.git

More doc fixes.
---

diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 6c87b765ea..a3360a270d 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -154,6 +154,7 @@ APIMANS += gnutls_privkey_get_pk_algorithm.3
 APIMANS += gnutls_privkey_init.3
 APIMANS += gnutls_privkey_deinit.3
 APIMANS += gnutls_privkey_import_pkcs11.3
+APIMANS += gnutls_privkey_import_ext.3
 APIMANS += gnutls_privkey_import_x509.3
 APIMANS += gnutls_privkey_import_openpgp.3
 APIMANS += gnutls_privkey_sign_data.3
@@ -268,6 +269,7 @@ APIMANS += gnutls_psk_set_params_function.3
 APIMANS += gnutls_anon_set_params_function.3
 APIMANS += gnutls_certificate_set_x509_key_mem.3
 APIMANS += gnutls_certificate_set_x509_key.3
+APIMANS += gnutls_certificate_set_key.3
 APIMANS += gnutls_certificate_set_x509_key_file.3
 APIMANS += gnutls_certificate_set_x509_trust_mem.3
 APIMANS += gnutls_certificate_set_x509_trust.3
@@ -324,7 +326,6 @@ APIMANS += gnutls_pem_base64_encode.3
 APIMANS += gnutls_pem_base64_encode_alloc.3
 APIMANS += gnutls_pem_base64_decode.3
 APIMANS += gnutls_pem_base64_decode_alloc.3
-APIMANS += gnutls_register_md5_handler.3
 APIMANS += gnutls_global_init_extra.3
 APIMANS += gnutls_extra_check_version.3
 APIMANS += gnutls_x509_dn_oid_known.3
diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
index 7644e18025..02821de9d1 100644
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -274,8 +274,8 @@ void gnutls_certificate_set_retrieve_function2
 
 int
 gnutls_certificate_set_key (gnutls_certificate_credentials_t res,
-                            const char** name,
-                            int name_size,
+                            const char** names,
+                            int names_size,
                             gnutls_pcert_st * pcert_list,
                             int pcert_list_size,
                             gnutls_privkey_t key);