diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 87af27402..3327b2ca0 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -5671,7 +5671,7 @@ void mbedtls_ssl_init( mbedtls_ssl_context *ssl )
 int mbedtls_ssl_setup( mbedtls_ssl_context *ssl,
                        const mbedtls_ssl_config *conf )
 {
-    int err;
+    int ret;
 
     ssl->conf = conf;
 
@@ -5686,7 +5686,7 @@ int mbedtls_ssl_setup( mbedtls_ssl_context *ssl,
     if( ssl->in_buf == NULL )
     {
         MBEDTLS_SSL_DEBUG_MSG( 1, ( "alloc(%d bytes) failed", MBEDTLS_SSL_IN_BUFFER_LEN) );
-        err = MBEDTLS_ERR_SSL_ALLOC_FAILED;
+        ret = MBEDTLS_ERR_SSL_ALLOC_FAILED;
         goto error;
     }
 
@@ -5694,7 +5694,7 @@ int mbedtls_ssl_setup( mbedtls_ssl_context *ssl,
     if( ssl->out_buf == NULL )
     {
         MBEDTLS_SSL_DEBUG_MSG( 1, ( "alloc(%d bytes) failed", MBEDTLS_SSL_OUT_BUFFER_LEN) );
-        err = MBEDTLS_ERR_SSL_ALLOC_FAILED;
+        ret = MBEDTLS_ERR_SSL_ALLOC_FAILED;
         goto error;
     }
 
@@ -5729,7 +5729,7 @@ int mbedtls_ssl_setup( mbedtls_ssl_context *ssl,
         ssl->in_msg = ssl->in_buf + 13;
     }
 
-    if( ( err = ssl_handshake_init( ssl ) ) != 0 )
+    if( ( ret = ssl_handshake_init( ssl ) ) != 0 )
         goto error;
 
     return( 0 );
@@ -5755,7 +5755,7 @@ error:
     ssl->out_iv = NULL;
     ssl->out_msg = NULL;
 
-    return( err );
+    return( ret );
 }
 
 /*