Merge in recent changes from 0.9.6-stable

diff --git a/crypto/bn/asm/mips3.s b/crypto/bn/asm/mips3.s
index 2df4dcd4b0bf71409e77a09f5b2aea33aadee8c4..45786c00a5f33967c81e09e6f4571e0fbd976c20 100644 (file)
--- a/crypto/bn/asm/mips3.s
+++ b/crypto/bn/asm/mips3.s
@@ -586,13 +586,13 @@ LEAF(bn_div_3_words)
        ld      a0,(a3)
        move    ta2,a1
        ld      a1,-8(a3)
-       move    ta3,ra
-       move    v1,zero
+       bne     a0,a2,.L_bn_div_3_words_proceed
        li      v0,-1
-       beq     a0,a2,.L_bn_div_3_words_skip_div
+       jr      ra
+.L_bn_div_3_words_proceed:
+       move    ta3,ra
        bal     bn_div_words
        move    ra,ta3
-.L_bn_div_3_words_skip_div:
        dmultu  ta2,v0
        ld      t2,-16(a3)
        move    ta0,zero

diff --git a/crypto/bn/bn_div.c b/crypto/bn/bn_div.c
index 891b6026311c64e253cd7f4cf167b7dcef19601c..c328b5b4110b47d2e132e71c487e9bee9ccdf749 100644 (file)
--- a/crypto/bn/bn_div.c
+++ b/crypto/bn/bn_div.c
@@ -238,6 +238,7 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
                {
                BN_ULONG q,l0;
 #if defined(BN_DIV3W) && !defined(NO_ASM)
+               BN_ULONG bn_div_3_words(BN_ULONG*,BN_ULONG,BN_ULONG);
                q=bn_div_3_words(wnump,d1,d0);
 #else
                BN_ULONG n0,n1,rem=0;