RT3548: Remove some unsupported platforms.

This commit removes NCR, Tandem, Cray.
Regenerates TABLE.
Removes another missing BEOS fluff.
The last platform remaining on this ticket is WIN16.

Reviewed-by: Richard Levitte <levitte@openssl.org>

9 files changed, 6 insertions, 90 deletions

diff --git a/crypto/bf/blowfish.h b/crypto/bf/blowfish.h
index 50787eda09..1eda3745d6 100644
--- a/crypto/bf/blowfish.h
+++ b/crypto/bf/blowfish.h
@@ -81,16 +81,9 @@ extern "C" {
 
 #if defined(__LP32__)
 #define BF_LONG unsigned long
-#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
+#elif defined(__ILP64__)
 #define BF_LONG unsigned long
 #define BF_LONG_LOG2 3
-/*
- * _CRAY note. I could declare short, but I have no idea what impact
- * does it have on performance on none-T3E machines. I could declare
- * int, but at least on C90 sizeof(int) can be chosen at compile time.
- * So I've chosen long...
- *					<appro@fy.chalmers.se>
- */
 #else
 #define BF_LONG unsigned int
 #endif
diff --git a/crypto/bn/bn_mont.c b/crypto/bn/bn_mont.c
index 526b9cec5f..8710d781af 100644
--- a/crypto/bn/bn_mont.c
+++ b/crypto/bn/bn_mont.c
@@ -205,22 +205,7 @@ static int BN_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont)
 
 	for (carry=0, i=0; i<nl; i++, rp++)
 		{
-#ifdef __TANDEM
-                {
-                   long long t1;
-                   long long t2;
-                   long long t3;
-                   t1 = rp[0] * (n0 & 0177777);
-                   t2 = 037777600000l;
-                   t2 = n0 & t2;
-                   t3 = rp[0] & 0177777;
-                   t2 = (t3 * t2) & BN_MASK2;
-                   t1 = t1 + t2;
-                   v=bn_mul_add_words(rp,np,nl,(BN_ULONG) t1);
-                }
-#else
 		v=bn_mul_add_words(rp,np,nl,(rp[0]*n0)&BN_MASK2);
-#endif
 		v = (v+carry+rp[nl])&BN_MASK2;
 		carry |= (v != rp[nl]);
 		carry &= (v <= rp[nl]);
diff --git a/crypto/des/destest.c b/crypto/des/destest.c
index b5bcf8f74b..31e01561b4 100644
--- a/crypto/des/destest.c
+++ b/crypto/des/destest.c
@@ -341,14 +341,7 @@ int main(int argc, char *argv[])
 	unsigned char cbc_out[40];
 	DES_LONG cs;
 	unsigned char cret[8];
-#ifdef _CRAY
-        struct {
-            int a:32;
-            int b:32;
-        } lqret[2];
-#else
         DES_LONG lqret[4];
-#endif
 	int num;
 	char *str;
 
@@ -738,32 +731,6 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
 			(unsigned long)cs);
 		err=1;
 		}
-#ifdef _CRAY
-	if (lqret[0].a != 0x327eba8dL)
-		{
-		printf("quad_cksum error, out[0] %08lx is not %08lx\n",
-			(unsigned long)lqret[0].a,0x327eba8dUL);
-		err=1;
-		}
-	if (lqret[0].b != 0x201a49ccL)
-		{
-		printf("quad_cksum error, out[1] %08lx is not %08lx\n",
-			(unsigned long)lqret[0].b,0x201a49ccUL);
-		err=1;
-		}
-	if (lqret[1].a != 0x70d7a63aL)
-		{
-		printf("quad_cksum error, out[2] %08lx is not %08lx\n",
-			(unsigned long)lqret[1].a,0x70d7a63aUL);
-		err=1;
-		}
-	if (lqret[1].b != 0x501c2c26L)
-		{
-		printf("quad_cksum error, out[3] %08lx is not %08lx\n",
-			(unsigned long)lqret[1].b,0x501c2c26UL);
-		err=1;
-		}
-#else
 	if (lqret[0] != 0x327eba8dL)
 		{
 		printf("quad_cksum error, out[0] %08lx is not %08lx\n",
@@ -789,7 +756,6 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
 		err=1;
 		}
 #endif
-#endif
 
 	printf("input word alignment test");
 	for (i=0; i<4; i++)
diff --git a/crypto/des/qud_cksm.c b/crypto/des/qud_cksm.c
index dac201227e..c1e11e5fe1 100644
--- a/crypto/des/qud_cksm.c
+++ b/crypto/des/qud_cksm.c
@@ -80,18 +80,10 @@ DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[],
 	int i;
 	long l;
 	const unsigned char *cp;
-#ifdef _CRAY
-	struct lp_st { int a:32; int b:32; } *lp;
-#else
 	DES_LONG *lp;
-#endif
 
 	if (out_count < 1) out_count=1;
-#ifdef _CRAY
-	lp = (struct lp_st *) &(output[0])[0];
-#else
 	lp = (DES_LONG *) &(output[0])[0];
-#endif
 
 	z0=Q_B0((*seed)[0])|Q_B1((*seed)[1])|Q_B2((*seed)[2])|Q_B3((*seed)[3]);
 	z1=Q_B0((*seed)[4])|Q_B1((*seed)[5])|Q_B2((*seed)[6])|Q_B3((*seed)[7]);
@@ -124,14 +116,8 @@ DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[],
 			{
 			/* The MIT library assumes that the checksum is
 			 * composed of 2*out_count 32 bit ints */
-#ifdef _CRAY
-			(*lp).a = z0;
-			(*lp).b = z1;
-			lp++;
-#else
 			*lp++ = z0;
 			*lp++ = z1;
-#endif
 			}
 		}
 	return(z0);
