Fix WinZip multihash
This commit is contained in:
+2
-1
@@ -28,6 +28,7 @@
|
||||
#define _PBKDF2_SHA256_
|
||||
#define _PBKDF2_SHA512_
|
||||
#define _RAR3_
|
||||
#define _ZIP2_
|
||||
#endif
|
||||
|
||||
#ifdef _SIPHASH_
|
||||
@@ -54,7 +55,7 @@
|
||||
#define BCRYPTM_5 0x6F756274u
|
||||
#endif
|
||||
|
||||
#if defined _SHA1_ || defined _SAPG_ || defined _OFFICE2007_ || defined _OFFICE2010_ || defined _OLDOFFICE34_ || defined _ANDROIDFDE_ || defined _DCC2_ || defined _WPA_ || defined _MD5_SHA1_ || defined _SHA1_MD5_ || defined _PSAFE2_ || defined _LOTUS8_ || defined _PBKDF2_SHA1_ || defined _RAR3_ || defined _SHA256_SHA1_
|
||||
#if defined _SHA1_ || defined _SAPG_ || defined _OFFICE2007_ || defined _OFFICE2010_ || defined _OLDOFFICE34_ || defined _ANDROIDFDE_ || defined _DCC2_ || defined _WPA_ || defined _MD5_SHA1_ || defined _SHA1_MD5_ || defined _PSAFE2_ || defined _LOTUS8_ || defined _PBKDF2_SHA1_ || defined _RAR3_ || defined _SHA256_SHA1_ || defined _ZIP2_
|
||||
/**
|
||||
* SHA1 Constants
|
||||
*/
|
||||
|
||||
@@ -111,7 +111,7 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined _SHA1_ || defined _SAPG_ || defined _OFFICE2007_ || defined _OFFICE2010_ || defined _OLDOFFICE34_ || defined _ANDROIDFDE_ || defined _DCC2_ || defined _WPA_ || defined _MD5_SHA1_ || defined _SHA1_MD5_ || defined _PSAFE2_ || defined _LOTUS8_ || defined _PBKDF2_SHA1_ || defined _RAR3_ || defined _SHA256_SHA1_
|
||||
#if defined _SHA1_ || defined _SAPG_ || defined _OFFICE2007_ || defined _OFFICE2010_ || defined _OLDOFFICE34_ || defined _ANDROIDFDE_ || defined _DCC2_ || defined _WPA_ || defined _MD5_SHA1_ || defined _SHA1_MD5_ || defined _PSAFE2_ || defined _LOTUS8_ || defined _PBKDF2_SHA1_ || defined _RAR3_ || defined _SHA256_SHA1_ || defined _ZIP2_
|
||||
|
||||
#ifdef IS_NV
|
||||
#define SHA1_F0(x,y,z) ((z) ^ ((x) & ((y) ^ (z))))
|
||||
|
||||
+1
-1
@@ -278,7 +278,7 @@ typedef struct
|
||||
u32 data_len;
|
||||
u32 data_buf[2048];
|
||||
u32 auth_len;
|
||||
u32 auth_buf[5];
|
||||
u32 auth_buf[4];
|
||||
|
||||
} zip2_t;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user