mirror of
https://github.com/LisherSong/ps5-web-file-manager.git
synced 2026-10-06 13:00:23 +02:00
Songlx516
c68c0def35
New RAR engine for v1.9, replacing dmc_unrar 1.7.0. dmc_unrar only
dispatches RAR5 compression version 5 (switch(file->version) case
0x5000); WinRAR 6.x/7.x writes version 6 -> DMC_UNRAR_FILE_UNSUPPORTED_VERSION
-> user-facing "corrupt archive" on real v6 archives (diagnosed 2026-09-05
from a v6:8M:m0:m3 test file). unrar 7.20.1 natively supports v6,
encrypted and multi-volume RAR.
Vendored into third_party/unrar7/ (new dir) so the tree stays buildable
while src/rar_extract.c still references the dmc facade. Contents are a
verbatim copy of opello/unrar @97e1780 (159 files, v7.20.1) plus two
project files:
- unrar_c_api.h (C facade shim: platform types + dll.hpp re-export)
- VENDORED.md (source pin, build model, license notes)
Build model verified on host (MinGW g++ 16.2, Windows):
- all 49 UnRARDll.vcxproj sources compile with
-std=c++17 -DRARDLL -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
- links + runs: RARGetDllVersion() = 9 (smoke binary in .build/, ignored)
- Windows link additionally needs -lpowrprof
License: UnRAR freeware license (not GPL) - free to use for handling RAR
archives; cannot be used to build a RAR-compatible archiver. THIRD_PARTY_NOTICES
update lands with the engine swap commit.
Next (v1.9 work items): engine swap in rar_extract.c, Makefile .cpp rules,
fixtures + host tests, frontend password/multi-volume, then ELF build.
135 lines
2.9 KiB
C++
135 lines
2.9 KiB
C++
#include "rar.hpp"
|
|
|
|
#ifndef SFX_MODULE
|
|
#include "crypt1.cpp"
|
|
#include "crypt2.cpp"
|
|
#endif
|
|
#include "crypt3.cpp"
|
|
#include "crypt5.cpp"
|
|
|
|
|
|
CryptData::CryptData()
|
|
{
|
|
Method=CRYPT_NONE;
|
|
KDF3CachePos=0;
|
|
KDF5CachePos=0;
|
|
memset(CRCTab,0,sizeof(CRCTab));
|
|
}
|
|
|
|
|
|
|
|
|
|
void CryptData::DecryptBlock(byte *Buf,size_t Size)
|
|
{
|
|
switch(Method)
|
|
{
|
|
#ifndef SFX_MODULE
|
|
case CRYPT_RAR13:
|
|
Decrypt13(Buf,Size);
|
|
break;
|
|
case CRYPT_RAR15:
|
|
Crypt15(Buf,Size);
|
|
break;
|
|
case CRYPT_RAR20:
|
|
for (size_t I=0;I<Size;I+=CRYPT_BLOCK_SIZE)
|
|
DecryptBlock20(Buf+I);
|
|
break;
|
|
#endif
|
|
case CRYPT_RAR30:
|
|
case CRYPT_RAR50:
|
|
rin.blockDecrypt(Buf,Size,Buf);
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
bool CryptData::SetCryptKeys(bool Encrypt,CRYPT_METHOD Method,
|
|
SecPassword *Password,const byte *Salt,
|
|
const byte *InitV,uint Lg2Cnt,byte *HashKey,byte *PswCheck)
|
|
{
|
|
if (Method==CRYPT_NONE || !Password->IsSet())
|
|
return false;
|
|
|
|
CryptData::Method=Method;
|
|
|
|
wchar PwdW[MAXPASSWORD];
|
|
Password->Get(PwdW,ASIZE(PwdW));
|
|
|
|
if (wcslen(PwdW)>=MAXPASSWORD_RAR)
|
|
uiMsg(UIERROR_TRUNCPSW,MAXPASSWORD_RAR-1);
|
|
|
|
PwdW[Min(MAXPASSWORD_RAR,MAXPASSWORD)-1]=0; // For compatibility with existing archives.
|
|
|
|
char PwdA[MAXPASSWORD];
|
|
WideToChar(PwdW,PwdA,ASIZE(PwdA));
|
|
PwdA[Min(MAXPASSWORD_RAR,MAXPASSWORD)-1]=0; // For compatibility with existing archives.
|
|
|
|
bool Success=true;
|
|
|
|
switch(Method)
|
|
{
|
|
#ifndef SFX_MODULE
|
|
case CRYPT_RAR13:
|
|
SetKey13(PwdA);
|
|
break;
|
|
case CRYPT_RAR15:
|
|
SetKey15(PwdA);
|
|
break;
|
|
case CRYPT_RAR20:
|
|
SetKey20(PwdA);
|
|
break;
|
|
#endif
|
|
case CRYPT_RAR30:
|
|
SetKey30(Encrypt,Password,PwdW,Salt);
|
|
break;
|
|
case CRYPT_RAR50:
|
|
Success=SetKey50(Encrypt,Password,PwdW,Salt,InitV,Lg2Cnt,HashKey,PswCheck);
|
|
break;
|
|
}
|
|
cleandata(PwdA,sizeof(PwdA));
|
|
cleandata(PwdW,sizeof(PwdW));
|
|
return Success;
|
|
}
|
|
|
|
|
|
// Use the current system time to additionally randomize data.
|
|
static void TimeRandomize(byte *RndBuf,size_t BufSize)
|
|
{
|
|
static uint Count=0;
|
|
RarTime CurTime;
|
|
CurTime.SetCurrentTime();
|
|
uint64 Random=CurTime.GetWin()+clock();
|
|
for (size_t I=0;I<BufSize;I++)
|
|
{
|
|
byte RndByte = byte (Random >> ( (I & 7) * 8 ));
|
|
RndBuf[I]=byte( (RndByte ^ I) + Count++);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
// Fill buffer with random data.
|
|
void GetRnd(byte *RndBuf,size_t BufSize)
|
|
{
|
|
bool Success=false;
|
|
#if defined(_WIN_ALL)
|
|
HCRYPTPROV hProvider = 0;
|
|
if (CryptAcquireContext(&hProvider, 0, 0, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT))
|
|
{
|
|
Success=CryptGenRandom(hProvider, (DWORD)BufSize, RndBuf) != FALSE;
|
|
CryptReleaseContext(hProvider, 0);
|
|
}
|
|
#elif defined(_UNIX)
|
|
FILE *rndf = fopen("/dev/urandom", "r");
|
|
if (rndf!=NULL)
|
|
{
|
|
Success=fread(RndBuf, BufSize, 1, rndf) == BufSize;
|
|
fclose(rndf);
|
|
}
|
|
#endif
|
|
// We use this code only as the last resort if code above failed.
|
|
if (!Success)
|
|
TimeRandomize(RndBuf,BufSize);
|
|
}
|