Updated modp_b64, cpp-base64, cppcodec, polfosol, picobase64 and chro…

…mium
gaspardpetit · Jun 8, 2024 · ee6b02d · ee6b02d
1 parent b7dc1d9
commit ee6b02d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/libs/IMUtility b/libs/IMUtility
diff --git a/libs/ReneNyffenegger/cpp-base64 b/libs/ReneNyffenegger/cpp-base64
diff --git a/libs/chromium/modp_b64 b/libs/chromium/modp_b64
diff --git a/libs/cppcodec b/libs/cppcodec
diff --git a/libs/picobase64 b/libs/picobase64
diff --git 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
@@ -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;
 	}
 };
+6 −2		Makefile
+11 −11		base64.cpp
+1 −1		base64.h
+17 −0		test.cpp
+72 −32		CMakeLists.txt
+3 −2		example/CMakeLists.txt
+8 −6		test/CMakeLists.txt
+10 −2		tool/CMakeLists.txt