Merge remote-tracking branch 'origin/release/5.0' into GH-1883-base64…

…-rm-main
AntelopeIO · Nov 13, 2023 · 72101c4 · 72101c4
2 parents 88e1759 + de71459
commit 72101c4
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 440 deletions.
diff --git a/libraries/libfc/include/fc/crypto/base64.hpp b/libraries/libfc/include/fc/crypto/base64.hpp
@@ -1,15 +1,14 @@
 #pragma once
 #include <string>
-#include <string_view>
 
 namespace fc {
 std::string base64_encode(unsigned char const* bytes_to_encode, unsigned int in_len);
 inline std::string base64_encode(char const* bytes_to_encode, unsigned int in_len) { return base64_encode( (unsigned char const*)bytes_to_encode, in_len); }
-std::string base64_encode( const std::string_view& enc );
-std::string base64_decode( const std::string_view& encoded_string);
+std::string base64_encode( const std::string& enc );
+std::string base64_decode( const std::string& encoded_string);
 
 std::string base64url_encode(unsigned char const* bytes_to_encode, unsigned int in_len);
 inline std::string base64url_encode(char const* bytes_to_encode, unsigned int in_len) { return base64url_encode( (unsigned char const*)bytes_to_encode, in_len); }
-std::string base64url_encode( const std::string_view& enc );
-std::string base64url_decode( const std::string_view& encoded_string);
+std::string base64url_encode( const std::string& enc );
+std::string base64url_decode( const std::string& encoded_string);
 }  // namespace fc