incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename v2/v3 crypt base class

Browse Source
This commit is contained in:
Martin Michelsen
2023-02-18 12:28:59 -08:00
parent bfdb6c0695
commit ca551039ce
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PSOEncryption.cc
+8 -8
View File
@@ -23,11 +23,11 @@ void PSOEncryption::decrypt(void* data, size_t size, bool advance) {
PSORC4Encryption::PSORC4Encryption( PSOLFGEncryption::PSOLFGEncryption(
uint32_t seed, size_t stream_length, size_t end_offset) uint32_t seed, size_t stream_length, size_t end_offset)
: stream(stream_length, 0), offset(0), end_offset(end_offset), seed(seed) { } : stream(stream_length, 0), offset(0), end_offset(end_offset), seed(seed) { }
uint32_t PSORC4Encryption::next(bool advance) { uint32_t PSOLFGEncryption::next(bool advance) {
if (this->offset == this->end_offset) { if (this->offset == this->end_offset) {
this->update_stream(); this->update_stream();
} }
@@ -39,7 +39,7 @@ uint32_t PSORC4Encryption::next(bool advance) {
} }
template <typename LongT> template <typename LongT>
void PSORC4Encryption::encrypt_t(void* vdata, size_t size, bool advance) { void PSOLFGEncryption::encrypt_t(void* vdata, size_t size, bool advance) {
if (size & 3) { if (size & 3) {
throw invalid_argument("size must be a multiple of 4"); throw invalid_argument("size must be a multiple of 4");
} }
@@ -54,15 +54,15 @@ void PSORC4Encryption::encrypt_t(void* vdata, size_t size, bool advance) {
} }
} }
void PSORC4Encryption::encrypt(void* vdata, size_t size, bool advance) { void PSOLFGEncryption::encrypt(void* vdata, size_t size, bool advance) {
this->encrypt_t<le_uint32_t>(vdata, size, advance); this->encrypt_t<le_uint32_t>(vdata, size, advance);
} }
void PSORC4Encryption::encrypt_big_endian(void* vdata, size_t size, bool advance) { void PSOLFGEncryption::encrypt_big_endian(void* vdata, size_t size, bool advance) {
this->encrypt_t<be_uint32_t>(vdata, size, advance); this->encrypt_t<be_uint32_t>(vdata, size, advance);
} }
void PSORC4Encryption::encrypt_both_endian( void PSOLFGEncryption::encrypt_both_endian(
void* le_vdata, void* be_vdata, size_t size, bool advance) { void* le_vdata, void* be_vdata, size_t size, bool advance) {
if (size & 3) { if (size & 3) {
throw invalid_argument("size must be a multiple of 4"); throw invalid_argument("size must be a multiple of 4");
@@ -84,7 +84,7 @@ void PSORC4Encryption::encrypt_both_endian(
PSOV2Encryption::PSOV2Encryption(uint32_t seed) PSOV2Encryption::PSOV2Encryption(uint32_t seed)
: PSORC4Encryption(seed, this->STREAM_LENGTH + 1, this->STREAM_LENGTH) { : PSOLFGEncryption(seed, this->STREAM_LENGTH + 1, this->STREAM_LENGTH) {
uint32_t esi, ebx, edi, eax, edx, var1; uint32_t esi, ebx, edi, eax, edx, var1;
esi = 1; esi = 1;
ebx = this->seed; ebx = this->seed;
@@ -138,7 +138,7 @@ PSOEncryption::Type PSOV2Encryption::type() const {
PSOV3Encryption::PSOV3Encryption(uint32_t seed) PSOV3Encryption::PSOV3Encryption(uint32_t seed)
: PSORC4Encryption(seed, this->STREAM_LENGTH, this->STREAM_LENGTH) { : PSOLFGEncryption(seed, this->STREAM_LENGTH, this->STREAM_LENGTH) {
uint32_t x, y, basekey, source1, source2, source3; uint32_t x, y, basekey, source1, source2, source3;
basekey = 0; basekey = 0;
src/PSOEncryption.hh
+4 -4
View File
@@ -41,7 +41,7 @@ protected:
class PSORC4Encryption : public PSOEncryption { class PSOLFGEncryption : public PSOEncryption {
public: public:
virtual void encrypt(void* data, size_t size, bool advance = true); virtual void encrypt(void* data, size_t size, bool advance = true);
void encrypt_big_endian(void* data, size_t size, bool advance = true); void encrypt_big_endian(void* data, size_t size, bool advance = true);
@@ -50,7 +50,7 @@ public:
uint32_t next(bool advance = true); uint32_t next(bool advance = true);
protected: protected:
explicit PSORC4Encryption(uint32_t seed, size_t stream_length, size_t end_offset); explicit PSOLFGEncryption(uint32_t seed, size_t stream_length, size_t end_offset);
template <typename LongT> template <typename LongT>
void encrypt_t(void* data, size_t size, bool advance); void encrypt_t(void* data, size_t size, bool advance);
@@ -63,7 +63,7 @@ protected:
uint32_t seed; uint32_t seed;
}; };
class PSOV2Encryption : public PSORC4Encryption { class PSOV2Encryption : public PSOLFGEncryption {
public: public:
explicit PSOV2Encryption(uint32_t seed); explicit PSOV2Encryption(uint32_t seed);
@@ -75,7 +75,7 @@ protected:
static constexpr size_t STREAM_LENGTH = 56; static constexpr size_t STREAM_LENGTH = 56;
}; };
class PSOV3Encryption : public PSORC4Encryption { class PSOV3Encryption : public PSOLFGEncryption {
public: public:
explicit PSOV3Encryption(uint32_t key); explicit PSOV3Encryption(uint32_t key);