diff --git a/Cargo.lock b/Cargo.lock index 4370975..c2c4323 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -162,15 +162,6 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" -[[package]] -name = "cc" -version = "1.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c" -dependencies = [ - "shlex", -] - [[package]] name = "cfg-if" version = "1.0.0" @@ -380,7 +371,6 @@ version = "0.1.0" dependencies = [ "axum", "binrw", - "cc", "md5", "minijinja", "rand", @@ -664,12 +654,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - [[package]] name = "socket2" version = "0.5.8" diff --git a/Cargo.toml b/Cargo.toml index 9583f0d..a33a174 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,9 +36,6 @@ panic = "abort" default = ["oodle"] oodle = [] -[build-dependencies] -cc = "1.0" - [dependencies] axum = { version = "0.6", features = ["json", "tokio", "http1", "form", "query", "headers"], default-features = false } serde_json = { version = "1.0", default-features = false } diff --git a/build.rs b/build.rs deleted file mode 100644 index 86926f6..0000000 --- a/build.rs +++ /dev/null @@ -1,7 +0,0 @@ -fn main() { - cc::Build::new() - .cpp(true) - .file("src/blowfish/blowfish.cpp") - .file("src/blowfish/wrapper.cpp") - .compile("FFXIVBlowfish") -} diff --git a/src/bin/kawari-lobby.rs b/src/bin/kawari-lobby.rs index d49ae1f..684c7a5 100644 --- a/src/bin/kawari-lobby.rs +++ b/src/bin/kawari-lobby.rs @@ -1,8 +1,9 @@ use std::cmp::min; use std::time::{SystemTime, UNIX_EPOCH}; +use kawari::blowfish::Blowfish; use kawari::client_select_data::{ClientCustomizeData, ClientSelectData}; -use kawari::encryption::{blowfish_encode, generate_encryption_key}; +use kawari::encryption::generate_encryption_key; use kawari::ipc::{CharacterDetails, IPCOpCode, IPCSegment, IPCStructData, Server, ServiceAccount}; use kawari::oodle::FFXIVOodle; use kawari::packet::{ @@ -116,10 +117,8 @@ async fn initialize_encryption( let mut data = 0xE0003C2Au32.to_le_bytes().to_vec(); data.resize(0x280, 0); - unsafe { - let result = blowfish_encode(state.client_key.unwrap().as_ptr(), 16, data.as_ptr(), 0x280); - data = std::slice::from_raw_parts(result, 0x280).to_vec(); - } + let blowfish = Blowfish::new(&state.client_key.unwrap()); + blowfish.encrypt(&mut data); let response_packet = PacketSegment { source_actor: 0, diff --git a/src/blowfish/blowfish.cpp b/src/blowfish/blowfish.cpp deleted file mode 100644 index b663d89..0000000 --- a/src/blowfish/blowfish.cpp +++ /dev/null @@ -1,316 +0,0 @@ -// blowfish.cpp C++ class implementation of the BLOWFISH encryption algorithm -// _THE BLOWFISH ENCRYPTION ALGORITHM_ -// by Bruce Schneier -// Revised code--3/20/94 -// Converted to C++ class 5/96, Jim Conger - -#include -#include "blowfish.h" -#include "blowfish_consts.h" // holds the random digit tables - -#define S(x, i) (SBoxes[i][x.w.byte##i]) -#define bf_F(x) (((S(x, 0) + S(x, 1)) ^ S(x, 2)) + S(x, 3)) -#define ROUND(a, b, n) (a.dword ^= bf_F(b) ^ PArray[n]) - -BlowFish::BlowFish() -{ - PArray = new DWORD[18]; - SBoxes = new DWORD[4][256]; -} - -BlowFish::~BlowFish() -{ - delete PArray; - delete[] SBoxes; -} - -// the low level (private) encryption function -void BlowFish::Blowfish_encipher(DWORD *xl, DWORD *xr) -{ - union aword Xl, Xr; - - Xl.dword = *xl; - Xr.dword = *xr; - - Xl.dword ^= PArray[0]; - (Xr.dword ^= ((((SBoxes[0][Xl.w.byte0]) + (SBoxes[1][Xl.w.byte1])) ^ - (SBoxes[2][Xl.w.byte2])) + - (SBoxes[3][Xl.w.byte3])) ^ - PArray[1]); - (Xl.dword ^= ((((SBoxes[0][Xr.w.byte0]) + (SBoxes[1][Xr.w.byte1])) ^ - (SBoxes[2][Xr.w.byte2])) + - (SBoxes[3][Xr.w.byte3])) ^ - PArray[2]); - (Xr.dword ^= ((((SBoxes[0][Xl.w.byte0]) + (SBoxes[1][Xl.w.byte1])) ^ - (SBoxes[2][Xl.w.byte2])) + - (SBoxes[3][Xl.w.byte3])) ^ - PArray[3]); - (Xl.dword ^= ((((SBoxes[0][Xr.w.byte0]) + (SBoxes[1][Xr.w.byte1])) ^ - (SBoxes[2][Xr.w.byte2])) + - (SBoxes[3][Xr.w.byte3])) ^ - PArray[4]); - (Xr.dword ^= ((((SBoxes[0][Xl.w.byte0]) + (SBoxes[1][Xl.w.byte1])) ^ - (SBoxes[2][Xl.w.byte2])) + - (SBoxes[3][Xl.w.byte3])) ^ - PArray[5]); - (Xl.dword ^= ((((SBoxes[0][Xr.w.byte0]) + (SBoxes[1][Xr.w.byte1])) ^ - (SBoxes[2][Xr.w.byte2])) + - (SBoxes[3][Xr.w.byte3])) ^ - PArray[6]); - (Xr.dword ^= ((((SBoxes[0][Xl.w.byte0]) + (SBoxes[1][Xl.w.byte1])) ^ - (SBoxes[2][Xl.w.byte2])) + - (SBoxes[3][Xl.w.byte3])) ^ - PArray[7]); - (Xl.dword ^= ((((SBoxes[0][Xr.w.byte0]) + (SBoxes[1][Xr.w.byte1])) ^ - (SBoxes[2][Xr.w.byte2])) + - (SBoxes[3][Xr.w.byte3])) ^ - PArray[8]); - (Xr.dword ^= ((((SBoxes[0][Xl.w.byte0]) + (SBoxes[1][Xl.w.byte1])) ^ - (SBoxes[2][Xl.w.byte2])) + - (SBoxes[3][Xl.w.byte3])) ^ - PArray[9]); - (Xl.dword ^= ((((SBoxes[0][Xr.w.byte0]) + (SBoxes[1][Xr.w.byte1])) ^ - (SBoxes[2][Xr.w.byte2])) + - (SBoxes[3][Xr.w.byte3])) ^ - PArray[10]); - (Xr.dword ^= ((((SBoxes[0][Xl.w.byte0]) + (SBoxes[1][Xl.w.byte1])) ^ - (SBoxes[2][Xl.w.byte2])) + - (SBoxes[3][Xl.w.byte3])) ^ - PArray[11]); - (Xl.dword ^= ((((SBoxes[0][Xr.w.byte0]) + (SBoxes[1][Xr.w.byte1])) ^ - (SBoxes[2][Xr.w.byte2])) + - (SBoxes[3][Xr.w.byte3])) ^ - PArray[12]); - (Xr.dword ^= ((((SBoxes[0][Xl.w.byte0]) + (SBoxes[1][Xl.w.byte1])) ^ - (SBoxes[2][Xl.w.byte2])) + - (SBoxes[3][Xl.w.byte3])) ^ - PArray[13]); - (Xl.dword ^= ((((SBoxes[0][Xr.w.byte0]) + (SBoxes[1][Xr.w.byte1])) ^ - (SBoxes[2][Xr.w.byte2])) + - (SBoxes[3][Xr.w.byte3])) ^ - PArray[14]); - (Xr.dword ^= ((((SBoxes[0][Xl.w.byte0]) + (SBoxes[1][Xl.w.byte1])) ^ - (SBoxes[2][Xl.w.byte2])) + - (SBoxes[3][Xl.w.byte3])) ^ - PArray[15]); - (Xl.dword ^= ((((SBoxes[0][Xr.w.byte0]) + (SBoxes[1][Xr.w.byte1])) ^ - (SBoxes[2][Xr.w.byte2])) + - (SBoxes[3][Xr.w.byte3])) ^ - PArray[16]); - Xr.dword ^= PArray[17]; - - *xr = Xl.dword; - *xl = Xr.dword; -} - -// the low level (private) decryption function -void BlowFish::Blowfish_decipher(DWORD *xl, DWORD *xr) -{ - union aword Xl; - union aword Xr; - - Xl.dword = *xl; - Xr.dword = *xr; - - Xl.dword ^= PArray[17]; - ROUND(Xr, Xl, 16); - ROUND(Xl, Xr, 15); - ROUND(Xr, Xl, 14); - ROUND(Xl, Xr, 13); - ROUND(Xr, Xl, 12); - ROUND(Xl, Xr, 11); - ROUND(Xr, Xl, 10); - ROUND(Xl, Xr, 9); - ROUND(Xr, Xl, 8); - ROUND(Xl, Xr, 7); - ROUND(Xr, Xl, 6); - ROUND(Xl, Xr, 5); - ROUND(Xr, Xl, 4); - ROUND(Xl, Xr, 3); - ROUND(Xr, Xl, 2); - ROUND(Xl, Xr, 1); - Xr.dword ^= PArray[0]; - - *xl = Xr.dword; - *xr = Xl.dword; -} - -// constructs the enctryption sieve -void BlowFish::initialize(BYTE key[], int32_t keybytes) -{ - int i, j; - DWORD datal, datar; - - // first fill arrays from data tables - for (i = 0; i < 18; i++) - PArray[i] = bf_P[i]; - - for (i = 0; i < 4; i++) - { - for (j = 0; j < 256; j++) - SBoxes[i][j] = bf_S[i][j]; - } - - int32_t v12; // eax@6 - int32_t v13; // ecx@6 - int32_t v14; // eax@8 - int32_t v15; // edx@8 - int32_t v16; // edx@8 - int32_t v17; // eax@10 - int32_t v18; // ecx@10 - int32_t v19; // ecx@10 - int32_t v20; // edx@12 - int32_t v21; // edx@12 - - int32_t v10 = keybytes; - uintptr_t v9 = (uintptr_t)key; - int32_t v8 = 0; - int32_t v11 = 0; - do - { - v13 = (char)(*(BYTE *)(v8 + v9)); - v12 = v8 + 1; - if (v12 >= v10) - v12 = 0; - v16 = (char)*(BYTE *)(v12 + v9); - v14 = v12 + 1; - v15 = (v13 << 8) | v16; - if (v14 >= v10) - v14 = 0; - v19 = (char)*(BYTE *)(v14 + v9); - v17 = v14 + 1; - v18 = (v15 << 8) | v19; - if (v17 >= v10) - v17 = 0; - v21 = (char)*(BYTE *)(v17 + v9); - v8 = v17 + 1; - v20 = (v18 << 8) | v21; - if (v8 >= v10) - v8 = 0; - *((DWORD *)PArray + v11++) ^= v20; - } while (v11 < 18); - - datal = 0; - datar = 0; - - for (i = 0; i < NPASS + 2; i += 2) - { - Blowfish_encipher(&datal, &datar); - PArray[i] = datal; - PArray[i + 1] = datar; - } - - for (i = 0; i < 4; ++i) - { - for (j = 0; j < 256; j += 2) - { - Blowfish_encipher(&datal, &datar); - SBoxes[i][j] = datal; - SBoxes[i][j + 1] = datar; - } - } -} - -// get output length, which must be even MOD 8 -DWORD BlowFish::GetOutputLength(DWORD lInputLong) -{ - DWORD lVal; - - lVal = lInputLong % 8; // find out if uneven number of bytes at the end - if (lVal != 0) - return lInputLong + 8 - lVal; - else - return lInputLong; -} - -// Encode pIntput into pOutput. Input length in lSize. Returned value -// is length of output which will be even MOD 8 bytes. Input buffer and -// output buffer can be the same, but be sure buffer length is even MOD 8. -DWORD BlowFish::Encode(BYTE *pInput, BYTE *pOutput, DWORD lSize) -{ - DWORD lCount, lOutSize, lGoodBytes; - BYTE *pi, *po; - int i, j; - int SameDest = (pInput == pOutput ? 1 : 0); - - lOutSize = GetOutputLength(lSize); - for (lCount = 0; lCount < lOutSize; lCount += 8) - { - if (SameDest) // if encoded data is being written into input buffer - { - if (lCount < lSize - 7) // if not dealing with uneven bytes at end - { - Blowfish_encipher((DWORD *)pInput, - (DWORD *)(pInput + 4)); - } - else // pad end of data with null bytes to complete encryption - { - po = pInput + lSize; // point at byte past the end of actual data - j = (int)(lOutSize - lSize); // number of bytes to set to null - for (i = 0; i < j; i++) - *po++ = 0; - Blowfish_encipher((DWORD *)pInput, - (DWORD *)(pInput + 4)); - } - pInput += 8; - } - else // output buffer not equal to input buffer, so must copy - { // input to output buffer prior to encrypting - if (lCount < lSize - 7) // if not dealing with uneven bytes at end - { - pi = pInput; - po = pOutput; - for (i = 0; i < 8; i++) - // copy bytes to output - *po++ = *pi++; - Blowfish_encipher((DWORD *)pOutput, // now encrypt them - (DWORD *)(pOutput + 4)); - } - else // pad end of data with null bytes to complete encryption - { - lGoodBytes = lSize - lCount; // number of remaining data bytes - po = pOutput; - for (i = 0; i < (int)lGoodBytes; i++) - *po++ = *pInput++; - for (j = i; j < 8; j++) - *po++ = 0; - Blowfish_encipher((DWORD *)pOutput, - (DWORD *)(pOutput + 4)); - } - pInput += 8; - pOutput += 8; - } - } - return lOutSize; -} - -// Decode pIntput into pOutput. Input length in lSize. Input buffer and -// output buffer can be the same, but be sure buffer length is even MOD 8. -void BlowFish::Decode(BYTE *pInput, BYTE *pOutput, DWORD lSize) -{ - DWORD lCount; - BYTE *pi, *po; - int i; - int SameDest = (pInput == pOutput ? 1 : 0); - - for (lCount = 0; lCount < lSize; lCount += 8) - { - if (SameDest) // if encoded data is being written into input buffer - { - Blowfish_decipher((DWORD *)pInput, - (DWORD *)(pInput + 4)); - pInput += 8; - } - else // output buffer not equal to input buffer - { // so copy input to output before decoding - pi = pInput; - po = pOutput; - for (i = 0; i < 8; i++) - *po++ = *pi++; - Blowfish_decipher((DWORD *)pOutput, - (DWORD *)(pOutput + 4)); - pInput += 8; - pOutput += 8; - } - } -} diff --git a/src/blowfish/blowfish.h b/src/blowfish/blowfish.h deleted file mode 100644 index 6334acf..0000000 --- a/src/blowfish/blowfish.h +++ /dev/null @@ -1,87 +0,0 @@ -#ifndef _BLOWFISH_H -#define _BLOWFISH_H -// blowfish.h interface file for blowfish.cpp -// _THE BLOWFISH ENCRYPTION ALGORITHM_ -// by Bruce Schneier -// Revised code--3/20/94 -// Converted to C++ class 5/96, Jim Conger - -#define MAXKEYBYTES 56 // 448 bits max -#define NPASS 16 // SBox passes - -#define DWORD uint32_t -#define WORD unsigned short -#define BYTE uint8_t - -class BlowFish -{ -private: - void Blowfish_encipher(DWORD *xl, DWORD *xr); - - void Blowfish_decipher(DWORD *xl, DWORD *xr); - -public: - DWORD *PArray; - DWORD (*SBoxes) - [256]; - BlowFish(); - - ~BlowFish(); - - void initialize(BYTE key[], int32_t keybytes); - - DWORD GetOutputLength(DWORD lInputLong); - - DWORD Encode(BYTE *pInput, BYTE *pOutput, DWORD lSize); - - void Decode(BYTE *pInput, BYTE *pOutput, DWORD lSize); -}; - -// choose a byte order for your hardware -#define ORDER_DCBA // chosing Intel in this case - -#ifdef ORDER_DCBA // DCBA - little endian - intel -union aword -{ - DWORD dword; - BYTE byte[4]; - struct - { - uint32_t byte3 : 8; - uint32_t byte2 : 8; - uint32_t byte1 : 8; - uint32_t byte0 : 8; - } w; -}; -#endif - -#ifdef ORDER_ABCD // ABCD - big endian - motorola -union aword -{ - DWORD dword; - BYTE byte[4]; - struct - { - uint32_t byte0 : 8; - uint32_t byte1 : 8; - uint32_t byte2 : 8; - uint32_t byte3 : 8; - } w; -}; -#endif - -#ifdef ORDER_BADC // BADC - vax -union aword -{ - DWORD dword; - BYTE byte[4]; - struct - { - uint32_t byte1 : 8; - uint32_t byte0 : 8; - uint32_t byte3 : 8; - uint32_t byte2 : 8; - } w; -}; -#endif -#endif \ No newline at end of file diff --git a/src/blowfish/blowfish_consts.h b/src/blowfish/blowfish_consts.h deleted file mode 100644 index e0068bf..0000000 --- a/src/blowfish/blowfish_consts.h +++ /dev/null @@ -1,1048 +0,0 @@ -// blowfish.h2 header file containing random number tables - -static DWORD bf_P[NPASS + 2] = { - 0x243f6a88, - 0x85a308d3, - 0x13198a2e, - 0x03707344, - 0xa4093822, - 0x299f31d0, - 0x082efa98, - 0xec4e6c89, - 0x452821e6, - 0x38d01377, - 0xbe5466cf, - 0x34e90c6c, - 0xc0ac29b7, - 0xc97c50dd, - 0x3f84d5b5, - 0xb5470917, - 0x9216d5d9, - 0x8979fb1b, -}; -static DWORD bf_S[4][256] = { - 0xd1310ba6, - 0x98dfb5ac, - 0x2ffd72db, - 0xd01adfb7, - 0xb8e1afed, - 0x6a267e96, - 0xba7c9045, - 0xf12c7f99, - 0x24a19947, - 0xb3916cf7, - 0x0801f2e2, - 0x858efc16, - 0x636920d8, - 0x71574e69, - 0xa458fea3, - 0xf4933d7e, - 0x0d95748f, - 0x728eb658, - 0x718bcd58, - 0x82154aee, - 0x7b54a41d, - 0xc25a59b5, - 0x9c30d539, - 0x2af26013, - 0xc5d1b023, - 0x286085f0, - 0xca417918, - 0xb8db38ef, - 0x8e79dcb0, - 0x603a180e, - 0x6c9e0e8b, - 0xb01e8a3e, - 0xd71577c1, - 0xbd314b27, - 0x78af2fda, - 0x55605c60, - 0xe65525f3, - 0xaa55ab94, - 0x57489862, - 0x63e81440, - 0x55ca396a, - 0x2aab10b6, - 0xb4cc5c34, - 0x1141e8ce, - 0xa15486af, - 0x7c72e993, - 0xb3ee1411, - 0x636fbc2a, - 0x2ba9c55d, - 0x741831f6, - 0xce5c3e16, - 0x9b87931e, - 0xafd6ba33, - 0x6c24cf5c, - 0x7a325381, - 0x28958677, - 0x3b8f4898, - 0x6b4bb9af, - 0xc4bfe81b, - 0x66282193, - 0x61d809cc, - 0xfb21a991, - 0x487cac60, - 0x5dec8032, - 0xef845d5d, - 0xe98575b1, - 0xdc262302, - 0xeb651b88, - 0x23893e81, - 0xd396acc5, - 0x0f6d6ff3, - 0x83f44239, - 0x2e0b4482, - 0xa4842004, - 0x69c8f04a, - 0x9e1f9b5e, - 0x21c66842, - 0xf6e96c9a, - 0x670c9c61, - 0xabd388f0, - 0x6a51a0d2, - 0xd8542f68, - 0x960fa728, - 0xab5133a3, - 0x6eef0b6c, - 0x137a3be4, - 0xba3bf050, - 0x7efb2a98, - 0xa1f1651d, - 0x39af0176, - 0x66ca593e, - 0x82430e88, - 0x8cee8619, - 0x456f9fb4, - 0x7d84a5c3, - 0x3b8b5ebe, - 0xe06f75d8, - 0x85c12073, - 0x401a449f, - 0x56c16aa6, - 0x4ed3aa62, - 0x363f7706, - 0x1bfedf72, - 0x429b023d, - 0x37d0d724, - 0xd00a1248, - 0xdb0fead3, - 0x49f1c09b, - 0x075372c9, - 0x80991b7b, - 0x25d479d8, - 0xf6e8def7, - 0xe3fe501a, - 0xb6794c3b, - 0x976ce0bd, - 0x04c006ba, - 0xc1a94fb6, - 0x409f60c4, - 0x5e5c9ec2, - 0x196a2463, - 0x68fb6faf, - 0x3e6c53b5, - 0x1339b2eb, - 0x3b52ec6f, - 0x6dfc511f, - 0x9b30952c, - 0xcc814544, - 0xaf5ebd09, - 0xbee3d004, - 0xde334afd, - 0x660f2807, - 0x192e4bb3, - 0xc0cba857, - 0x45c8740f, - 0xd20b5f39, - 0xb9d3fbdb, - 0x5579c0bd, - 0x1a60320a, - 0xd6a100c6, - 0x402c7279, - 0x679f25fe, - 0xfb1fa3cc, - 0x8ea5e9f8, - 0xdb3222f8, - 0x3c7516df, - 0xfd616b15, - 0x2f501ec8, - 0xad0552ab, - 0x323db5fa, - 0xfd238760, - 0x53317b48, - 0x3e00df82, - 0x9e5c57bb, - 0xca6f8ca0, - 0x1a87562e, - 0xdf1769db, - 0xd542a8f6, - 0x287effc3, - 0xac6732c6, - 0x8c4f5573, - 0x695b27b0, - 0xbbca58c8, - 0xe1ffa35d, - 0xb8f011a0, - 0x10fa3d98, - 0xfd2183b8, - 0x4afcb56c, - 0x2dd1d35b, - 0x9a53e479, - 0xb6f84565, - 0xd28e49bc, - 0x4bfb9790, - 0xe1ddf2da, - 0xa4cb7e33, - 0x62fb1341, - 0xcee4c6e8, - 0xef20cada, - 0x36774c01, - 0xd07e9efe, - 0x2bf11fb4, - 0x95dbda4d, - 0xae909198, - 0xeaad8e71, - 0x6b93d5a0, - 0xd08ed1d0, - 0xafc725e0, - 0x8e3c5b2f, - 0x8e7594b7, - 0x8ff6e2fb, - 0xf2122b64, - 0x8888b812, - 0x900df01c, - 0x4fad5ea0, - 0x688fc31c, - 0xd1cff191, - 0xb3a8c1ad, - 0x2f2f2218, - 0xbe0e1777, - 0xea752dfe, - 0x8b021fa1, - 0xe5a0cc0f, - 0xb56f74e8, - 0x18acf3d6, - 0xce89e299, - 0xb4a84fe0, - 0xfd13e0b7, - 0x7cc43b81, - 0xd2ada8d9, - 0x165fa266, - 0x80957705, - 0x93cc7314, - 0x211a1477, - 0xe6ad2065, - 0x77b5fa86, - 0xc75442f5, - 0xfb9d35cf, - 0xebcdaf0c, - 0x7b3e89a0, - 0xd6411bd3, - 0xae1e7e49, - 0x00250e2d, - 0x2071b35e, - 0x226800bb, - 0x57b8e0af, - 0x2464369b, - 0xf009b91e, - 0x5563911d, - 0x59dfa6aa, - 0x78c14389, - 0xd95a537f, - 0x207d5ba2, - 0x02e5b9c5, - 0x83260376, - 0x6295cfa9, - 0x11c81968, - 0x4e734a41, - 0xb3472dca, - 0x7b14a94a, - 0x1b510052, - 0x9a532915, - 0xd60f573f, - 0xbc9bc6e4, - 0x2b60a476, - 0x81e67400, - 0x08ba6fb5, - 0x571be91f, - 0xf296ec6b, - 0x2a0dd915, - 0xb6636521, - 0xe7b9f9b6, - 0xff34052e, - 0xc5855664, - 0x53b02d5d, - 0xa99f8fa1, - 0x08ba4799, - 0x6e85076a, - 0x4b7a70e9, - 0xb5b32944, - 0xdb75092e, - 0xc4192623, - 0xad6ea6b0, - 0x49a7df7d, - 0x9cee60b8, - 0x8fedb266, - 0xecaa8c71, - 0x699a17ff, - 0x5664526c, - 0xc2b19ee1, - 0x193602a5, - 0x75094c29, - 0xa0591340, - 0xe4183a3e, - 0x3f54989a, - 0x5b429d65, - 0x6b8fe4d6, - 0x99f73fd6, - 0xa1d29c07, - 0xefe830f5, - 0x4d2d38e6, - 0xf0255dc1, - 0x4cdd2086, - 0x8470eb26, - 0x6382e9c6, - 0x021ecc5e, - 0x09686b3f, - 0x3ebaefc9, - 0x3c971814, - 0x6b6a70a1, - 0x687f3584, - 0x52a0e286, - 0xb79c5305, - 0xaa500737, - 0x3e07841c, - 0x7fdeae5c, - 0x8e7d44ec, - 0x5716f2b8, - 0xb03ada37, - 0xf0500c0d, - 0xf01c1f04, - 0x0200b3ff, - 0xae0cf51a, - 0x3cb574b2, - 0x25837a58, - 0xdc0921bd, - 0xd19113f9, - 0x7ca92ff6, - 0x94324773, - 0x22f54701, - 0x3ae5e581, - 0x37c2dadc, - 0xc8b57634, - 0x9af3dda7, - 0xa9446146, - 0x0fd0030e, - 0xecc8c73e, - 0xa4751e41, - 0xe238cd99, - 0x3bea0e2f, - 0x3280bba1, - 0x183eb331, - 0x4e548b38, - 0x4f6db908, - 0x6f420d03, - 0xf60a04bf, - 0x2cb81290, - 0x24977c79, - 0x5679b072, - 0xbcaf89af, - 0xde9a771f, - 0xd9930810, - 0xb38bae12, - 0xdccf3f2e, - 0x5512721f, - 0x2e6b7124, - 0x501adde6, - 0x9f84cd87, - 0x7a584718, - 0x7408da17, - 0xbc9f9abc, - 0xe94b7d8c, - 0xec7aec3a, - 0xdb851dfa, - 0x63094366, - 0xc464c3d2, - 0xef1c1847, - 0x3215d908, - 0xdd433b37, - 0x24c2ba16, - 0x12a14d43, - 0x2a65c451, - 0x50940002, - 0x133ae4dd, - 0x71dff89e, - 0x10314e55, - 0x81ac77d6, - 0x5f11199b, - 0x043556f1, - 0xd7a3c76b, - 0x3c11183b, - 0x5924a509, - 0xf28fe6ed, - 0x97f1fbfa, - 0x9ebabf2c, - 0x1e153c6e, - 0x86e34570, - 0xeae96fb1, - 0x860e5e0a, - 0x5a3e2ab3, - 0x771fe71c, - 0x4e3d06fa, - 0x2965dcb9, - 0x99e71d0f, - 0x803e89d6, - 0x5266c825, - 0x2e4cc978, - 0x9c10b36a, - 0xc6150eba, - 0x94e2ea78, - 0xa5fc3c53, - 0x1e0a2df4, - 0xf2f74ea7, - 0x361d2b3d, - 0x1939260f, - 0x19c27960, - 0x5223a708, - 0xf71312b6, - 0xebadfe6e, - 0xeac31f66, - 0xe3bc4595, - 0xa67bc883, - 0xb17f37d1, - 0x018cff28, - 0xc332ddef, - 0xbe6c5aa5, - 0x65582185, - 0x68ab9802, - 0xeecea50f, - 0xdb2f953b, - 0x2aef7dad, - 0x5b6e2f84, - 0x1521b628, - 0x29076170, - 0xecdd4775, - 0x619f1510, - 0x13cca830, - 0xeb61bd96, - 0x0334fe1e, - 0xaa0363cf, - 0xb5735c90, - 0x4c70a239, - 0xd59e9e0b, - 0xcbaade14, - 0xeecc86bc, - 0x60622ca7, - 0x9cab5cab, - 0xb2f3846e, - 0x648b1eaf, - 0x19bdf0ca, - 0xa02369b9, - 0x655abb50, - 0x40685a32, - 0x3c2ab4b3, - 0x319ee9d5, - 0xc021b8f7, - 0x9b540b19, - 0x875fa099, - 0x95f7997e, - 0x623d7da8, - 0xf837889a, - 0x97e32d77, - 0x11ed935f, - 0x16681281, - 0x0e358829, - 0xc7e61fd6, - 0x96dedfa1, - 0x7858ba99, - 0x57f584a5, - 0x1b227263, - 0x9b83c3ff, - 0x1ac24696, - 0xcdb30aeb, - 0x532e3054, - 0x8fd948e4, - 0x6dbc3128, - 0x58ebf2ef, - 0x34c6ffea, - 0xfe28ed61, - 0xee7c3c73, - 0x5d4a14d9, - 0xe864b7e3, - 0x42105d14, - 0x203e13e0, - 0x45eee2b6, - 0xa3aaabea, - 0xdb6c4f15, - 0xfacb4fd0, - 0xc742f442, - 0xef6abbb5, - 0x654f3b1d, - 0x41cd2105, - 0xd81e799e, - 0x86854dc7, - 0xe44b476a, - 0x3d816250, - 0xcf62a1f2, - 0x5b8d2646, - 0xfc8883a0, - 0xc1c7b6a3, - 0x7f1524c3, - 0x69cb7492, - 0x47848a0b, - 0x5692b285, - 0x095bbf00, - 0xad19489d, - 0x1462b174, - 0x23820e00, - 0x58428d2a, - 0x0c55f5ea, - 0x1dadf43e, - 0x233f7061, - 0x3372f092, - 0x8d937e41, - 0xd65fecf1, - 0x6c223bdb, - 0x7cde3759, - 0xcbee7460, - 0x4085f2a7, - 0xce77326e, - 0xa6078084, - 0x19f8509e, - 0xe8efd855, - 0x61d99735, - 0xa969a7aa, - 0xc50c06c2, - 0x5a04abfc, - 0x800bcadc, - 0x9e447a2e, - 0xc3453484, - 0xfdd56705, - 0x0e1e9ec9, - 0xdb73dbd3, - 0x105588cd, - 0x675fda79, - 0xe3674340, - 0xc5c43465, - 0x713e38d8, - 0x3d28f89e, - 0xf16dff20, - 0x153e21e7, - 0x8fb03d4a, - 0xe6e39f2b, - 0xdb83adf7, - 0xe93d5a68, - 0x948140f7, - 0xf64c261c, - 0x94692934, - 0x411520f7, - 0x7602d4f7, - 0xbcf46b2e, - 0xd4a20068, - 0xd4082471, - 0x3320f46a, - 0x43b7d4b7, - 0x500061af, - 0x1e39f62e, - 0x97244546, - 0x14214f74, - 0xbf8b8840, - 0x4d95fc1d, - 0x96b591af, - 0x70f4ddd3, - 0x66a02f45, - 0xbfbc09ec, - 0x03bd9785, - 0x7fac6dd0, - 0x31cb8504, - 0x96eb27b3, - 0x55fd3941, - 0xda2547e6, - 0xabca0a9a, - 0x28507825, - 0x530429f4, - 0x0a2c86da, - 0xe9b66dfb, - 0x68dc1462, - 0xd7486900, - 0x680ec0a4, - 0x27a18dee, - 0x4f3ffea2, - 0xe887ad8c, - 0xb58ce006, - 0x7af4d6b6, - 0xaace1e7c, - 0xd3375fec, - 0xce78a399, - 0x406b2a42, - 0x20fe9e35, - 0xd9f385b9, - 0xee39d7ab, - 0x3b124e8b, - 0x1dc9faf7, - 0x4b6d1856, - 0x26a36631, - 0xeae397b2, - 0x3a6efa74, - 0xdd5b4332, - 0x6841e7f7, - 0xca7820fb, - 0xfb0af54e, - 0xd8feb397, - 0x454056ac, - 0xba489527, - 0x55533a3a, - 0x20838d87, - 0xfe6ba9b7, - 0xd096954b, - 0x55a867bc, - 0xa1159a58, - 0xcca92963, - 0x99e1db33, - 0xa62a4a56, - 0x3f3125f9, - 0x5ef47e1c, - 0x9029317c, - 0xfdf8e802, - 0x04272f70, - 0x80bb155c, - 0x05282ce3, - 0x95c11548, - 0xe4c66d22, - 0x48c1133f, - 0xc70f86dc, - 0x07f9c9ee, - 0x41041f0f, - 0x404779a4, - 0x5d886e17, - 0x325f51eb, - 0xd59bc0d1, - 0xf2bcc18f, - 0x41113564, - 0x257b7834, - 0x602a9c60, - 0xdff8e8a3, - 0x1f636c1b, - 0x0e12b4c2, - 0x02e1329e, - 0xaf664fd1, - 0xcad18115, - 0x6b2395e0, - 0x333e92e1, - 0x3b240b62, - 0xeebeb922, - 0x85b2a20e, - 0xe6ba0d99, - 0xde720c8c, - 0x2da2f728, - 0xd0127845, - 0x95b794fd, - 0x647d0862, - 0xe7ccf5f0, - 0x5449a36f, - 0x877d48fa, - 0xc39dfd27, - 0xf33e8d1e, - 0x0a476341, - 0x992eff74, - 0x3a6f6eab, - 0xf4f8fd37, - 0xa812dc60, - 0xa1ebddf8, - 0x991be14c, - 0xdb6e6b0d, - 0xc67b5510, - 0x6d672c37, - 0x2765d43b, - 0xdcd0e804, - 0xf1290dc7, - 0xcc00ffa3, - 0xb5390f92, - 0x690fed0b, - 0x667b9ffb, - 0xcedb7d9c, - 0xa091cf0b, - 0xd9155ea3, - 0xbb132f88, - 0x515bad24, - 0x7b9479bf, - 0x763bd6eb, - 0x37392eb3, - 0xcc115979, - 0x8026e297, - 0xf42e312d, - 0x6842ada7, - 0xc66a2b3b, - 0x12754ccc, - 0x782ef11c, - 0x6a124237, - 0xb79251e7, - 0x06a1bbe6, - 0x4bfb6350, - 0x1a6b1018, - 0x11caedfa, - 0x3d25bdd8, - 0xe2e1c3c9, - 0x44421659, - 0x0a121386, - 0xd90cec6e, - 0xd5abea2a, - 0x64af674e, - 0xda86a85f, - 0xbebfe988, - 0x64e4c3fe, - 0x9dbc8057, - 0xf0f7c086, - 0x60787bf8, - 0x6003604d, - 0xd1fd8346, - 0xf6381fb0, - 0x7745ae04, - 0xd736fccc, - 0x83426b33, - 0xf01eab71, - 0xb0804187, - 0x3c005e5f, - 0x77a057be, - 0xbde8ae24, - 0x55464299, - 0xbf582e61, - 0x4e58f48f, - 0xf2ddfda2, - 0xf474ef38, - 0x8789bdc2, - 0x5366f9c3, - 0xc8b38e74, - 0xb475f255, - 0x46fcd9b9, - 0x7aeb2661, - 0x8b1ddf84, - 0x846a0e79, - 0x915f95e2, - 0x466e598e, - 0x20b45770, - 0x8cd55591, - 0xc902de4c, - 0xb90bace1, - 0xbb8205d0, - 0x11a86248, - 0x7574a99e, - 0xb77f19b6, - 0xe0a9dc09, - 0x662d09a1, - 0xc4324633, - 0xe85a1f02, - 0x09f0be8c, - 0x4a99a025, - 0x1d6efe10, - 0x1ab93d1d, - 0x0ba5a4df, - 0xa186f20f, - 0x2868f169, - 0xdcb7da83, - 0x573906fe, - 0xa1e2ce9b, - 0x4fcd7f52, - 0x50115e01, - 0xa70683fa, - 0xa002b5c4, - 0x0de6d027, - 0x9af88c27, - 0x773f8641, - 0xc3604c06, - 0x61a806b5, - 0xf0177a28, - 0xc0f586e0, - 0x006058aa, - 0x30dc7d62, - 0x11e69ed7, - 0x2338ea63, - 0x53c2dd94, - 0xc2c21634, - 0xbbcbee56, - 0x90bcb6de, - 0xebfc7da1, - 0xce591d76, - 0x6f05e409, - 0x4b7c0188, - 0x39720a3d, - 0x7c927c24, - 0x86e3725f, - 0x724d9db9, - 0x1ac15bb4, - 0xd39eb8fc, - 0xed545578, - 0x08fca5b5, - 0xd83d7cd3, - 0x4dad0fc4, - 0x1e50ef5e, - 0xb161e6f8, - 0xa28514d9, - 0x6c51133c, - 0x6fd5c7e7, - 0x56e14ec4, - 0x362abfce, - 0xddc6c837, - 0xd79a3234, - 0x92638212, - 0x670efa8e, - 0x406000e0, - 0x3a39ce37, - 0xd3faf5cf, - 0xabc27737, - 0x5ac52d1b, - 0x5cb0679e, - 0x4fa33742, - 0xd3822740, - 0x99bc9bbe, - 0xd5118e9d, - 0xbf0f7315, - 0xd62d1c7e, - 0xc700c47b, - 0xb78c1b6b, - 0x21a19045, - 0xb26eb1be, - 0x6a366eb4, - 0x5748ab2f, - 0xbc946e79, - 0xc6a376d2, - 0x6549c2c8, - 0x530ff8ee, - 0x468dde7d, - 0xd5730a1d, - 0x4cd04dc6, - 0x2939bbdb, - 0xa9ba4650, - 0xac9526e8, - 0xbe5ee304, - 0xa1fad5f0, - 0x6a2d519a, - 0x63ef8ce2, - 0x9a86ee22, - 0xc089c2b8, - 0x43242ef6, - 0xa51e03aa, - 0x9cf2d0a4, - 0x83c061ba, - 0x9be96a4d, - 0x8fe51550, - 0xba645bd6, - 0x2826a2f9, - 0xa73a3ae1, - 0x4ba99586, - 0xef5562e9, - 0xc72fefd3, - 0xf752f7da, - 0x3f046f69, - 0x77fa0a59, - 0x80e4a915, - 0x87b08601, - 0x9b09e6ad, - 0x3b3ee593, - 0xe990fd5a, - 0x9e34d797, - 0x2cf0b7d9, - 0x022b8b51, - 0x96d5ac3a, - 0x017da67d, - 0xd1cf3ed6, - 0x7c7d2d28, - 0x1f9f25cf, - 0xadf2b89b, - 0x5ad6b472, - 0x5a88f54c, - 0xe029ac71, - 0xe019a5e6, - 0x47b0acfd, - 0xed93fa9b, - 0xe8d3c48d, - 0x283b57cc, - 0xf8d56629, - 0x79132e28, - 0x785f0191, - 0xed756055, - 0xf7960e44, - 0xe3d35e8c, - 0x15056dd4, - 0x88f46dba, - 0x03a16125, - 0x0564f0bd, - 0xc3eb9e15, - 0x3c9057a2, - 0x97271aec, - 0xa93a072a, - 0x1b3f6d9b, - 0x1e6321f5, - 0xf59c66fb, - 0x26dcf319, - 0x7533d928, - 0xb155fdf5, - 0x03563482, - 0x8aba3cbb, - 0x28517711, - 0xc20ad9f8, - 0xabcc5167, - 0xccad925f, - 0x4de81751, - 0x3830dc8e, - 0x379d5862, - 0x9320f991, - 0xea7a90c2, - 0xfb3e7bce, - 0x5121ce64, - 0x774fbe32, - 0xa8b6e37e, - 0xc3293d46, - 0x48de5369, - 0x6413e680, - 0xa2ae0810, - 0xdd6db224, - 0x69852dfd, - 0x09072166, - 0xb39a460a, - 0x6445c0dd, - 0x586cdecf, - 0x1c20c8ae, - 0x5bbef7dd, - 0x1b588d40, - 0xccd2017f, - 0x6bb4e3bb, - 0xdda26a7e, - 0x3a59ff45, - 0x3e350a44, - 0xbcb4cdd5, - 0x72eacea8, - 0xfa6484bb, - 0x8d6612ae, - 0xbf3c6f47, - 0xd29be463, - 0x542f5d9e, - 0xaec2771b, - 0xf64e6370, - 0x740e0d8d, - 0xe75b1357, - 0xf8721671, - 0xaf537d5d, - 0x4040cb08, - 0x4eb4e2cc, - 0x34d2466a, - 0x0115af84, - 0xe1b00428, - 0x95983a1d, - 0x06b89fb4, - 0xce6ea048, - 0x6f3f3b82, - 0x3520ab82, - 0x011a1d4b, - 0x277227f8, - 0x611560b1, - 0xe7933fdc, - 0xbb3a792b, - 0x344525bd, - 0xa08839e1, - 0x51ce794b, - 0x2f32c9b7, - 0xa01fbac9, - 0xe01cc87e, - 0xbcc7d1f6, - 0xcf0111c3, - 0xa1e8aac7, - 0x1a908749, - 0xd44fbd9a, - 0xd0dadecb, - 0xd50ada38, - 0x0339c32a, - 0xc6913667, - 0x8df9317c, - 0xe0b12b4f, - 0xf79e59b7, - 0x43f5bb3a, - 0xf2d519ff, - 0x27d9459c, - 0xbf97222c, - 0x15e6fc2a, - 0x0f91fc71, - 0x9b941525, - 0xfae59361, - 0xceb69ceb, - 0xc2a86459, - 0x12baa8d1, - 0xb6c1075e, - 0xe3056a0c, - 0x10d25065, - 0xcb03a442, - 0xe0ec6e0e, - 0x1698db3b, - 0x4c98a0be, - 0x3278e964, - 0x9f1f9532, - 0xe0d392df, - 0xd3a0342b, - 0x8971f21e, - 0x1b0a7441, - 0x4ba3348c, - 0xc5be7120, - 0xc37632d8, - 0xdf359f8d, - 0x9b992f2e, - 0xe60b6f47, - 0x0fe3f11d, - 0xe54cda54, - 0x1edad891, - 0xce6279cf, - 0xcd3e7e6f, - 0x1618b166, - 0xfd2c1d05, - 0x848fd2c5, - 0xf6fb2299, - 0xf523f357, - 0xa6327623, - 0x93a83531, - 0x56cccd02, - 0xacf08162, - 0x5a75ebb5, - 0x6e163697, - 0x88d273cc, - 0xde966292, - 0x81b949d0, - 0x4c50901b, - 0x71c65614, - 0xe6c6c7bd, - 0x327a140a, - 0x45e1d006, - 0xc3f27b9a, - 0xc9aa53fd, - 0x62a80f00, - 0xbb25bfe2, - 0x35bdd2f6, - 0x71126905, - 0xb2040222, - 0xb6cbcf7c, - 0xcd769c2b, - 0x53113ec0, - 0x1640e3d3, - 0x38abbd60, - 0x2547adf0, - 0xba38209c, - 0xf746ce76, - 0x77afa1c5, - 0x20756060, - 0x85cbfe4e, - 0x8ae88dd8, - 0x7aaaf9b0, - 0x4cf9aa7e, - 0x1948c25c, - 0x02fb8a8c, - 0x01c36ae4, - 0xd6ebe1f9, - 0x90d4f869, - 0xa65cdea0, - 0x3f09252d, - 0xc208e69f, - 0xb74e6132, - 0xce77e25b, - 0x578fdfe3, - 0x3ac372e6, -}; diff --git a/src/blowfish/constants.rs b/src/blowfish/constants.rs new file mode 100644 index 0000000..f80a0e6 --- /dev/null +++ b/src/blowfish/constants.rs @@ -0,0 +1,167 @@ +// SPDX-FileCopyrightText: 2023 Joshua Goins +// SPDX-License-Identifier: GPL-3.0-or-later + +pub const BLOWFISH_P: [u32; 18] = [ + 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89, + 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c, 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, + 0x9216d5d9, 0x8979fb1b, +]; + +pub const BLOWFISH_S: [[u32; 256]; 4] = [ + [ + 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, + 0xf12c7f99, 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16, 0x636920d8, 0x71574e69, + 0xa458fea3, 0xf4933d7e, 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, 0x7b54a41d, + 0xc25a59b5, 0x9c30d539, 0x2af26013, 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, + 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1, 0xbd314b27, 0x78af2fda, + 0x55605c60, 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, 0x55ca396a, 0x2aab10b6, + 0xb4cc5c34, 0x1141e8ce, 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a, 0x2ba9c55d, + 0x741831f6, 0xce5c3e16, 0x9b87931e, 0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677, + 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193, 0x61d809cc, 0xfb21a991, 0x487cac60, + 0x5dec8032, 0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, + 0x0f6d6ff3, 0x83f44239, 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, 0x21c66842, + 0xf6e96c9a, 0x670c9c61, 0xabd388f0, 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3, + 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98, 0xa1f1651d, 0x39af0176, 0x66ca593e, + 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe, 0xe06f75d8, 0x85c12073, + 0x401a449f, 0x56c16aa6, 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d, 0x37d0d724, + 0xd00a1248, 0xdb0fead3, 0x49f1c09b, 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7, + 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, + 0x196a2463, 0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f, 0x9b30952c, + 0xcc814544, 0xaf5ebd09, 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3, 0xc0cba857, + 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279, + 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8, 0x3c7516df, 0xfd616b15, 0x2f501ec8, + 0xad0552ab, 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82, 0x9e5c57bb, 0xca6f8ca0, + 0x1a87562e, 0xdf1769db, 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, 0x695b27b0, + 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0, 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b, + 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, + 0xcee4c6e8, 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4, 0x95dbda4d, 0xae909198, + 0xeaad8e71, 0x6b93d5a0, 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7, 0x8ff6e2fb, + 0xf2122b64, 0x8888b812, 0x900df01c, 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, + 0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1, 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, + 0xce89e299, 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, 0x165fa266, 0x80957705, + 0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf, 0xebcdaf0c, + 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af, + 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa, 0x78c14389, 0xd95a537f, 0x207d5ba2, + 0x02e5b9c5, 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, + 0x1b510052, 0x9a532915, 0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, 0x08ba6fb5, + 0x571be91f, 0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, + 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a, + ], + [ + 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, + 0x8fedb266, 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1, 0x193602a5, 0x75094c29, + 0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, + 0xefe830f5, 0x4d2d38e6, 0xf0255dc1, 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, + 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1, 0x687f3584, 0x52a0e286, 0xb79c5305, + 0xaa500737, 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, 0xb03ada37, 0xf0500c0d, + 0xf01c1f04, 0x0200b3ff, 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd, 0xd19113f9, + 0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7, + 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, 0xe238cd99, 0x3bea0e2f, 0x3280bba1, + 0x183eb331, 0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, + 0x5679b072, 0xbcaf89af, 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, 0x5512721f, + 0x2e6b7124, 0x501adde6, 0x9f84cd87, 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, + 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2, 0xef1c1847, 0x3215d908, 0xdd433b37, + 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd, 0x71dff89e, 0x10314e55, + 0x81ac77d6, 0x5f11199b, 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509, 0xf28fe6ed, + 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e, 0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3, + 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978, + 0x9c10b36a, 0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d, + 0x1939260f, 0x19c27960, 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66, 0xe3bc4595, + 0xa67bc883, 0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802, + 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84, 0x1521b628, 0x29076170, 0xecdd4775, + 0x619f1510, 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf, 0xb5735c90, 0x4c70a239, + 0xd59e9e0b, 0xcbaade14, 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, 0x648b1eaf, + 0x19bdf0ca, 0xa02369b9, 0x655abb50, 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7, + 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77, 0x11ed935f, + 0x16681281, 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, 0x57f584a5, 0x1b227263, + 0x9b83c3ff, 0x1ac24696, 0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128, 0x58ebf2ef, + 0x34c6ffea, 0xfe28ed61, 0xee7c3c73, 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, + 0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0, 0xc742f442, 0xef6abbb5, 0x654f3b1d, + 0x41cd2105, 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, 0xcf62a1f2, 0x5b8d2646, + 0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285, 0x095bbf00, + 0xad19489d, 0x1462b174, 0x23820e00, 0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061, + 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, 0x7cde3759, 0xcbee7460, 0x4085f2a7, + 0xce77326e, 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, + 0x5a04abfc, 0x800bcadc, 0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, + 0x105588cd, 0x675fda79, 0xe3674340, 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, + 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7, + ], + [ + 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, + 0xd4a20068, 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, 0x1e39f62e, 0x97244546, + 0x14214f74, 0xbf8b8840, 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, + 0x03bd9785, 0x7fac6dd0, 0x31cb8504, 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, + 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb, 0x68dc1462, 0xd7486900, 0x680ec0a4, + 0x27a18dee, 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6, 0xaace1e7c, 0xd3375fec, + 0xce78a399, 0x406b2a42, 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b, 0x1dc9faf7, + 0x4b6d1856, 0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb, + 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, 0x55533a3a, 0x20838d87, 0xfe6ba9b7, + 0xd096954b, 0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9, + 0x5ef47e1c, 0x9029317c, 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, 0x95c11548, + 0xe4c66d22, 0x48c1133f, 0xc70f86dc, 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, + 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564, 0x257b7834, 0x602a9c60, 0xdff8e8a3, + 0x1f636c1b, 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115, 0x6b2395e0, 0x333e92e1, + 0x3b240b62, 0xeebeb922, 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728, 0xd0127845, + 0x95b794fd, 0x647d0862, 0xe7ccf5f0, 0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e, + 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8, 0x991be14c, + 0xdb6e6b0d, 0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3, + 0xb5390f92, 0x690fed0b, 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3, 0xbb132f88, + 0x515bad24, 0x7b9479bf, 0x763bd6eb, 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d, + 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c, 0x6a124237, 0xb79251e7, 0x06a1bbe6, + 0x4bfb6350, 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9, 0x44421659, 0x0a121386, + 0xd90cec6e, 0xd5abea2a, 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe, 0x9dbc8057, + 0xf0f7c086, 0x60787bf8, 0x6003604d, 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc, + 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24, 0x55464299, + 0xbf582e61, 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, 0x5366f9c3, 0xc8b38e74, + 0xb475f255, 0x46fcd9b9, 0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2, 0x466e598e, + 0x20b45770, 0x8cd55591, 0xc902de4c, 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, + 0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633, 0xe85a1f02, 0x09f0be8c, 0x4a99a025, + 0x1d6efe10, 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169, 0xdcb7da83, 0x573906fe, + 0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027, 0x9af88c27, + 0x773f8641, 0xc3604c06, 0x61a806b5, 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62, + 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, + 0xce591d76, 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, + 0x1ac15bb4, 0xd39eb8fc, 0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, + 0xb161e6f8, 0xa28514d9, 0x6c51133c, 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, + 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0, + ], + [ + 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, 0xd3822740, + 0x99bc9bbe, 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b, 0xb78c1b6b, 0x21a19045, + 0xb26eb1be, 0x6a366eb4, 0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, 0x530ff8ee, + 0x468dde7d, 0xd5730a1d, 0x4cd04dc6, 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, + 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22, 0xc089c2b8, 0x43242ef6, 0xa51e03aa, + 0x9cf2d0a4, 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, 0x2826a2f9, 0xa73a3ae1, + 0x4ba99586, 0xef5562e9, 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59, 0x80e4a915, + 0x87b08601, 0x9b09e6ad, 0x3b3ee593, 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51, + 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, + 0x5a88f54c, 0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, + 0xf8d56629, 0x79132e28, 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, 0x15056dd4, + 0x88f46dba, 0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a, + 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319, 0x7533d928, 0xb155fdf5, 0x03563482, + 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f, 0x4de81751, 0x3830dc8e, + 0x379d5862, 0x9320f991, 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32, 0xa8b6e37e, + 0xc3293d46, 0x48de5369, 0x6413e680, 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166, + 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, 0xccd2017f, + 0x6bb4e3bb, 0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb, + 0x8d6612ae, 0xbf3c6f47, 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370, 0x740e0d8d, + 0xe75b1357, 0xf8721671, 0xaf537d5d, 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84, + 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048, 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, + 0x277227f8, 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd, 0xa08839e1, 0x51ce794b, + 0x2f32c9b7, 0xa01fbac9, 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, 0x1a908749, + 0xd44fbd9a, 0xd0dadecb, 0xd50ada38, 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f, + 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, + 0x9b941525, 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1, 0xb6c1075e, 0xe3056a0c, + 0x10d25065, 0xcb03a442, 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964, 0x9f1f9532, + 0xe0d392df, 0xd3a0342b, 0x8971f21e, 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, + 0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891, 0xce6279cf, + 0xcd3e7e6f, 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, 0xf523f357, 0xa6327623, + 0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc, 0xde966292, + 0x81b949d0, 0x4c50901b, 0x71c65614, 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a, + 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6, 0x71126905, 0xb2040222, 0xb6cbcf7c, + 0xcd769c2b, 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, + 0x77afa1c5, 0x20756060, 0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, + 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9, 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f, + 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6, + ], +]; diff --git a/src/blowfish/mod.rs b/src/blowfish/mod.rs new file mode 100644 index 0000000..1d99eea --- /dev/null +++ b/src/blowfish/mod.rs @@ -0,0 +1,128 @@ +// SPDX-FileCopyrightText: 2025 Joshua Goins +// SPDX-License-Identifier: GPL-3.0-or-later + +use std::io::{Cursor, Write}; + +mod constants; +use constants::{BLOWFISH_P, BLOWFISH_S}; + +const ROUNDS: usize = 16; + +pub struct Blowfish { + p: [u32; ROUNDS + 2], + s: [[u32; 256]; 4], +} + +impl Blowfish { + /// Initializes a new Blowfish session with a key. + pub fn new(key: &[u8]) -> Blowfish { + let mut s = Self { + p: BLOWFISH_P, + s: BLOWFISH_S, + }; + + let mut j = 0usize; + for i in 0..ROUNDS + 2 { + let mut data = 0i32; + for _ in 0..4 { + data = (data.wrapping_shl(8)) | ((key[j] as i8) as i32); + j += 1; + + if j >= key.len() { + j = 0; + } + } + + s.p[i] ^= data as u32; + } + + let mut l = 0u32; + let mut r = 0u32; + + for i in (0..ROUNDS + 2).step_by(2) { + s.encrypt_pair(&mut l, &mut r); + s.p[i] = l; + s.p[i + 1] = r; + } + + for i in 0..4 { + for j in (0..256).step_by(2) { + s.encrypt_pair(&mut l, &mut r); + s.s[i][j] = l; + s.s[i][j + 1] = r; + } + } + + s + } + + /// Encrypts a block of data. If the encryption for any reason fails, returns None. + pub fn encrypt(&self, data: &mut [u8]) { + let padded_size = Blowfish::padded_length(data.len()); + + for i in (0..padded_size).step_by(8) { + let mut l: u32 = u32::from_le_bytes(data[i..i + 4].try_into().unwrap()); + let mut r: u32 = u32::from_le_bytes(data[i + 4..i + 8].try_into().unwrap()); + + self.encrypt_pair(&mut l, &mut r); + + data[i..i + 4].copy_from_slice(&l.to_le_bytes()); + data[i + 4..i + 8].copy_from_slice(&r.to_le_bytes()); + } + } + + fn padded_length(length: usize) -> usize { + ((length as i32) & -32) as usize + } + + pub fn decrypt(&self, data: &mut [u8]) { + let padded_size = Blowfish::padded_length(data.len()); + + // extra data at the end is left untouched + for i in (0..padded_size).step_by(8) { + let mut l: u32 = u32::from_le_bytes(data[i..i + 4].try_into().unwrap()); + let mut r: u32 = u32::from_le_bytes(data[i + 4..i + 8].try_into().unwrap()); + + self.decrypt_pair(&mut l, &mut r); + + data[i..i + 4].copy_from_slice(&l.to_le_bytes()); + data[i + 4..i + 8].copy_from_slice(&r.to_le_bytes()); + } + } + + /// Calculates the F-function for `x`. + fn f(&self, x: u32) -> u32 { + let [a, b, c, d] = x.to_le_bytes(); + return ((self.s[0][d as usize].wrapping_add(self.s[1][c as usize])) + ^ (self.s[2][b as usize])) + .wrapping_add(self.s[3][a as usize]); + } + + fn encrypt_pair(&self, xl: &mut u32, xr: &mut u32) { + for i in 0..ROUNDS { + *xl ^= self.p[i as usize]; + *xr = self.f(*xl) ^ *xr; + + (*xl, *xr) = (*xr, *xl); + } + + (*xl, *xr) = (*xr, *xl); + + *xr ^= self.p[ROUNDS as usize]; + *xl ^= self.p[ROUNDS as usize + 1]; + } + + fn decrypt_pair(&self, xl: &mut u32, xr: &mut u32) { + for i in (2..ROUNDS + 2).rev() { + *xl ^= self.p[i as usize]; + *xr = self.f(*xl) ^ *xr; + + (*xl, *xr) = (*xr, *xl); + } + + (*xl, *xr) = (*xr, *xl); + + *xl ^= self.p[0]; + *xr ^= self.p[1]; + } +} diff --git a/src/blowfish/wrapper.cpp b/src/blowfish/wrapper.cpp deleted file mode 100644 index 2a168d7..0000000 --- a/src/blowfish/wrapper.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include -#include -#include "blowfish.h" -#include "wrapper.h" - -// the contents of blowfish.cpp and it's headers are directly from sapphire server (which I believe is ripped from the game but with prep methods) -// https://github.com/SapphireServer/Sapphire/blob/master/src/common/Crypt/blowfish.cpp -// TODO: eventually get the lobby to work with the blowfish or blowfish_rs crate. - -BYTE *blowfish_encode(BYTE *key, uint32_t keybytes, BYTE *pInput, DWORD lSize) -{ - BlowFish blowfish; - blowfish.initialize(key, keybytes); - - BYTE *pOutput = new BYTE[lSize]; - blowfish.Encode(pInput, pOutput, lSize); - - return pOutput; -} - -BYTE *blowfish_decode(BYTE *key, uint32_t keybytes, BYTE *pInput, DWORD lSize) -{ - BlowFish blowfish; - blowfish.initialize(key, keybytes); - - BYTE *pOutput = new BYTE[lSize]; - blowfish.Decode(pInput, pOutput, lSize); - - return pOutput; -} diff --git a/src/blowfish/wrapper.h b/src/blowfish/wrapper.h deleted file mode 100644 index 874d075..0000000 --- a/src/blowfish/wrapper.h +++ /dev/null @@ -1,21 +0,0 @@ -#include -extern "C" -{ - - typedef void *BlowfishHandle; - -#define DWORD uint32_t -#define WORD unsigned short -#define BYTE uint8_t - - struct ExpandedKey - { - DWORD *PArray; - DWORD (*SBoxes) - [256]; - }; - - BYTE *blowfish_encode(BYTE *key, uint32_t keybytes, BYTE *pInput, DWORD lSize); - BYTE *blowfish_decode(BYTE *key, uint32_t keybytes, BYTE *pInput, DWORD lSize); - //__declspec(dllexport) void destroy(BlowFish hanle); -} diff --git a/src/compression.rs b/src/compression.rs index 19d910d..dc8d74b 100644 --- a/src/compression.rs +++ b/src/compression.rs @@ -4,7 +4,7 @@ use std::io::Cursor; use binrw::{BinRead, BinResult}; use crate::{ - oodle::{FFXIVOodle}, + oodle::FFXIVOodle, packet::{PacketHeader, PacketSegment}, }; diff --git a/src/encryption.rs b/src/encryption.rs index eb8acb9..1e158bf 100644 --- a/src/encryption.rs +++ b/src/encryption.rs @@ -1,23 +1,9 @@ use std::fs::write; -use std::{io::Cursor, slice}; +use std::io::Cursor; use binrw::{BinRead, BinResult, BinWrite}; -#[link(name = "FFXIVBlowfish")] -unsafe extern "C" { - pub fn blowfish_encode( - key: *const u8, - keybytes: u32, - pInput: *const u8, - lSize: u32, - ) -> *const u8; - pub fn blowfish_decode( - key: *const u8, - keybytes: u32, - pInput: *const u8, - lSize: u32, - ) -> *const u8; -} +use crate::blowfish::Blowfish; const GAME_VERSION: u16 = 7000; @@ -42,16 +28,13 @@ where let mut data = vec![0; size as usize]; reader.read_exact(&mut data)?; - unsafe { - let decryption_result = - blowfish_decode(encryption_key.as_ptr(), 16, data.as_ptr(), size); - let decrypted_data = slice::from_raw_parts(decryption_result, size as usize); + let blowfish = Blowfish::new(encryption_key); + blowfish.decrypt(&mut data); - write("decrypted.bin", decrypted_data).unwrap(); + write("decrypted.bin", &data).unwrap(); - let mut cursor = Cursor::new(&decrypted_data); - T::read_options(&mut cursor, endian, ()) - } + let mut cursor = Cursor::new(&data); + T::read_options(&mut cursor, endian, ()) } else { tracing::info!("NOTE: Not decrypting this IPC packet since no key was provided!"); @@ -73,18 +56,12 @@ where let mut buffer = cursor.into_inner(); buffer.resize(size as usize, 0); - unsafe { - let encoded = blowfish_encode( - encryption_key.as_ptr(), - 16, - buffer.as_ptr(), - buffer.len() as u32, - ); - let encoded_data = slice::from_raw_parts(encoded, size as usize); - writer.write_all(encoded_data)?; + let blowfish = Blowfish::new(encryption_key); + blowfish.encrypt(&mut buffer); - Ok(()) - } + writer.write_all(&buffer)?; + + Ok(()) } else { tracing::info!("NOTE: Not encrypting this IPC packet since no key was provided!"); diff --git a/src/lib.rs b/src/lib.rs index b8bc00a..3bb964b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,6 +2,7 @@ use minijinja::Environment; use rand::Rng; use rand::distributions::Alphanumeric; +pub mod blowfish; pub mod client_select_data; mod common; mod compression; diff --git a/src/oodle/mod.rs b/src/oodle/mod.rs index ef2ee7e..d4027fe 100644 --- a/src/oodle/mod.rs +++ b/src/oodle/mod.rs @@ -111,16 +111,16 @@ impl FFXIVOodle { OodleNetwork1_Shared_SetWindow( oodle_shared.as_mut_ptr() as *mut c_void, - htbits, - oodle_window.as_mut_ptr() as *mut c_void, - oodle_window.len().try_into().unwrap(), + htbits, + oodle_window.as_mut_ptr() as *mut c_void, + oodle_window.len().try_into().unwrap(), ); OodleNetwork1TCP_Train( oodle_state.as_mut_ptr() as *mut c_void, - oodle_shared.as_mut_ptr() as *mut c_void, - null(), - 0, - 0, + oodle_shared.as_mut_ptr() as *mut c_void, + null(), + 0, + 0, ); FFXIVOodle { @@ -137,11 +137,11 @@ impl FFXIVOodle { let mut in_buf = input.to_vec(); let success = OodleNetwork1TCP_Decode( self.state.as_mut_ptr() as *mut c_void, - self.shared.as_mut_ptr() as *mut c_void, - in_buf.as_mut_ptr() as *const c_void, - in_buf.len().try_into().unwrap(), - out_buf.as_mut_ptr() as *mut c_void, - out_buf.len().try_into().unwrap(), + self.shared.as_mut_ptr() as *mut c_void, + in_buf.as_mut_ptr() as *const c_void, + in_buf.len().try_into().unwrap(), + out_buf.as_mut_ptr() as *mut c_void, + out_buf.len().try_into().unwrap(), ); if !success {