4.50 beta

5 files changed, 319 insertions, 2 deletions

diff --git a/C/7zCrc.c b/C/7zCrc.c
index 61050dd4..1436b993 100755
--- a/C/7zCrc.c
+++ b/C/7zCrc.c
@@ -5,7 +5,7 @@
 #define kCrcPoly 0xEDB88320
 UInt32 g_CrcTable[256];
 
-void MY_FAST_CALL CrcGenerateTable()
+void MY_FAST_CALL CrcGenerateTable(void)
 {
   UInt32 i;
   for (i = 0; i < 256; i++)
diff --git a/C/7zCrc.h b/C/7zCrc.h
index bb3d481f..6cb10161 100755
--- a/C/7zCrc.h
+++ b/C/7zCrc.h
@@ -9,7 +9,7 @@
 
 extern UInt32 g_CrcTable[];
 
-void MY_FAST_CALL CrcGenerateTable();
+void MY_FAST_CALL CrcGenerateTable(void);
 
 #define CRC_INIT_VAL 0xFFFFFFFF
 #define CRC_GET_DIGEST(crc) ((crc) ^ 0xFFFFFFFF)
diff --git a/C/CpuArch.h b/C/CpuArch.h
new file mode 100755
index 00000000..26ce8b1d
--- /dev/null
+++ b/C/CpuArch.h
@@ -0,0 +1,18 @@
+/* CpuArch.h */
+
+#ifndef __CPUARCH_H
+#define __CPUARCH_H
+
+/* 
+LITTLE_ENDIAN_UNALIGN means:
+  1) CPU is LITTLE_ENDIAN
+  2) it's allowed to make unaligned memory accesses
+if LITTLE_ENDIAN_UNALIGN is not defined, it means that we don't know 
+about these properties of platform.
+*/
+
+#if defined(_M_IX86) || defined(_M_X64) || defined(_M_AMD64) || defined(__i386__) || defined(__x86_64__)
+#define LITTLE_ENDIAN_UNALIGN
+#endif
+
+#endif
diff --git a/C/Crypto/Aes.c b/C/Crypto/Aes.c
new file mode 100755
index 00000000..205edbc8
--- /dev/null
+++ b/C/Crypto/Aes.c
@@ -0,0 +1,259 @@
+/* Aes.h */
+
+#include "Aes.h"
+#include "../CpuArch.h"
+
+UInt32 T[256 * 4];
+Byte Sbox[256] = {	
+  0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
+  0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
+  0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
+  0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
+  0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
+  0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
+  0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
+  0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
+  0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
+  0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
+  0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
+  0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
+  0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
+  0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
+  0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+  0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16};
+
+UInt32 D[256 * 4];
+Byte InvS[256];
+
+Byte Rcon[11] = { 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36 };
+
+#define xtime(x) ((((x) << 1) ^ (((x) & 0x80) != 0 ? 0x1B : 0)) & 0xFF)
+
+#define Ui32(a0, a1, a2, a3) ((UInt32)(a0) | ((UInt32)(a1) << 8) | ((UInt32)(a2) << 16) | ((UInt32)(a3) << 24))
+
+#define gb0(x) ( (x)          & 0xFF)
+#define gb1(x) (((x) >> ( 8)) & 0xFF)
+#define gb2(x) (((x) >> (16)) & 0xFF)
+#define gb3(x) (((x) >> (24)) & 0xFF)
+
+void MY_FAST_CALL AesGenTables(void)
+{
+  unsigned i;
+  for (i = 0; i < 256; i++)
+    InvS[Sbox[i]] = (Byte)i;
+  for (i = 0; i < 256; i++)
+  {
+    {
+      UInt32 a1 = Sbox[i];
+      UInt32 a2 = xtime(a1);
+      UInt32 a3 = xtime(a1) ^ a1;
+      T[        i] = Ui32(a2, a1, a1, a3);
+      T[0x100 + i] = Ui32(a3, a2, a1, a1);
+      T[0x200 + i] = Ui32(a1, a3, a2, a1);
+      T[0x300 + i] = Ui32(a1, a1, a3, a2);
+    }
+    {
+      UInt32 a1 = InvS[i];
+      UInt32 a2 = xtime(a1);
+      UInt32 a4 = xtime(a2);
+      UInt32 a8 = xtime(a4);
+      UInt32 a9 = a8 ^ a1;
+      UInt32 aB = a8 ^ a2 ^ a1;
+      UInt32 aD = a8 ^ a4 ^ a1;
+      UInt32 aE = a8 ^ a4 ^ a2;
+      D[        i] = Ui32(aE, a9, aD, aB);
+      D[0x100 + i] = Ui32(aB, aE, a9, aD);
+      D[0x200 + i] = Ui32(aD, aB, aE, a9);
+      D[0x300 + i] = Ui32(a9, aD, aB, aE);
+    }
+  }
+}
+
+#define HT(i, x, s) (T + (x << 8))[gb ## x(s[(i + x) & 3])]
+#define HT4(m, i, s, p) m[i] = \
+    HT(i, 0, s) ^ \
+    HT(i, 1, s) ^ \
+    HT(i, 2, s) ^ \
+    HT(i, 3, s) ^ w[p + i]
+/* such order (2031) in HT16 is for VC6/K8 speed optimization) */
+#define HT16(m, s, p) \
+    HT4(m, 2, s, p); \
+    HT4(m, 0, s, p); \
+    HT4(m, 3, s, p); \
+    HT4(m, 1, s, p); \
+
+#define FT(i, x) Sbox[gb ## x(m[(i + x) & 3])]
+#define FT4(i) dest[i] = Ui32(FT(i, 0), FT(i, 1), FT(i, 2), FT(i, 3)) ^ w[i];
+
+#define HD(i, x, s) (D + (x << 8))[gb ## x(s[(i - x) & 3])]
+#define HD4(m, i, s, p) m[i] = \
+    HD(i, 0, s) ^ \
+    HD(i, 1, s) ^ \
+    HD(i, 2, s) ^ \
+    HD(i, 3, s) ^ w[p + i];
+/* such order (0231) in HD16 is for VC6/K8 speed optimization) */
+#define HD16(m, s, p) \
+    HD4(m, 0, s, p); \
+    HD4(m, 2, s, p); \
+    HD4(m, 3, s, p); \
+    HD4(m, 1, s, p); \
+
+#define FD(i, x) InvS[gb ## x(m[(i - x) & 3])]
+#define FD4(i) dest[i] = Ui32(FD(i, 0), FD(i, 1), FD(i, 2), FD(i, 3)) ^ w[i];
+
+void MY_FAST_CALL AesSetKeyEncode(CAes *p, const Byte *key, unsigned keySize)
+{
+  unsigned i, wSize;
+  UInt32 *w;
+  keySize /= 4;
+  p->numRounds2 = keySize / 2 + 3;
+
+  wSize = (p->numRounds2 * 2 + 1) * 4;
+  w = p->rkey;
+
+  for (i = 0; i < keySize; i++, key += 4) 
+    w[i] = Ui32(key[0], key[1], key[2], key[3]);
+
+  for (; i < wSize; i++) 
+  {
+    UInt32 t = w[i - 1];
+    unsigned rem = i % keySize;
+		if (rem == 0) 
+      t = Ui32(Sbox[gb1(t)] ^ Rcon[i / keySize], Sbox[gb2(t)], Sbox[gb3(t)], Sbox[gb0(t)]);
+    else if (keySize > 6 && rem == 4) 
+      t = Ui32(Sbox[gb0(t)], Sbox[gb1(t)], Sbox[gb2(t)], Sbox[gb3(t)]);
+    w[i] = w[i - keySize] ^ t;
+  }
+}
+
+void MY_FAST_CALL AesSetKeyDecode(CAes *p, const Byte *key, unsigned keySize)
+{
+  unsigned i, num;
+  UInt32 *w;
+  AesSetKeyEncode(p, key, keySize);
+  num = p->numRounds2 * 8 - 4;
+  w = p->rkey + 4;
+  for (i = 0; i < num; i++)
+  {
+    UInt32 r = w[i];
+    w[i] = 
+      D[        Sbox[gb0(r)]] ^
+      D[0x100 + Sbox[gb1(r)]] ^
+      D[0x200 + Sbox[gb2(r)]] ^
+      D[0x300 + Sbox[gb3(r)]];
+  }
+}
+
+void MY_FAST_CALL AesEncode32(const UInt32 *src, UInt32 *dest, const UInt32 *w, unsigned numRounds2)
+{
+  UInt32 s[4];
+  UInt32 m[4];
+  s[0] = src[0] ^ w[0];
+  s[1] = src[1] ^ w[1];
+  s[2] = src[2] ^ w[2];
+  s[3] = src[3] ^ w[3];
+  w += 4;
+  for (;;)
+  {
+    HT16(m, s, 0);
+    if (--numRounds2 == 0)
+      break;
+    HT16(s, m, 4);
+    w += 8;
+  }
+  w += 4;
+  FT4(0); FT4(1); FT4(2); FT4(3);
+}
+
+void MY_FAST_CALL AesDecode32(const UInt32 *src, UInt32 *dest, const UInt32 *w, unsigned numRounds2)
+{
+  UInt32 s[4];
+  UInt32 m[4];
+  w += numRounds2 * 8;
+  s[0] = src[0] ^ w[0];
+  s[1] = src[1] ^ w[1];
+  s[2] = src[2] ^ w[2];
+  s[3] = src[3] ^ w[3];
+  for (;;)
+  {
+    w -= 8;
+    HD16(m, s, 4);
+    if (--numRounds2 == 0)
+      break;
+    HD16(s, m, 0);
+  }
+  FD4(0); FD4(1); FD4(2); FD4(3);
+}
+
+#ifdef LITTLE_ENDIAN_UNALIGN
+#define GetUi32(p) (*(const UInt32 *)(p))
+#define SetUi32(p, d) *(UInt32 *)(p) = d;
+#else
+#define GetUi32(p) ((p)[0] | ((UInt32)(p)[1] << 8) | ((UInt32)(p)[2] << 16) | ((UInt32)(p)[3] << 24))
+#define SetUi32(p, d) { UInt32 x = (d); (p)[0] = (Byte)x; (p)[1] = (Byte)(x >> 8); \
+    (p)[2] = (Byte)(x >> 16); (p)[3] = (Byte)(x >> 24); }
+#endif
+
+
+void MY_FAST_CALL AesCbcInit(CAesCbc *cbc, const Byte *iv)
+{
+  unsigned i;
+  for (i = 0; i < 4; i++)
+    cbc->prev[i] = GetUi32(iv + i * 4);
+}
+
+UInt32 MY_FAST_CALL AesCbcEncode(CAesCbc *cbc, Byte *data, UInt32 size)
+{
+  UInt32 i;
+  if (size == 0)
+    return 0;
+  if (size < AES_BLOCK_SIZE)
+    return AES_BLOCK_SIZE;
+  size -= AES_BLOCK_SIZE;
+  for (i = 0; i <= size; i += AES_BLOCK_SIZE, data += AES_BLOCK_SIZE)
+  {
+    cbc->prev[0] ^= GetUi32(data);
+    cbc->prev[1] ^= GetUi32(data + 4);
+    cbc->prev[2] ^= GetUi32(data + 8);
+    cbc->prev[3] ^= GetUi32(data + 12);
+    
+    AesEncode32(cbc->prev, cbc->prev, cbc->aes.rkey, cbc->aes.numRounds2);
+    
+    SetUi32(data,      cbc->prev[0]);
+    SetUi32(data + 4,  cbc->prev[1]);
+    SetUi32(data + 8,  cbc->prev[2]);
+    SetUi32(data + 12, cbc->prev[3]);
+  }
+  return i;
+}
+
+UInt32 MY_FAST_CALL AesCbcDecode(CAesCbc *cbc, Byte *data, UInt32 size)
+{
+  UInt32 i;
+  UInt32 in[4], out[4];
+  if (size == 0)
+    return 0;
+  if (size < AES_BLOCK_SIZE)
+    return AES_BLOCK_SIZE;
+  size -= AES_BLOCK_SIZE;
+  for (i = 0; i <= size; i += AES_BLOCK_SIZE, data += AES_BLOCK_SIZE)
+  {
+    in[0] = GetUi32(data);
+    in[1] = GetUi32(data + 4);
+    in[2] = GetUi32(data + 8);
+    in[3] = GetUi32(data + 12);
+    
+    AesDecode32(in, out, cbc->aes.rkey, cbc->aes.numRounds2);
+    
+    SetUi32(data,      cbc->prev[0] ^ out[0]);
+    SetUi32(data + 4,  cbc->prev[1] ^ out[1]);
+    SetUi32(data + 8,  cbc->prev[2] ^ out[2]);
+    SetUi32(data + 12, cbc->prev[3] ^ out[3]);
+    
+    cbc->prev[0] = in[0];
+    cbc->prev[1] = in[1];
+    cbc->prev[2] = in[2];
+    cbc->prev[3] = in[3];
+  }
+  return i;
+}
diff --git a/C/Crypto/Aes.h b/C/Crypto/Aes.h
new file mode 100755
index 00000000..ab51a72c
--- /dev/null
+++ b/C/Crypto/Aes.h
@@ -0,0 +1,40 @@
+/* Aes.h */
+
+#ifndef __AES_H
+#define __AES_H
+
+#include "../Types.h"
+
+#define AES_BLOCK_SIZE 16
+
+typedef struct _CAes
+{
+  unsigned numRounds2; /* = numRounds / 2 */
+  UInt32 rkey[(14 + 1) * 4];
+} CAes;
+
+/* Call AesGenTables one time before other AES functions */
+void MY_FAST_CALL AesGenTables(void);
+
+/* keySize = 16 or 24 or 32 */
+void MY_FAST_CALL AesSetKeyEncode(CAes *p, const Byte *key, unsigned keySize); 
+void MY_FAST_CALL AesSetKeyDecode(CAes *p, const Byte *key, unsigned keySize);
+
+/* 
+AesEncode32 and AesDecode32 functions work with little-endian words.
+src and dest can contain same address
+*/
+void MY_FAST_CALL AesEncode32(const UInt32 *src, UInt32 *dest, const UInt32 *w, unsigned numRounds2);
+void MY_FAST_CALL AesDecode32(const UInt32 *src, UInt32 *dest, const UInt32 *w, unsigned numRounds2);
+
+typedef struct _CAesCbc
+{
+  UInt32 prev[4];
+  CAes aes;
+} CAesCbc;
+
+void MY_FAST_CALL AesCbcInit(CAesCbc *cbc, const Byte *iv); /* iv size is AES_BLOCK_SIZE */
+UInt32 MY_FAST_CALL AesCbcDecode(CAesCbc *cbc, Byte *data, UInt32 size);
+UInt32 MY_FAST_CALL AesCbcEncode(CAesCbc *cbc, Byte *data, UInt32 size);
+
+#endif