*** empty log message ***

2 files changed, 8 insertions, 5 deletions

diff --git a/lib/ext_server_name.c b/lib/ext_server_name.c
index 6f41afba74..2b5c4d3ddc 100644
--- a/lib/ext_server_name.c
+++ b/lib/ext_server_name.c
@@ -200,8 +200,7 @@ int _gnutls_server_name_send_params(gnutls_session session, opaque * data,
   * gnutls_server_name_type.
   *
   * If @type is GNUTLS_NAME_DNS, then this function is to be used by servers
-  * that support virtual hosting, and the data will be null terminated.
-  * The client may give the server the dnsname they connected to.
+  * that support virtual hosting, and the data will be a null terminated UTF-8 string.
   *
   * If @data has not enough size to hold the server name GNUTLS_E_SHORT_MEMORY_BUFFER
   * is returned, and @data_length will hold the required size.
@@ -262,12 +261,13 @@ int gnutls_server_name_get(gnutls_session session, void *data,
   * @name_length: holds the length of name
   *
   * This function is to be used by clients that want to inform 
-  * ( via a TLS extension mechanism) the server of the name they
+  * (via a TLS extension mechanism) the server of the name they
   * connected to. This should be used by clients that connect
   * to servers that do virtual hosting.
   *
   * The value of @name depends on the @ind type. In case of GNUTLS_NAME_DNS,
-  * a null terminated string is expected. 
+  * an ASCII or UTF-8 null terminated string, without the trailing dot, is expected. 
+  * IPv4 or IPv6 addresses are not permitted.
   *
   **/
 int gnutls_server_name_set(gnutls_session session,
diff --git a/libextra/gnutls_srp.c b/libextra/gnutls_srp.c
index 6807407950..e80602b118 100644
--- a/libextra/gnutls_srp.c
+++ b/libextra/gnutls_srp.c
@@ -371,7 +371,8 @@ int gnutls_srp_allocate_client_credentials( gnutls_srp_client_credentials *sc) {
   * @password: is the user's password
   *
   * This function sets the username and password, in a gnutls_srp_client_credentials structure.
-  * Those will be used in SRP authentication.
+  * Those will be used in SRP authentication. @username and @password should be ASCII
+  * strings or UTF-8 strings prepared using the "SASLprep" profile of "stringprep".
   *
   * Returns 0 on success.
   **/
@@ -594,6 +595,8 @@ void gnutls_srp_set_server_credentials_function(
   *
   * The @username and @password must be allocated using gnutls_malloc().
   * @times will be 0 the first time called, and 1 the second.
+  * @username and @password should be ASCII strings or UTF-8 strings 
+  * prepared using the "SASLprep" profile of "stringprep".
   *
   * The callback function will be called once or twice per handshake.
   * The first time called, is before the ciphersuite is negotiated.