Skip to content

Commit

Permalink
Minor cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
heifner committed Aug 18, 2023
1 parent 54c9c60 commit c778050
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions libraries/libfc/include/fc/crypto/base64.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
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( std::string_view enc );
std::string base64_decode( std::string_view 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( std::string_view enc );
std::string base64url_decode( std::string_view encoded_string);
} // namespace fc
2 changes: 1 addition & 1 deletion libraries/libfc/include/fc/crypto/private_key.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ namespace fc { namespace crypto {
storage_type _storage;

private_key( storage_type&& other_storage )
:_storage(other_storage)
:_storage(std::move(other_storage))
{}

friend bool operator == ( const private_key& p1, const private_key& p2);
Expand Down
10 changes: 5 additions & 5 deletions libraries/libfc/src/crypto/base64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ std::string base64_encode(unsigned char const* bytes_to_encode, size_t in_len, b
}

template <typename String>
static std::string decode(String const& encoded_string, bool remove_linebreaks) {
static std::string decode(const String& encoded_string, bool remove_linebreaks) {
//
// decode(…) is templated so that it can be used with String = const std::string&
// or std::string_view (requires at least C++17)
Expand Down Expand Up @@ -343,20 +343,20 @@ std::string base64_decode(std::string_view s, bool remove_linebreaks) {
std::string base64_encode(unsigned char const* bytes_to_encode, unsigned int in_len) {
return base64_encode(bytes_to_encode, in_len, false);
}
std::string base64_encode(const std::string_view& enc) {
std::string base64_encode(std::string_view enc) {
return base64_encode(enc, false);
}
std::string base64_decode(const std::string_view& encoded_string) {
std::string base64_decode(std::string_view encoded_string) {
return base64_decode(encoded_string, false);
}

std::string base64url_encode(unsigned char const* bytes_to_encode, unsigned int in_len) {
return base64_encode(bytes_to_encode, in_len, true);
}
std::string base64url_encode(const std::string_view& enc) {
std::string base64url_encode(std::string_view enc) {
return base64_encode(enc, true);
}
std::string base64url_decode(const std::string_view& encoded_string) {
std::string base64url_decode(std::string_view encoded_string) {
return base64_decode(encoded_string, true);
}

Expand Down

0 comments on commit c778050

Please sign in to comment.