Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.0 -> main] Revert "Fix base64 encoding" #1891

Merged
merged 4 commits into from
Nov 13, 2023
Merged

[5.0 -> main] Revert "Fix base64 encoding" #1891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ad7273
Revert "GH-1461 Update base64 from upstream"
heifner Nov 10, 2023
b0c1296
Revert "GH-1461 Do not add or expect `=` at end of base64 encoded str…
heifner Nov 10, 2023
de71459
Merge pull request #1886 from AntelopeIO/GH-1883-base64-rm-5.0
heifner Nov 13, 2023
72101c4
Merge remote-tracking branch 'origin/release/5.0' into GH-1883-base64…
heifner Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions libraries/libfc/include/fc/crypto/base64.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading