From ee6b02dfd718106a114725ca80f1958ce41ce3b1 Mon Sep 17 00:00:00 2001 From: Gaspard Petit Date: Fri, 7 Jun 2024 21:33:17 -0400 Subject: [PATCH] Updated modp_b64, cpp-base64, cppcodec, polfosol, picobase64 and chromium --- libs/IMUtility | 2 +- libs/ReneNyffenegger/cpp-base64 | 2 +- libs/chromium/modp_b64 | 2 +- libs/cppcodec | 2 +- libs/picobase64 | 2 +- src/IMUtility/polfosol_imutility.h | 2 +- src/modp_b64_chromium/modp_b64_chromium.cpp | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/IMUtility b/libs/IMUtility index 2496f70..245fa92 160000 --- a/libs/IMUtility +++ b/libs/IMUtility @@ -1 +1 @@ -Subproject commit 2496f709b94b7f7312c6e9a6020acf7cd484d704 +Subproject commit 245fa927b2676c730a0be52d0f38e144868949f8 diff --git a/libs/ReneNyffenegger/cpp-base64 b/libs/ReneNyffenegger/cpp-base64 index c65b936..951de60 160000 --- a/libs/ReneNyffenegger/cpp-base64 +++ b/libs/ReneNyffenegger/cpp-base64 @@ -1 +1 @@ -Subproject commit c65b936453d7cbf9c585806142cd866b7bc7c0d5 +Subproject commit 951de609dbe27ce8864dfe47323c4ade96bee86e diff --git a/libs/chromium/modp_b64 b/libs/chromium/modp_b64 index ca6144f..5090e77 160000 --- a/libs/chromium/modp_b64 +++ b/libs/chromium/modp_b64 @@ -1 +1 @@ -Subproject commit ca6144fbeb44934d474cc8030a64de21947e2550 +Subproject commit 5090e77f6108f36fa3663c985624f83851e3ada4 diff --git a/libs/cppcodec b/libs/cppcodec index 9838f9e..8019b8b 160000 --- a/libs/cppcodec +++ b/libs/cppcodec @@ -1 +1 @@ -Subproject commit 9838f9eaf077e42121cb42361e9a1613901fc5e8 +Subproject commit 8019b8b580f8573c33c50372baec7039dfe5a8ce diff --git a/libs/picobase64 b/libs/picobase64 index ed388f5..763b78c 160000 --- a/libs/picobase64 +++ b/libs/picobase64 @@ -1 +1 @@ -Subproject commit ed388f52bcac65f11ceb6c2878e1a4f58cd8b28c +Subproject commit 763b78cbf074d1dbfb9ae672c3d13dccdef526db diff --git a/src/IMUtility/polfosol_imutility.h b/src/IMUtility/polfosol_imutility.h index 1736203..1540b87 100644 --- a/src/IMUtility/polfosol_imutility.h +++ b/src/IMUtility/polfosol_imutility.h @@ -11,7 +11,7 @@ std::string Base64_encode(unsigned char *bytes, size_t len) size_t d = len % 3; std::string str64(4 * (int(d > 0) + len / 3), '='); - Base64_encode(bytes, len, (char*)&str64[0], str64.size()); + Base64_encode((char*)bytes, len, (char*)&str64[0], str64.size()); return str64; } diff --git a/src/modp_b64_chromium/modp_b64_chromium.cpp b/src/modp_b64_chromium/modp_b64_chromium.cpp index 21eec8c..7639de1 100644 --- a/src/modp_b64_chromium/modp_b64_chromium.cpp +++ b/src/modp_b64_chromium/modp_b64_chromium.cpp @@ -51,11 +51,11 @@ struct B64_Adapt return encoded; } - static std::string decode(size_t(*func)(char* dest, const char* src, size_t len), const std::string &encoded) + static std::string decode(size_t(*func)(char* dest, const char* src, size_t len, ModpDecodePolicy policy), const std::string &encoded) { size_t decLen = GetDecodedLength(encoded); std::string decoded(decLen, '\0'); - func((char*)&decoded[0], (const char*)&encoded[0], encoded.length()); + func((char*)&decoded[0], (const char*)&encoded[0], encoded.length(), ModpDecodePolicy::kStrict); return decoded; } };