Applied documentation and prototype fixes reported by Evan Martin <martine@danga...

diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index 03e1147068dbeb03f671957e01f597115a47aa67..14e1e34483cf99a48e17d1b3c45c359c38e48b24 100644 (file)
--- a/includes/gnutls/gnutls.h.in
+++ b/includes/gnutls/gnutls.h.in
@@ -692,6 +692,10 @@ extern "C"
                                           const gnutls_datum_t * KEY,
                                           gnutls_x509_crt_fmt_t type);
 
+  void gnutls_certificate_send_x509_rdn_sequence (gnutls_session_t session,
+                                             int status);
+                                             
+
   extern int
     gnutls_certificate_set_x509_simple_pkcs12_file
     (gnutls_certificate_credentials_t res, const char *pkcs12file,

diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index 3eb7c2b58cae3a87279eff8f7c745b56da1406f5..9c7928895a2d5445afd462070dbddb9f2d8bc2c3 100644 (file)
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -314,19 +314,19 @@ gnutls_certificate_server_set_request (gnutls_session_t session,
   * to be used in the handshake.
   * The callback's function prototype is:
   * int (*callback)(gnutls_session_t, const gnutls_datum_t* req_ca_dn, int nreqs, 
-  * gnutls_pk_algorithm_t* pk_algos, int pk_algos_length, gnutls_retr_st* st);
+  * const gnutls_pk_algorithm_t* pk_algos, int pk_algos_length, gnutls_retr_st* st);
   *
-  * @st should contain the certificates and private keys.
-  *
-  * @req_ca_cert, is only used in X.509 certificates. 
+  * @req_ca_cert is only used in X.509 certificates. 
   * Contains a list with the CA names that the server considers trusted. 
   * Normally we should send a certificate that is signed
   * by one of these CAs. These names are DER encoded. To get a more
   * meaningful value use the function gnutls_x509_rdn_get().
   *
-  * @pk_algos, contains a list with server's acceptable signature algorithms.
+  * @pk_algos contains a list with server's acceptable signature algorithms.
   * The certificate returned should support the server's given algorithms.
   *
+  * @st should contain the certificates and private keys.
+  *
   * If the callback function is provided then gnutls will call it, in the
   * handshake, after the certificate request message has been received.
   *
@@ -522,7 +522,7 @@ _gnutls_openpgp_crt_verify_peers (gnutls_session_t session,
   *
   * Returns a negative error code on error and zero on success.
   *
-  * This is the same as gnutls_x509_verify_certificate() and uses the
+  * This is the same as gnutls_x509_crt_list_verify() and uses the
   * loaded CAs in the credentials as trusted CAs.
   *
   * Note that some commonly used X.509 Certificate Authorities are
@@ -571,7 +571,7 @@ gnutls_certificate_verify_peers2 (gnutls_session_t session,
   * gnutls_certificate_status_t enumerated elements bitwise or'd, or a
   * negative value on error.
   *
-  * This is the same as gnutls_x509_verify_certificate().
+  * This is the same as gnutls_x509_crt_list_verify().
   *
   * Deprecated: Use gnutls_certificate_verify_peers2() instead.
   *

diff --git a/src/tls_test.c b/src/tls_test.c
index 2134474a101b8a235059bc328cd087f05ebb15b2..d34eec4a56376d4dd5a8707f3e2f56fb6e5168d3 100644 (file)
--- a/src/tls_test.c
+++ b/src/tls_test.c
@@ -245,7 +245,7 @@ main (int argc, char **argv)
       if (i > 3 && tls1_1_ok == 0 && tls1_ok == 0 && ssl3_ok == 0)
        {
          fprintf (stderr,
-                  "\nServer does not support none of SSL 3.0, TLS 1.0 and TLS 1.1\n");
+                  "\nServer does not support any of SSL 3.0, TLS 1.0 and TLS 1.1\n");
          break;
        }