Changeset 21422 for trunk/src/rsaenh/des.c

Timestamp:

Aug 17, 2010, 11:51:11 PM (15 years ago)

Author:

dmik

Message:

Attempted to fix broken rsaenh.dll functionality when built by VAC 3 (that doesn't have a 64-bit integer type).

File:

• trunk/src/rsaenh/des.c (modified) (7 diffs)

trunk/src/rsaenh/des.c

@@ -6 +6 @@
  * Based on public domain code by Tom St Denis (tomstdenis@iahu.ca)
  * and Dobes Vandermeer.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23 +23 @@
 
 /*
- * This file contains code from the LibTomCrypt cryptographic 
+ * This file contains code from the LibTomCrypt cryptographic
  * library written by Tom St Denis (tomstdenis@iahu.ca). LibTomCrypt
  * is in the public domain. The code in this file is tailored to
  * special requirements. Take a look at http://libtomcrypt.org for the
- * original version. 
+ * original version.
  */
 
 #include "tomcrypt.h"
 
-#define EN0 0 
+#define EN0 0
 #define DE1 1
 
 static const ulong32 bytebit[8] =
 {
-    0200, 0100, 040, 020, 010, 04, 02, 01 
+    0200, 0100, 040, 020, 010, 04, 02, 01
 };
 
@@ -47 +47 @@
     0x800UL,     0x400UL,     0x200UL,     0x100UL,
     0x80UL,      0x40UL,      0x20UL,      0x10UL,
-    0x8UL,       0x4UL,       0x2UL,       0x1L 
+    0x8UL,       0x4UL,       0x2UL,       0x1L
 };
 
@@ -53 +53 @@
 
 static const unsigned char pc1[56] = {
-    56, 48, 40, 32, 24, 16,  8,  0, 57, 49, 41, 33, 25, 17,  
-     9,  1, 58, 50, 42, 34, 26, 18, 10,  2, 59, 51, 43, 35, 
+    56, 48, 40, 32, 24, 16,  8,  0, 57, 49, 41, 33, 25, 17,
+     9,  1, 58, 50, 42, 34, 26, 18, 10,  2, 59, 51, 43, 35,
     62, 54, 46, 38, 30, 22, 14,  6, 61, 53, 45, 37, 29, 21,
-    13,  5, 60, 52, 44, 36, 28, 20, 12,  4, 27, 19, 11,  3 
+    13,  5, 60, 52, 44, 36, 28, 20, 12,  4, 27, 19, 11,  3
 };
 
 static const unsigned char totrot[16] = {
     1,   2,  4,  6,
-    8,  10, 12, 14, 
-    15, 17, 19, 21, 
+    8,  10, 12, 14,
+    15, 17, 19, 21,
     23, 25, 27, 28
 };
@@ -1279 +1279 @@
   CONST64(0x40404000,0x00404040), CONST64(0x40404010,0x00404040), CONST64(0x40404000,0x40404040), CONST64(0x40404010,0x40404040)
   }};
-  
+
 
 static void cookey(const ulong32 *raw1, ulong32 *keyout);
@@ -1364 +1364 @@
     right = block[1];
 
-    tmp = des_ip[0][byte(leftt, 0)] ^
-          des_ip[1][byte(leftt, 1)] ^
-          des_ip[2][byte(leftt, 2)] ^
-          des_ip[3][byte(leftt, 3)] ^
-          des_ip[4][byte(right, 0)] ^
-          des_ip[5][byte(right, 1)] ^
-          des_ip[6][byte(right, 2)] ^
-          des_ip[7][byte(right, 3)];
-    leftt = (ulong32)(tmp >> 32);
-    right = (ulong32)(tmp & 0xFFFFFFFFUL);
+    tmp =          des_ip[0][byte(leftt, 0)];
+    XOR_int64(tmp, des_ip[1][byte(leftt, 1)]);
+    XOR_int64(tmp, des_ip[2][byte(leftt, 2)]);
+    XOR_int64(tmp, des_ip[3][byte(leftt, 3)]);
+    XOR_int64(tmp, des_ip[4][byte(right, 0)]);
+    XOR_int64(tmp, des_ip[5][byte(right, 1)]);
+    XOR_int64(tmp, des_ip[6][byte(right, 2)]);
+    XOR_int64(tmp, des_ip[7][byte(right, 3)]);
+    leftt = (ulong32)(HI_int64(tmp));
+    right = (ulong32)(LO_int64(tmp));
 
     for (cur_round = 0; cur_round < 8; cur_round++) {
@@ -1399 +1399 @@
     }
 
-    tmp = des_fp[0][byte(leftt, 0)] ^
-          des_fp[1][byte(leftt, 1)] ^
-          des_fp[2][byte(leftt, 2)] ^
-          des_fp[3][byte(leftt, 3)] ^
-          des_fp[4][byte(right, 0)] ^
-          des_fp[5][byte(right, 1)] ^
-          des_fp[6][byte(right, 2)] ^
-          des_fp[7][byte(right, 3)];
-    leftt = (ulong32)(tmp >> 32);
-    right = (ulong32)(tmp & 0xFFFFFFFFUL);
-    
+    tmp =          des_ip[0][byte(leftt, 0)];
+    XOR_int64(tmp, des_ip[1][byte(leftt, 1)]);
+    XOR_int64(tmp, des_ip[2][byte(leftt, 2)]);
+    XOR_int64(tmp, des_ip[3][byte(leftt, 3)]);
+    XOR_int64(tmp, des_ip[4][byte(right, 0)]);
+    XOR_int64(tmp, des_ip[5][byte(right, 1)]);
+    XOR_int64(tmp, des_ip[6][byte(right, 2)]);
+    XOR_int64(tmp, des_ip[7][byte(right, 3)]);
+    leftt = (ulong32)(HI_int64(tmp));
+    right = (ulong32)(LO_int64(tmp));
+
     block[0] = right;
     block[1] = leftt;