Index: openssl/crypto/bn/bn_div.c |
=================================================================== |
--- openssl/crypto/bn/bn_div.c (revision 105093) |
+++ openssl/crypto/bn/bn_div.c (working copy) |
@@ -338,9 +338,6 @@ |
} |
#else /* !BN_LLONG */ |
BN_ULONG t2l,t2h; |
-#if !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH) |
- BN_ULONG ql,qh; |
-#endif |
q=bn_div_words(n0,n1,d0); |
#ifdef BN_DEBUG_LEVITTE |
@@ -358,9 +355,12 @@ |
t2l = d1 * q; |
t2h = BN_UMULT_HIGH(d1,q); |
#else |
+ { |
+ BN_ULONG ql, qh; |
t2l=LBITS(d1); t2h=HBITS(d1); |
ql =LBITS(q); qh =HBITS(q); |
mul64(t2l,t2h,ql,qh); /* t2=(BN_ULLONG)d1*q; */ |
+ } |
#endif |
for (;;) |
@@ -565,9 +565,6 @@ |
} |
#else /* !BN_LLONG */ |
BN_ULONG t2l,t2h; |
-#if !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH) |
- BN_ULONG ql,qh; |
-#endif |
q=bn_div_words(n0,n1,d0); |
#ifdef BN_DEBUG_LEVITTE |
@@ -585,9 +582,12 @@ |
t2l = d1 * q; |
t2h = BN_UMULT_HIGH(d1,q); |
#else |
+ { |
+ BN_ULONG ql, qh; |
t2l=LBITS(d1); t2h=HBITS(d1); |
ql =LBITS(q); qh =HBITS(q); |
mul64(t2l,t2h,ql,qh); /* t2=(BN_ULLONG)d1*q; */ |
+ } |
#endif |
for (;;) |