From 7da9b05562d9456157f5c801ff4c526e1fe2e2f0 Mon Sep 17 00:00:00 2001
From: Jojo-1000 <33495614+Jojo-1000@users.noreply.github.com>
Date: Tue, 2 Nov 2021 17:21:14 +0100
Subject: [PATCH] Update mbedtls version to 3.0.0 from 2.25.0

---
 CMakeLists.txt            | 2 +-
 lib/mbedtls               | 2 +-
 src/EntertainmentMode.cpp | 1 -
 src/TimePattern.cpp       | 8 ++++----
 test/test_ColorUnits.cpp  | 5 +++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e27d21..fa1f812 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.10.2)
 
 if(${CMAKE_VERSION} VERSION_LESS 3.11)
 	cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
diff --git a/lib/mbedtls b/lib/mbedtls
index fc86f3f..8df2f8e 160000
--- a/lib/mbedtls
+++ b/lib/mbedtls
@@ -1 +1 @@
-Subproject commit fc86f3f147890a65ffa9b21eef6be96ce35371c5
+Subproject commit 8df2f8e7b9c7bb9390ac74bb7bace27edca81a2b
diff --git a/src/EntertainmentMode.cpp b/src/EntertainmentMode.cpp
index 948b05b..0aa89d0 100644
--- a/src/EntertainmentMode.cpp
+++ b/src/EntertainmentMode.cpp
@@ -21,7 +21,6 @@
 **/
 
 #include "hueplusplus/EntertainmentMode.h"
-#include "mbedtls/certs.h"
 #include "mbedtls/ctr_drbg.h"
 #include "mbedtls/debug.h"
 #include "mbedtls/entropy.h"
diff --git a/src/TimePattern.cpp b/src/TimePattern.cpp
index be9ef87..16ea8e4 100644
--- a/src/TimePattern.cpp
+++ b/src/TimePattern.cpp
@@ -130,14 +130,14 @@ std::string durationTo_hh_mm_ss(std::chrono::system_clock::duration duration)
     {
         throw HueException(CURRENT_FILE_INFO, "Duration parameter longer than 1 day");
     }
-    int numH = static_cast<int>(duration_cast<hours>(duration).count());
+    unsigned int numH = static_cast<unsigned int>(duration_cast<hours>(duration).count());
     duration -= hours(numH);
-    int numM = static_cast<int>(duration_cast<minutes>(duration).count());
+    unsigned int numM = static_cast<unsigned int>(duration_cast<minutes>(duration).count());
     duration -= minutes(numM);
-    int numS = static_cast<int>(duration_cast<seconds>(duration).count());
+    unsigned int numS = static_cast<unsigned int>(duration_cast<seconds>(duration).count());
 
     char result[9];
-    std::sprintf(result, "%02d:%02d:%02d", numH, numM, numS);
+    std::snprintf(result, 9, "%02u:%02u:%02u", numH, numM, numS);
     return std::string(result);
 }
 
diff --git a/test/test_ColorUnits.cpp b/test/test_ColorUnits.cpp
index bd81f1f..9b55e50 100644
--- a/test/test_ColorUnits.cpp
+++ b/test/test_ColorUnits.cpp
@@ -125,7 +125,7 @@ TEST(RGB, toHueSaturation)
         EXPECT_EQ(254, hs.saturation);
     }
     {
-        const RGB darkGreen{64, 128, 128 };
+        const RGB darkGreen {64, 128, 128};
         HueSaturation hs = darkGreen.toHueSaturation();
         EXPECT_EQ(38250, hs.hue);
         EXPECT_EQ(127, hs.saturation);
@@ -192,7 +192,8 @@ TEST(RGB, fromXY)
     int maxDiffB = 0;
     for (int i = 0; i < N; ++i)
     {
-        const RGB rgb {dist(rng), dist(rng), dist(rng)};
+        const RGB rgb {
+            static_cast<uint8_t>(dist(rng)), static_cast<uint8_t>(dist(rng)), static_cast<uint8_t>(dist(rng))};
         const XYBrightness xy = rgb.toXY();
         const RGB back = RGB::fromXY(xy);
         int diffR = (rgb.r - back.r) * (rgb.r - back.r);
--
libgit2 0.21.4