Rename bn_mul_words()/bn_mul_add_words().

Most bn_.*_words() functions operate on two word arrays, however
bn_mul_words() and bn_mul_add_words() operate on one word array and
multiply by a single word. Rename these to bn_mulw_words() and
bn_mulw_add_words() to reflect this, following naming scheme that we use
for primitives.

This frees up bn_mul_words() to actually be used for multiplying two word
arrays. Rename bn_mul_normal() to bn_mul_words(), which will then become
one of the possible assembly integration points.

ok tb@

3 files changed, 46 insertions, 46 deletions

diff --git a/src/lib/libcrypto/bn/asm/bn-586.pl b/src/lib/libcrypto/bn/asm/bn-586.pl
index 19a1afdbbe..7f550b3b7c 100644
--- a/src/lib/libcrypto/bn/asm/bn-586.pl
+++ b/src/lib/libcrypto/bn/asm/bn-586.pl
@@ -10,8 +10,8 @@ $sse2=1;
 
 &external_label("OPENSSL_ia32cap_P") if ($sse2);
 
-&bn_mul_add_words("bn_mul_add_words");
-&bn_mul_words("bn_mul_words");
+&bn_mulw_add_words("bn_mulw_add_words");
+&bn_mulw_words("bn_mulw_words");
 &bn_sqr_words("bn_sqr_words");
 &bn_div_words("bn_div_words");
 &bn_add_words("bn_add_words");
@@ -19,7 +19,7 @@ $sse2=1;
 
 &asm_finish();
 
-sub bn_mul_add_words
+sub bn_mulw_add_words
         {
         local($name)=@_;
 
@@ -206,7 +206,7 @@ sub bn_mul_add_words
         &function_end($name);
         }
 
