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

Jump to bottom

Add Base32 & Base64 on encodeString #2016

Closed
wants to merge 11 commits into from
Closed

Add Base32 & Base64 on encodeString #2016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bc0a881
Update copyright year(s)
fresholia Jan 15, 2021
aabaf7c
Update copyright year(s)
fresholia Jan 15, 2021
3e2f740
Revert "Update copyright year(s)"
fresholia Jan 17, 2021
676c3b7
Revert "Update copyright year(s)"
fresholia Jan 17, 2021
382f35c
Added Base32, Base64 in encodeString
fresholia Jan 17, 2021
2323b26
Remove HMAC
fresholia Jan 17, 2021
3b2ae0b
Remove async & StringEncodeFunction
fresholia Jan 20, 2021
8d05148
Revert changes
fresholia Jan 21, 2021
3aff1aa
Update CLuaCryptDefs.cpp
fresholia Jan 23, 2021
07626c1
Merge branch 'master' into master
patrikjuvonen Mar 21, 2021
71f36fc
Update CLuaCryptDefs.cpp
fresholia Mar 21, 2021
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
2 changes: 2 additions & 0 deletions Shared/mods/deathmatch/logic/Enums.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ IMPLEMENT_ENUM_CLASS_END("password-hash-function")

IMPLEMENT_ENUM_CLASS_BEGIN(StringEncryptFunction)
ADD_ENUM(StringEncryptFunction::TEA, "tea")
ADD_ENUM(StringEncryptFunction::BASE32, "base32")
ADD_ENUM(StringEncryptFunction::BASE64, "base64")
IMPLEMENT_ENUM_CLASS_END("string-encrypt-function")

IMPLEMENT_ENUM_BEGIN(ePacketID)
Expand Down
24 changes: 22 additions & 2 deletions Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,19 @@ int CLuaCryptDefs::EncodeString(lua_State* luaVM)
}
return 1;
}
case StringEncryptFunction::BASE32:
{
lua::Push(luaVM, SharedUtil::Base32encode(data));
return 1;
}
case StringEncryptFunction::BASE64:
{
lua::Push(luaVM, SharedUtil::Base64encode(data));
return 1;
}
default:
{
m_pScriptDebugging->LogCustom(luaVM, "Unknown encryption algorithm");
m_pScriptDebugging->LogCustom(luaVM, "Unknown algorithm");
lua_pushboolean(luaVM, false);
return 1;
}
Expand Down Expand Up @@ -397,9 +407,19 @@ int CLuaCryptDefs::DecodeString(lua_State* luaVM)
}
return 1;
}
case StringEncryptFunction::BASE32:
{
lua::Push(luaVM, SharedUtil::Base32decode(data));
return 1;
}
case StringEncryptFunction::BASE64:
{
lua::Push(luaVM, SharedUtil::Base64decode(data));
return 1;
}
default:
{
m_pScriptDebugging->LogCustom(luaVM, "Unknown encryption algorithm");
m_pScriptDebugging->LogCustom(luaVM, "Unknown algorithm");
lua_pushboolean(luaVM, false);
return 1;
}
Expand Down
17 changes: 17 additions & 0 deletions Shared/sdk/SharedUtil.Crypto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*****************************************************************************/
#pragma once
#include <cryptopp/base64.h>
#include <cryptopp/base32.h>
#include "SString.h"

namespace SharedUtil
Expand All @@ -28,4 +29,20 @@ namespace SharedUtil

return result;
}

inline SString Base32encode(const SString& data)
{
SString result;
CryptoPP::StringSource ss(data, true, new CryptoPP::Base32Encoder(new CryptoPP::StringSink(result), false)); // Memory is freed automatically

return result;
}

inline SString Base32decode(const SString& data)
{
SString result;
CryptoPP::StringSource ss(data, true, new CryptoPP::Base32Decoder(new CryptoPP::StringSink(result))); // Memory is freed automatically

return result;
}
} // namespace SharedUtil
4 changes: 3 additions & 1 deletion Shared/sdk/SharedUtil.Hash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ enum class PasswordHashFunction

enum class StringEncryptFunction
{
TEA
TEA,
BASE32,
BASE64
};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The StringEncryptFunction name is a bit odd due to base64 not being an encryption method. Maybe we should change this to StringEncodeFunction?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for review. I'll edit.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cleopatradev This change is still pending.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cleopatradev This is still an issue.


namespace SharedUtil
Expand Down