diff --git a/library/ssl_cookie.c b/library/ssl_cookie.c
index efcce3c0c0..82efc42846 100644
--- a/library/ssl_cookie.c
+++ b/library/ssl_cookie.c
@@ -125,16 +125,15 @@ static int ssl_cookie_hmac( mbedtls_md_context_t *hmac_ctx,
                             unsigned char **p, unsigned char *end,
                             const unsigned char *cli_id, size_t cli_id_len )
 {
-    int ret;
     unsigned char hmac_out[COOKIE_MD_OUTLEN];
 
     if( (size_t)( end - *p ) < COOKIE_HMAC_LEN )
         return( MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL );
 
-    if( ( ret = mbedtls_md_hmac_reset(  hmac_ctx ) ) != 0 ||
-        ( ret = mbedtls_md_hmac_update( hmac_ctx, time, 4 ) ) != 0 ||
-        ( ret = mbedtls_md_hmac_update( hmac_ctx, cli_id, cli_id_len ) ) != 0 ||
-        ( ret = mbedtls_md_hmac_finish( hmac_ctx, hmac_out ) ) != 0 )
+    if( mbedtls_md_hmac_reset(  hmac_ctx ) != 0 ||
+        mbedtls_md_hmac_update( hmac_ctx, time, 4 ) != 0 ||
+        mbedtls_md_hmac_update( hmac_ctx, cli_id, cli_id_len ) != 0 ||
+        mbedtls_md_hmac_finish( hmac_ctx, hmac_out ) != 0 )
     {
         return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
     }
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 26476a38d7..bd010a4414 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -5722,7 +5722,7 @@ uint32_t mbedtls_ssl_get_verify_result( const mbedtls_ssl_context *ssl )
     if( ssl->session_negotiate != NULL )
         return( ssl->session_negotiate->verify_result );
 
-    return( -1 );
+    return( 0xFFFFFFFF );
 }
 
 const char *mbedtls_ssl_get_ciphersuite( const mbedtls_ssl_context *ssl )