From 1fa48635eb1ab0e99ea03ff0c6b5d3ad9efe3f62 Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Wed, 23 Apr 2014 19:17:48 +0000
Subject: [PATCH] When I grow up, I want to write workaround for long long
 multiplications under __TANDEM systems and compilers, using hardcoded octal
 numbers. NOT.

---
 lib/libcrypto/bn/bn_mont.c         | 15 ---------------
 lib/libssl/src/crypto/bn/bn_mont.c | 15 ---------------
 2 files changed, 30 deletions(-)

diff --git a/lib/libcrypto/bn/bn_mont.c b/lib/libcrypto/bn/bn_mont.c
index 456a80bde61..6274a934bb5 100644
--- a/lib/libcrypto/bn/bn_mont.c
+++ b/lib/libcrypto/bn/bn_mont.c
@@ -207,22 +207,7 @@ static int BN_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont)
 #endif
 	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/lib/libssl/src/crypto/bn/bn_mont.c b/lib/libssl/src/crypto/bn/bn_mont.c
index 456a80bde61..6274a934bb5 100644
--- a/lib/libssl/src/crypto/bn/bn_mont.c
+++ b/lib/libssl/src/crypto/bn/bn_mont.c
@@ -207,22 +207,7 @@ static int BN_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont)
 #endif
 	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]);
-- 
2.20.1