openssl-engine-0.9.6a merge

3 files changed, 6 insertions, 6 deletions

diff --git a/src/lib/libcrypto/bn/asm/mips3.s b/src/lib/libcrypto/bn/asm/mips3.s
index 2df4dcd4b0..45786c00a5 100644
--- a/src/lib/libcrypto/bn/asm/mips3.s
+++ b/src/lib/libcrypto/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/src/lib/libcrypto/bn/asm/pa-risc2.s b/src/lib/libcrypto/bn/asm/pa-risc2.s
index 7239aa2c76..af9730d062 100644
--- a/src/lib/libcrypto/bn/asm/pa-risc2.s
+++ b/src/lib/libcrypto/bn/asm/pa-risc2.s
@@ -1611,7 +1611,7 @@ bn_mul_comba4
         .IMPORT $global$,DATA
         .SPACE  $TEXT$
         .SUBSPA $CODE$
-        .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=0x2c,SORT=16
+        .SUBSPA $LIT$,ACCESS=0x2c
 C$7
         .ALIGN  8
         .STRINGZ        "Division would overflow (%d)\n"
diff --git a/src/lib/libcrypto/bn/asm/pa-risc2W.s b/src/lib/libcrypto/bn/asm/pa-risc2W.s
index 54b6606252..a99545754d 100644
--- a/src/lib/libcrypto/bn/asm/pa-risc2W.s
+++ b/src/lib/libcrypto/bn/asm/pa-risc2W.s
@@ -1598,7 +1598,7 @@ bn_mul_comba4
         .IMPORT $global$,DATA
         .SPACE  $TEXT$
         .SUBSPA $CODE$
-        .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=0x2c,SORT=16
+        .SUBSPA $LIT$,ACCESS=0x2c
 C$4
         .ALIGN  8
         .STRINGZ        "Division would overflow (%d)\n"