diff --git a/crypto/md4/md4.h b/crypto/md4/md4.h
index 631c1b2ee0..d5b6307bff 100644
--- a/crypto/md4/md4.h
+++ b/crypto/md4/md4.h
@@ -79,16 +79,9 @@ extern "C" {
 
 #if defined(__LP32__)
 #define MD4_LONG unsigned long
-#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
+#elif defined(__ILP64__)
 #define MD4_LONG unsigned long
 #define MD4_LONG_LOG2 3
-/*
- * _CRAY note. I could declare short, but I have no idea what impact
- * does it have on performance on none-T3E machines. I could declare
- * int, but at least on C90 sizeof(int) can be chosen at compile time.
- * So I've chosen long...
- *					<appro@fy.chalmers.se>
- */
 #else
 #define MD4_LONG unsigned int
 #endif
diff --git a/crypto/md5/md5.h b/crypto/md5/md5.h
index 4cbf84386b..747bd929fd 100644
--- a/crypto/md5/md5.h
+++ b/crypto/md5/md5.h
@@ -79,16 +79,9 @@ extern "C" {
 
 #if defined(__LP32__)
 #define MD5_LONG unsigned long
-#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
+#elif defined(__ILP64__)
 #define MD5_LONG unsigned long
 #define MD5_LONG_LOG2 3
-/*
- * _CRAY note. I could declare short, but I have no idea what impact
- * does it have on performance on none-T3E machines. I could declare
- * int, but at least on C90 sizeof(int) can be chosen at compile time.
- * So I've chosen long...
- *					<appro@fy.chalmers.se>
- */
 #else
 #define MD5_LONG unsigned int
 #endif
diff --git a/crypto/ripemd/ripemd.h b/crypto/ripemd/ripemd.h
index 5942eb6180..f32cfae311 100644
--- a/crypto/ripemd/ripemd.h
+++ b/crypto/ripemd/ripemd.h
@@ -72,7 +72,7 @@ extern "C" {
 
 #if defined(__LP32__)
 #define RIPEMD160_LONG unsigned long
-#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
+#elif defined(__ILP64__)
 #define RIPEMD160_LONG unsigned long
 #define RIPEMD160_LONG_LOG2 3
 #else
diff --git a/crypto/sha/sha.h b/crypto/sha/sha.h
index c5dd6600dc..95d9b60072 100644
--- a/crypto/sha/sha.h
+++ b/crypto/sha/sha.h
@@ -79,7 +79,7 @@ extern "C" {
 
 #if defined(__LP32__)
 #define SHA_LONG unsigned long
-#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
+#elif defined(__ILP64__)
 #define SHA_LONG unsigned long
 #define SHA_LONG_LOG2 3
 #else
diff --git a/crypto/sha/sha512.c b/crypto/sha/sha512.c
index 5be98d3335..e0da0e1a4d 100644
--- a/crypto/sha/sha512.c
+++ b/crypto/sha/sha512.c
@@ -11,7 +11,7 @@
  *
  * As you might have noticed 32-bit hash algorithms:
  *
- * - permit SHA_LONG to be wider than 32-bit (case on CRAY);
+ * - permit SHA_LONG to be wider than 32-bit
  * - optimized versions implement two transform functions: one operating
  *   on [aligned] data in host byte order and one - on data in input
  *   stream byte order;