-sub bn_mul_words
+sub bn_mulw_words
         {
         local($name)=@_;
 
diff --git a/src/lib/libcrypto/bn/asm/mips.pl b/src/lib/libcrypto/bn/asm/mips.pl
index 02d43e15b0..378af371e7 100644
--- a/src/lib/libcrypto/bn/asm/mips.pl
+++ b/src/lib/libcrypto/bn/asm/mips.pl
@@ -110,19 +110,19 @@ $code.=<<___;
 .set    noat
 
 .align  5
-.globl  bn_mul_add_words
-.ent    bn_mul_add_words
-bn_mul_add_words:
+.globl  bn_mulw_add_words
+.ent    bn_mulw_add_words
+bn_mulw_add_words:
         .set    noreorder
-        bgtz    $a2,bn_mul_add_words_internal
+        bgtz    $a2,bn_mulw_add_words_internal
         move    $v0,$zero
         jr      $ra
         move    $a0,$v0
-.end    bn_mul_add_words
+.end    bn_mulw_add_words
 
 .align  5
-.ent    bn_mul_add_words_internal
-bn_mul_add_words_internal:
+.ent    bn_mulw_add_words_internal
+bn_mulw_add_words_internal:
 ___
 $code.=<<___ if ($flavour =~ /nubi/i);
         .frame  $sp,6*$SZREG,$ra
@@ -140,9 +140,9 @@ $code.=<<___;
         .set    reorder
         li      $minus4,-4
         and     $ta0,$a2,$minus4
-        beqz    $ta0,.L_bn_mul_add_words_tail
+        beqz    $ta0,.L_bn_mulw_add_words_tail
 
-.L_bn_mul_add_words_loop:
+.L_bn_mulw_add_words_loop:
         $LD     $t0,0($a1)
         $MULTU  $t0,$a3
         $LD     $t1,0($a0)
@@ -201,13 +201,13 @@ $code.=<<___;
         sltu    $at,$ta3,$at
         $ST     $ta3,-$BNSZ($a0)
         .set    noreorder
-        bgtz    $ta0,.L_bn_mul_add_words_loop
+        bgtz    $ta0,.L_bn_mulw_add_words_loop
         $ADDU   $v0,$at
 
-        beqz    $a2,.L_bn_mul_add_words_return
+        beqz    $a2,.L_bn_mulw_add_words_return
         nop
 
-.L_bn_mul_add_words_tail:
+.L_bn_mulw_add_words_tail:
         .set    reorder
         $LD     $t0,0($a1)
         $MULTU  $t0,$a3
@@ -222,7 +222,7 @@ $code.=<<___;
         sltu    $at,$t1,$at
         $ST     $t1,0($a0)
         $ADDU   $v0,$at
-        beqz    $a2,.L_bn_mul_add_words_return
+        beqz    $a2,.L_bn_mulw_add_words_return
 
         $LD     $t0,$BNSZ($a1)
         $MULTU  $t0,$a3
@@ -237,7 +237,7 @@ $code.=<<___;
         sltu    $at,$t1,$at
         $ST     $t1,$BNSZ($a0)
         $ADDU   $v0,$at
-        beqz    $a2,.L_bn_mul_add_words_return
+        beqz    $a2,.L_bn_mulw_add_words_return
 
         $LD     $t0,2*$BNSZ($a1)
         $MULTU  $t0,$a3
@@ -252,7 +252,7 @@ $code.=<<___;
         $ST     $t1,2*$BNSZ($a0)
         $ADDU   $v0,$at
 
-.L_bn_mul_add_words_return:
+.L_bn_mulw_add_words_return:
         .set    noreorder
 ___
 $code.=<<___ if ($flavour =~ /nubi/i);
@@ -266,22 +266,22 @@ ___
 $code.=<<___;
         jr      $ra
         move    $a0,$v0
-.end    bn_mul_add_words_internal
+.end    bn_mulw_add_words_internal
 
 .align  5
-.globl  bn_mul_words
-.ent    bn_mul_words
-bn_mul_words:
+.globl  bn_mulw_words
+.ent    bn_mulw_words
+bn_mulw_words:
         .set    noreorder
-        bgtz    $a2,bn_mul_words_internal
+        bgtz    $a2,bn_mulw_words_internal
         move    $v0,$zero
         jr      $ra
         move    $a0,$v0
-.end    bn_mul_words
+.end    bn_mulw_words
 
 .align  5
-.ent    bn_mul_words_internal
-bn_mul_words_internal:
+.ent    bn_mulw_words_internal
+bn_mulw_words_internal:
 ___
 $code.=<<___ if ($flavour =~ /nubi/i);
         .frame  $sp,6*$SZREG,$ra
@@ -299,9 +299,9 @@ $code.=<<___;
         .set    reorder
         li      $minus4,-4
         and     $ta0,$a2,$minus4
-        beqz    $ta0,.L_bn_mul_words_tail
+        beqz    $ta0,.L_bn_mulw_words_tail
 
-.L_bn_mul_words_loop:
+.L_bn_mulw_words_loop:
         $LD     $t0,0($a1)
         $MULTU  $t0,$a3
         $LD     $t2,$BNSZ($a1)
@@ -341,13 +341,13 @@ $code.=<<___;
         sltu    $ta3,$v0,$at
         $ST     $v0,-$BNSZ($a0)
         .set    noreorder
-        bgtz    $ta0,.L_bn_mul_words_loop
+        bgtz    $ta0,.L_bn_mulw_words_loop
         $ADDU   $v0,$ta3,$ta2
 
-        beqz    $a2,.L_bn_mul_words_return
+        beqz    $a2,.L_bn_mulw_words_return
         nop
 
-.L_bn_mul_words_tail:
+.L_bn_mulw_words_tail:
         .set    reorder
         $LD     $t0,0($a1)
         $MULTU  $t0,$a3
@@ -358,7 +358,7 @@ $code.=<<___;
         sltu    $t1,$v0,$at
         $ST     $v0,0($a0)
         $ADDU   $v0,$t1,$t0
-        beqz    $a2,.L_bn_mul_words_return
+        beqz    $a2,.L_bn_mulw_words_return
 
         $LD     $t0,$BNSZ($a1)
         $MULTU  $t0,$a3
@@ -369,7 +369,7 @@ $code.=<<___;
         sltu    $t1,$v0,$at
         $ST     $v0,$BNSZ($a0)
         $ADDU   $v0,$t1,$t0
-        beqz    $a2,.L_bn_mul_words_return
+        beqz    $a2,.L_bn_mulw_words_return
 
         $LD     $t0,2*$BNSZ($a1)
         $MULTU  $t0,$a3
@@ -380,7 +380,7 @@ $code.=<<___;
         $ST     $v0,2*$BNSZ($a0)
         $ADDU   $v0,$t1,$t0
 
-.L_bn_mul_words_return:
+.L_bn_mulw_words_return:
         .set    noreorder
 ___
 $code.=<<___ if ($flavour =~ /nubi/i);
@@ -394,7 +394,7 @@ ___
 $code.=<<___;
         jr      $ra
         move    $a0,$v0
-.end    bn_mul_words_internal
+.end    bn_mulw_words_internal
 
 .align  5
 .globl  bn_sqr_words
diff --git a/src/lib/libcrypto/bn/asm/ppc.pl b/src/lib/libcrypto/bn/asm/ppc.pl
index c9b7f9477d..547baa111c 100644
--- a/src/lib/libcrypto/bn/asm/ppc.pl
+++ b/src/lib/libcrypto/bn/asm/ppc.pl
@@ -205,8 +205,8 @@ $data=<<EOF;
 #       bn_add_words
 #       bn_div_words
 #       bn_sqr_words
-#       bn_mul_words
-#       bn_mul_add_words
+#       bn_mulw_words
+#       bn_mulw_add_words
 #
 #       NOTE:   It is possible to optimize this code more for
 #       specific PowerPC or Power architectures. On the Northstar
@@ -249,8 +249,8 @@ $data=<<EOF;
         .globl  .bn_add_words
         .globl  .bn_div_words
         .globl  .bn_sqr_words
-        .globl  .bn_mul_words
-        .globl  .bn_mul_add_words
+        .globl  .bn_mulw_words
+        .globl  .bn_mulw_add_words
         
 # .text section
         
@@ -1740,15 +1740,15 @@ Lppcasm_sqr_adios:
 
 #
 #       NOTE:   The following label name should be changed to
-#               "bn_mul_words" i.e. remove the first dot
+#               "bn_mulw_words" i.e. remove the first dot
 #               for the gcc compiler. This should be automatically
 #               done in the build
 #
 
 .align  4       
-.bn_mul_words:
+.bn_mulw_words:
 #
-# BN_ULONG bn_mul_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w)
+# BN_ULONG bn_mulw_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w)
 #
 # r3 = rp
 # r4 = ap
@@ -1842,15 +1842,15 @@ Lppcasm_mw_OVER:
 
 #
 #       NOTE:   The following label name should be changed to
-#               "bn_mul_add_words" i.e. remove the first dot
+#               "bn_mulw_add_words" i.e. remove the first dot
 #               for the gcc compiler. This should be automatically
 #               done in the build
 #
 
 .align  4
-.bn_mul_add_words:
+.bn_mulw_add_words:
 #
-# BN_ULONG bn_mul_add_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w)
+# BN_ULONG bn_mulw_add_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w)
 #
 # r3 = rp
 # r4 = ap