From: Fabian Keil <fk@fabiankeil.de>
Date: Sat, 22 Feb 2020 21:02:16 +0000 (+0100)
Subject: ssl_send_data(): Consistently return -1 in case of errors
X-Git-Tag: v_3_0_29~500
X-Git-Url: http://www.privoxy.org/gitweb/%22https:/faq/@default-cgi@/user-manual/static/@url@?a=commitdiff_plain;h=14f7edff7951eb3e664baed36a4b4b5c666a1937;p=privoxy.git

ssl_send_data(): Consistently return -1 in case of errors

... instead of passing on the MBEDTLS_ERR_* value which
the caller doesn't need to know.

Sponsored by: Robert Klemme
---

diff --git a/ssl.c b/ssl.c
index 7faee3a1..2f6dc51e 100644
--- a/ssl.c
+++ b/ssl.c
@@ -267,8 +267,8 @@ extern int ssl_send_data(mbedtls_ssl_context *ssl, const unsigned char *buf, siz
  *          2  :  buf = Pointer to buffer where data will be written
  *          3  :  max_length = Maximum number of bytes to read
  *
- * Returns     :  Number of bytes read, 0 for EOF, or negative
- *                value on error.
+ * Returns     :  Number of bytes read, 0 for EOF, or -1
+ *                on error.
  *
  *********************************************************************/
 extern int ssl_recv_data(mbedtls_ssl_context *ssl, unsigned char *buf, size_t max_length)
@@ -298,6 +298,8 @@ extern int ssl_recv_data(mbedtls_ssl_context *ssl, unsigned char *buf, size_t ma
       mbedtls_strerror(ret, err_buf, sizeof(err_buf));
       log_error(LOG_LEVEL_ERROR,
          "Receiving data over TLS/SSL failed: %s", err_buf);
+
+      return -1;
    }
 
    return ret;