Lil-Ran/Pyarmor-Static-Unpack-1shot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: PyarmorAssert bytes marshal type as new module

Browse Source
This commit is contained in:
Lil-Ran
2025-09-13 13:52:44 +08:00
parent 747ed7cf50
commit 3254e3b70c
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ASTree.cpp
View File

@@ -101,7 +101,9 @@ PycRef<ASTNode> PyarmorMixStrDecrypt(const std::string &inputString, PycModule *
case 2:
{
PycBuffer buf(result.data(), (int)result.length());
return new ASTObject(LoadObject(&buf, mod));
PycModule temp_mod;
temp_mod.copyFrom(*mod);
return new ASTObject(LoadObject(&buf, &temp_mod));
}
case 3:
{
@@ -112,7 +114,9 @@ PycRef<ASTNode> PyarmorMixStrDecrypt(const std::string &inputString, PycModule *
case 4:
{
PycBuffer buf(result.data(), (int)result.length());
auto obj = new ASTObject(LoadObject(&buf, mod));
PycModule temp_mod;
temp_mod.copyFrom(*mod);
auto obj = new ASTObject(LoadObject(&buf, &temp_mod));
// (pyarmor__1, pyarmor__2, pyarmor__3) = ('builtins', ('enumerate', 'ImportError', 'hasattr'), 0)
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
auto tuple = obj->object().try_cast<PycTuple>();

11
pyc_module.cpp
View File

@@ -327,6 +327,17 @@ void PycModule::loadFromOneshotSequenceFile(const char *filename)
m_code = LoadObject(&in, this).cast<PycCode>();
}
void PycModule::copyFrom(const PycModule& mod)
{
this->m_maj = mod.m_maj;
this->m_min = mod.m_min;
this->m_unicode = mod.m_unicode;
std::memcpy(this->pyarmor_aes_key, mod.pyarmor_aes_key, 16);
std::memcpy(this->pyarmor_mix_str_aes_nonce, mod.pyarmor_mix_str_aes_nonce, 12);
this->pyarmor_co_code_aes_nonce_xor_enabled = mod.pyarmor_co_code_aes_nonce_xor_enabled;
std::memcpy(this->pyarmor_co_code_aes_nonce_xor_key, mod.pyarmor_co_code_aes_nonce_xor_key, 12);
}
#define GET_REAL_OPERAND_2_AND_ADD_CURRENT_PTR(CUR, REF) \
do \
{ \

1
pyc_module.h
View File

@@ -47,6 +47,7 @@ public:
void loadFromFile(const char* filename);
void loadFromMarshalledFile(const char *filename, int major, int minor);
void loadFromOneshotSequenceFile(const char* filename);
void copyFrom(const PycModule& mod);
bool isValid() const { return (m_maj >= 0) && (m_min >= 0); }
int majorVer() const { return m_maj; }

4
pyc_string.cpp
View File

@@ -173,8 +173,8 @@ void PycString::dasPrintAndDecrypt(std::ostream &stream, PycModule *mod, bool tr
mod->pyarmor_aes_key,
16,
&nonce);
PycString decrypted(TYPE_UNICODE);
PycString decrypted(m_value[0] & 1 ? TYPE_UNICODE : TYPE_STRING);
decrypted.setValue(result);
decrypted.print(stream, mod, triple, parent_f_string_quote);
stream << " # ";