Changeset 21422 for trunk/src/rsaenh/tomcrypt.h

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/tomcrypt.h (modified) (9 diffs)

trunk/src/rsaenh/tomcrypt.h

@@ -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.
  */
 
@@ -37 +37 @@
 #include <stdlib.h>
 #include <limits.h>
+
+#if defined(__WIN32OS2__) && (__IBMC__ < 400) && (__IBMCPP__ < 360) && !defined(__WATCOMC__) && !defined(__EMX__)
+
+/* provide a better 64-bit integer storage than double */
+typedef struct
+{
+    int lo;
+    int hi;
+} __long_long;
+#define __int64 __long_long
+
+#define XOR_int64(a, b)     ((a).hi ^= (b).hi, (a).lo ^= (b).lo)
+#define HI_int64(a)         ((a).hi)
+#define LO_int64(a)         ((a).lo)
+#define ASSIGN_int64(a, b)  ((a).hi = 0, (a).lo = (int)(b))
+
+#else
+
+#define XOR_int64(a, b)     ((a) ^= (b))
+#define HI_int64(a)         ((a) >> 32)
+#define LO_int64(a)         ((a) & 0xFFFFFFFFUL)
+#define ASSIGN_int64(a, b)  ((a) = (b))
+
+#endif
+
 #include "basetsd.h"
 
@@ -76 +101 @@
 };
 
+#if defined(__WIN32OS2__) && (__IBMC__ < 400) && (__IBMCPP__ < 360) && !defined(__WATCOMC__) && !defined(__EMX__)
+#define CONST64(a,b) { (b), (a) }
+#else
 #define CONST64(a,b) ((((ULONG64)(a)) << 32) | (b))
+#endif
 typedef ULONG64 ulong64;
 
-/* this is the "32-bit at least" data type 
- * Re-define it to suit your platform but it must be at least 32-bits 
+/* this is the "32-bit at least" data type
+ * Re-define it to suit your platform but it must be at least 32-bits
  */
 typedef ULONG32 ulong32;
@@ -118 +147 @@
 #define byte(x, n) (((x) >> (8 * (n))) & 255)
 
-typedef struct tag_rc2_key { 
-        unsigned xkey[64]; 
+typedef struct tag_rc2_key {
+        unsigned xkey[64];
 } rc2_key;
 
@@ -182 +211 @@
  * [any size beyond that is ok provided it doesn't overflow the data type]
  */
+#if defined(__WIN32OS2__) && (__IBMC__ < 400) && (__IBMCPP__ < 360) && !defined(__WATCOMC__) && !defined(__EMX__)
+typedef unsigned short     mp_digit;
+typedef unsigned long      mp_word;
+#define DIGIT_BIT 14
+#else
 typedef unsigned long      mp_digit;
 typedef ulong64            mp_word;
 #define DIGIT_BIT 28
-   
+#endif
+
 #define MP_DIGIT_BIT     DIGIT_BIT
 #define MP_MASK          ((((mp_digit)1)<<((mp_digit)DIGIT_BIT))-((mp_digit)1))
@@ -217 +252 @@
 /* #define MP_LOW_MEM */
 
+#if defined(__WIN32OS2__) && (__IBMC__ < 400) && (__IBMCPP__ < 360) && !defined(__WATCOMC__) && !defined(__EMX__)
+#define MP_PREC                 128    /* default digits of precision */
+#else
 #define MP_PREC                 64     /* default digits of precision */
+#endif
 
 /* size of comba arrays, should be at least 2 * 2**(BITS_PER_WORD - BITS_PER_DIGIT*2) */
@@ -497 +536 @@
 
 /* This gives [for a given bit size] the number of trials required
- * such that Miller-Rabin gives a prob of failure lower than 2^-96 
+ * such that Miller-Rabin gives a prob of failure lower than 2^-96
  */
 int mp_prime_rabin_miller_trials(int size);
@@ -518 +557 @@
 
 /* makes a truly random prime of a given size (bytes),
- * call with bbs = 1 if you want it to be congruent to 3 mod 4 
+ * call with bbs = 1 if you want it to be congruent to 3 mod 4
  *
  * You have to supply a callback which fills in a buffer with random bytes.  "dat" is a parameter you can
@@ -531 +570 @@
  *
  * Flags are as follows:
- * 
+ *
  *   LTM_PRIME_BBS      - make prime congruent to 3 mod 4
  *   LTM_PRIME_SAFE     - make sure (p-1)/2 is prime as well (implies LTM_PRIME_BBS)