handshake: reduce assert printouts in common cases

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

diff --git a/lib/algorithms/protocols.c b/lib/algorithms/protocols.c
index be0224653716d9ca0c12b51cfde5ef0f699ab741..a7af6b834d84878e71340ebbae1833ab47340779 100644 (file)
--- a/lib/algorithms/protocols.c
+++ b/lib/algorithms/protocols.c
@@ -313,8 +313,8 @@ const version_entry_st *_gnutls_legacy_version_max(gnutls_session_t session)
 }
 
 /* Returns the number of bytes written to buffer or a negative
- * error code. It will return an error if there is no version
- * >= TLS 1.3.
+ * error code. It will return GNUTLS_E_UNSUPPORTED_VERSION_PACKET 
+ * if there is no version >= TLS 1.3.
  */
 int _gnutls_write_supported_versions(gnutls_session_t session, uint8_t *buffer, ssize_t buffer_size)
 {
@@ -362,7 +362,7 @@ int _gnutls_write_supported_versions(gnutls_session_t session, uint8_t *buffer,
                return gnutls_assert_val(GNUTLS_E_NO_PRIORITIES_WERE_SET);
 
        if (at_least_one_new == 0)
-               return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
+               return GNUTLS_E_UNSUPPORTED_VERSION_PACKET;
 
        return written_bytes;
 }

diff --git a/lib/ext/key_share.c b/lib/ext/key_share.c
index 5e82916de372018369534fd0b9b7aea442018246..d3ca155e278183a32819ba462bd2cb21fda74c88 100644 (file)
--- a/lib/ext/key_share.c
+++ b/lib/ext/key_share.c
@@ -634,7 +634,7 @@ key_share_send_params(gnutls_session_t session,
        if (session->security_parameters.entity == GNUTLS_CLIENT) {
                ver = _gnutls_version_max(session);
                if (unlikely(ver == NULL || ver->key_shares == 0))
-                       return gnutls_assert_val(0);
+                       return 0;
 
                /* write the total length later */
                lengthp = &extdata->data[extdata->length];