~ubuntu-branches/ubuntu/lucid/unrar-nonfree/lucid

« back to all changes in this revision

Viewing changes to crypt.cpp

Committer: Bazaar Package Importer
Author(s): Martin Meredith
Date: 2009-06-06 17:46:05 UTC
mfrom: (1.1.11 upstream) (5.1.5 sid)
Revision ID: james.westby@ubuntu.com-20090606174605-h4ciqxlpy39jmjx0

Tags: 1:3.9.3-1

http://bugs.debian.org/531432

* New upstream release
* Updated Copyright file (Closes: #531432)

files removed:
int64.cpp

int64.hpp

rarfn.hpp

files modified:
arccmt.cpp

archive.cpp

archive.hpp

arcread.cpp

array.hpp

cmddata.cpp

cmddata.hpp

coder.cpp

consio.cpp

consio.hpp

crc.cpp

crypt.cpp

crypt.hpp

debian/changelog

debian/copyright

dll.cpp

encname.cpp

encname.hpp

errhnd.cpp

errhnd.hpp

extract.cpp

extract.hpp

filcreat.cpp

filcreat.hpp

file.cpp

file.hpp

filefn.cpp

filefn.hpp

filestr.cpp

filestr.hpp

find.cpp

find.hpp

getbits.cpp

getbits.hpp

headers.hpp

list.cpp

loclang.hpp

makefile.bcc

makefile.cygmin

makefile.dj

makefile.dmc

makefile.msc

makefile.unix

model.cpp

model.hpp

msc.dep

options.cpp

options.hpp

os.hpp

pathfn.cpp

rar.cpp

rar.hpp

rartypes.hpp

rarvm.cpp

rarvm.hpp

rawread.cpp

rawread.hpp

rdwrfn.cpp

rdwrfn.hpp

recvol.cpp

rijndael.cpp

rijndael.hpp

savepos.hpp

scantree.cpp

scantree.hpp

sha1.cpp

sha1.hpp

smallfn.cpp

smallfn.hpp

strfn.cpp

strfn.hpp

strlist.cpp

strlist.hpp

suballoc.cpp

system.cpp

timefn.cpp

timefn.hpp

unicode.cpp

unicode.hpp

unpack.cpp

unpack.hpp

unpack15.cpp

unpack20.cpp

version.hpp

volume.cpp

volume.hpp

win32stm.cpp

Show diffs side-by-side

added added

removed removed

crypt.cpp

void CryptData::DecryptBlock(byte *Buf,int Size)

void CryptData::DecryptBlock(byte *Buf,size_t Size)

{

rin.blockDecrypt(Buf,Size,Buf);

}

185

#endif

186

187

188

void CryptData::SetCryptKeys(char *Password,byte *Salt,bool Encrypt,bool OldOnly,bool HandsOffHash)

188

void CryptData::SetCryptKeys(const char *Password,const byte *Salt,bool Encrypt,bool OldOnly,bool HandsOffHash)

189

{

190

if (*Password==0)

191

return;

202

Key[3]=0xA4E7F123L;

203

memset(Psw,0,sizeof(Psw));

204

#if defined(_WIN_32) && !defined(GUI)

205

CharToOemBuff(Password,(char*)Psw,strlen(Password));

205

CharToOemBuff(Password,(char*)Psw,(DWORD)strlen(Password));

206

#else

207

strncpyz((char *)Psw,Password,ASIZE(Psw));

208

#endif

209

int PswLength=strlen(Password);

209

size_t PswLength=strlen(Password);

210

memcpy(SubstTable,InitSubstTable,sizeof(SubstTable));

211

for (int J=0;J<256;J++)

212

for (int I=0;I<PswLength;I+=2)

212

for (size_t I=0;I<PswLength;I+=2)

213

{

214

uint N1=(byte)CRCTab[(Psw[I]-J)&0xff];

215

uint N2=(byte)CRCTab[(Psw[I+1]+J)&0xff];

216

for (int K=1;N1!=N2;N1=(N1+1)&0xff,K++)

217

Swap(&SubstTable[N1],&SubstTable[(N1+I+K)&0xff]);

218

}

219

for (int I=0;I<PswLength;I+=16)

219

for (size_t I=0;I<PswLength;I+=16)

220

EncryptBlock20(&Psw[I]);

221

#endif

222

return;

223

}

224

225

bool Cached=false;

226

for (int I=0;I<sizeof(Cache)/sizeof(Cache[0]);I++)

226

for (int I=0;I<ASIZE(Cache);I++)

227

if (strcmp(Cache[I].Password,Password)==0 &&

228

(Salt==NULL && !Cache[I].SaltPresent || Salt!=NULL &&

229

Cache[I].SaltPresent && memcmp(Cache[I].Salt,Salt,SALT_SIZE)==0) &&

242

PswW[MAXPASSWORD-1]=0;

243

byte RawPsw[2*MAXPASSWORD+SALT_SIZE];

244

WideToRaw(PswW,RawPsw);

245

int RawLength=2*strlenw(PswW);

245

size_t RawLength=2*strlenw(PswW);

246

if (Salt!=NULL)

247

{

248

memcpy(RawPsw+RawLength,Salt,SALT_SIZE);

287

288

289

#ifndef SFX_MODULE

290

void CryptData::SetOldKeys(char *Password)

290

void CryptData::SetOldKeys(const char *Password)

291

{

292

uint PswCRC=CRC(0xffffffff,Password,strlen(Password));

293

OldKey[0]=PswCRC&0xffff;

Older »