← Back to branch summary

~ubuntu-branches/ubuntu/raring/unrar-nonfree/raring-proposed

« back to all changes in this revision

Viewing changes to rdwrfn.cpp

  • Committer: Package Import Robot
  • Author(s): Martin Meredith
  • Date: 2012-02-14 22:39:32 UTC
  • mfrom: (1.2.12)
  • mto: This revision was merged to the branch mainline in revision 22.
  • Revision ID: package-import@ubuntu.com-20120214223932-80w6cf6q639kinh4
Tags: upstream-4.1.4
Import upstream version 4.1.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
rdwrfn.cpp
89
89
  if (RetCode!=-1)
90
90
  {
91
91
    RetCode=TotalRead;
92
 
#ifndef NOCRYPT
 
92
#ifndef RAR_NOCRYPT
93
93
    if (Decryption)
94
94
#ifndef SFX_MODULE
95
95
      if (Decryption<20)
251
251
  if (Encrypt)
252
252
  {
253
253
    Encryption=*Password ? Method:0;
254
 
#ifndef NOCRYPT
 
254
#ifndef RAR_NOCRYPT
255
255
    Crypt.SetCryptKeys(Password,Salt,Encrypt,false,HandsOffHash);
256
256
#endif
257
257
  }
258
258
  else
259
259
  {
260
260
    Decryption=*Password ? Method:0;
261
 
#ifndef NOCRYPT
 
261
#ifndef RAR_NOCRYPT
262
262
    Decrypt.SetCryptKeys(Password,Salt,Encrypt,Method<29,HandsOffHash);
263
263
#endif
264
264
  }
265
265
}
266
266
 
267
267
 
268
 
#if !defined(SFX_MODULE) && !defined(NOCRYPT)
 
268
#if !defined(SFX_MODULE) && !defined(RAR_NOCRYPT)
269
269
void ComprDataIO::SetAV15Encryption()
270
270
{
271
271
  Decryption=15;
274
274
#endif
275
275
 
276
276
 
277
 
#if !defined(SFX_MODULE) && !defined(NOCRYPT)
 
277
#if !defined(SFX_MODULE) && !defined(RAR_NOCRYPT)
278
278
void ComprDataIO::SetCmt13Encryption()
279
279
{
280
280
  Decryption=13;