Merge openssl-0.9.7-stable-SNAP-20020519

2 files changed, 10 insertions, 4 deletions

diff --git a/src/lib/libcrypto/bn/bn.h b/src/lib/libcrypto/bn/bn.h
index d25b49c9d8..1eaf879553 100644
--- a/src/lib/libcrypto/bn/bn.h
+++ b/src/lib/libcrypto/bn/bn.h
@@ -136,7 +136,7 @@ extern "C" {
 #define BN_MASK2h       (0xffffffff00000000LL)
 #define BN_MASK2h1      (0xffffffff80000000LL)
 #define BN_TBIT         (0x8000000000000000LL)
-#define BN_DEC_CONV     (10000000000000000000LL)
+#define BN_DEC_CONV     (10000000000000000000ULL)
 #define BN_DEC_FMT1     "%llu"
 #define BN_DEC_FMT2     "%019llu"
 #define BN_DEC_NUM      19
diff --git a/src/lib/libcrypto/bn/bn_mul.c b/src/lib/libcrypto/bn/bn_mul.c
index 41ea925b8d..7bffc9c16a 100644
--- a/src/lib/libcrypto/bn/bn_mul.c
+++ b/src/lib/libcrypto/bn/bn_mul.c
@@ -408,16 +408,22 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
                 return;
                 }
 #  endif
-        if (n2 == 8)
+        /* Only call bn_mul_comba 8 if n2 == 8 and the
+         * two arrays are complete [steve]
+         */
+        if (n2 == 8 && dna == 0 && dnb == 0)
                 {
                 bn_mul_comba8(r,a,b);
                 return; 
                 }
 # endif /* BN_MUL_COMBA */
+        /* Else do normal multiply */
         if (n2 < BN_MUL_RECURSIVE_SIZE_NORMAL)
                 {
-                /* This should not happen */
-                bn_mul_normal(r,a,n2,b,n2);
+                bn_mul_normal(r,a,n2+dna,b,n2+dnb);
+                if ((dna + dnb) < 0)
+                        memset(&r[2*n2 + dna + dnb], 0,
+                                sizeof(BN_ULONG) * -(dna + dnb));
                 return;
                 }
         /* r=(a[0]-a[1])*(b[1]-b[0]) */