summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2015-10-05 17:11:37 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2015-10-05 17:12:15 +0200
commit6c3a1a7300ac54a2037fe10925194c33d1633683 (patch)
treed2298aebaa61eb97b337a1423e89c362e22ea9af
parent7e053036736b16757dea5d3c7d9beb4ffa8d2488 (diff)
downloadgnutls-6c3a1a7300ac54a2037fe10925194c33d1633683.tar.gz
gnutls_record_recv: simplified text on GNUTLS_E_REHANDSHAKE
-rw-r--r--lib/gnutls_record.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index d83bf098c4..17e71acfc7 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -1677,19 +1677,18 @@ int gnutls_record_uncork(gnutls_session_t session, unsigned int flags)
* This function has the similar semantics with recv(). The only
* difference is that it accepts a GnuTLS session, and uses different
* error codes.
- * In the special case that a server requests a renegotiation, the
- * client may receive an error code of %GNUTLS_E_REHANDSHAKE. This
- * message may be simply ignored, replied with an alert
+ * In the special case that the peer requests a renegotiation, the
+ * caller will receive an error code of %GNUTLS_E_REHANDSHAKE. In case
+ * of a client, this message may be simply ignored, replied with an alert
* %GNUTLS_A_NO_RENEGOTIATION, or replied with a new handshake,
- * depending on the client's will.
+ * depending on the client's will. A server receiving this error code
+ * can only initiate a new handshake or terminate the session.
+ *
* If %EINTR is returned by the internal push function (the default
* is recv()) then %GNUTLS_E_INTERRUPTED will be returned. If
* %GNUTLS_E_INTERRUPTED or %GNUTLS_E_AGAIN is returned, you must
* call this function again to get the data. See also
* gnutls_record_get_direction().
- * A server may also receive %GNUTLS_E_REHANDSHAKE when a client has
- * initiated a handshake. In that case the server can only initiate a
- * handshake or terminate the connection.
*
* Returns: The number of bytes received and zero on EOF (for stream
* connections). A negative error code is returned in case of an error.