Commit e078642d authored by Andy Polyakov's avatar Andy Polyakov Committed by Matt Caswell
Browse files

Fix for CVE-2014-3570. 



Reviewed-by: default avatarEmilia Kasper <emilia@openssl.org>
(cherry picked from commit e793809ba50c1e90ab592fb640a856168e50f3de)
(with 1.0.1-specific addendum)
parent ffd14272

crypto/bn/asm/mips.pl

+131 −480
Original line number Diff line number Diff line
@@ -1872,6 +1872,41 @@ ___ 


($a_4,$a_5,$a_6,$a_7)=($b_0,$b_1,$b_2,$b_3);



sub add_c2 () {

my ($hi,$lo,$c0,$c1,$c2,

    $warm,      # !$warm denotes first call with specific sequence of

                # $c_[XYZ] when there is no Z-carry to accumulate yet;

    $an,$bn     # these two are arguments for multiplication which

                # result is used in *next* step [which is why it's

                # commented as "forward multiplication" below];

    )=@_;

$code.=<<___;

	mflo	$lo

	mfhi	$hi

	$ADDU	$c0,$lo

	sltu	$at,$c0,$lo

	 $MULTU	$an,$bn			# forward multiplication

	$ADDU	$c0,$lo

	$ADDU	$at,$hi

	sltu	$lo,$c0,$lo

	$ADDU	$c1,$at

	$ADDU	$hi,$lo

___

$code.=<<___	if (!$warm);

	sltu	$c2,$c1,$at

	$ADDU	$c1,$hi

	sltu	$hi,$c1,$hi

	$ADDU	$c2,$hi

___

$code.=<<___	if ($warm);

	sltu	$at,$c1,$at

	$ADDU	$c1,$hi

	$ADDU	$c2,$at

	sltu	$hi,$c1,$hi

	$ADDU	$c2,$hi

___

}



$code.=<<___;



.align	5
@@ -1920,21 +1955,10 @@ $code.=<<___; 
	sltu	$at,$c_2,$t_1

	$ADDU	$c_3,$t_2,$at

	$ST	$c_2,$BNSZ($a0)



	mflo	$t_1

	mfhi	$t_2

	slt	$c_2,$t_2,$zero

	$SLL	$t_2,1

	$MULTU	$a_1,$a_1		# mul_add_c(a[1],b[1],c3,c1,c2);

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_3,$t_1

	sltu	$at,$c_3,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_1,$t_2

	sltu	$at,$c_1,$t_2

	$ADDU	$c_2,$at

___

	&add_c2($t_2,$t_1,$c_3,$c_1,$c_2,0,

		$a_1,$a_1);		# mul_add_c(a[1],b[1],c3,c1,c2);

$code.=<<___;

	mflo	$t_1

	mfhi	$t_2

	$ADDU	$c_3,$t_1
@@ -1945,67 +1969,19 @@ $code.=<<___; 
	sltu	$at,$c_1,$t_2

	$ADDU	$c_2,$at

	$ST	$c_3,2*$BNSZ($a0)



	mflo	$t_1

	mfhi	$t_2

	slt	$c_3,$t_2,$zero

	$SLL	$t_2,1

	$MULTU	$a_1,$a_2		# mul_add_c2(a[1],b[2],c1,c2,c3);

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_1,$t_1

	sltu	$at,$c_1,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_2,$t_2

	sltu	$at,$c_2,$t_2

	$ADDU	$c_3,$at

	mflo	$t_1

	mfhi	$t_2

	slt	$at,$t_2,$zero

	$ADDU	$c_3,$at

	 $MULTU	$a_4,$a_0		# mul_add_c2(a[4],b[0],c2,c3,c1);

	$SLL	$t_2,1

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_1,$t_1

	sltu	$at,$c_1,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_2,$t_2

	sltu	$at,$c_2,$t_2

	$ADDU	$c_3,$at

___

	&add_c2($t_2,$t_1,$c_1,$c_2,$c_3,0,

		$a_1,$a_2);		# mul_add_c2(a[1],b[2],c1,c2,c3);

	&add_c2($t_2,$t_1,$c_1,$c_2,$c_3,1,

		$a_4,$a_0);		# mul_add_c2(a[4],b[0],c2,c3,c1);

$code.=<<___;

	$ST	$c_1,3*$BNSZ($a0)



	mflo	$t_1

	mfhi	$t_2

	slt	$c_1,$t_2,$zero

	$SLL	$t_2,1

	$MULTU	$a_3,$a_1		# mul_add_c2(a[3],b[1],c2,c3,c1);

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_2,$t_1

	sltu	$at,$c_2,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_3,$t_2

	sltu	$at,$c_3,$t_2

	$ADDU	$c_1,$at

	mflo	$t_1

	mfhi	$t_2

	slt	$at,$t_2,$zero

	$ADDU	$c_1,$at

	$MULTU	$a_2,$a_2		# mul_add_c(a[2],b[2],c2,c3,c1);

	$SLL	$t_2,1

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_2,$t_1

	sltu	$at,$c_2,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_3,$t_2

	sltu	$at,$c_3,$t_2

	$ADDU	$c_1,$at

___

	&add_c2($t_2,$t_1,$c_2,$c_3,$c_1,0,

		$a_3,$a_1);		# mul_add_c2(a[3],b[1],c2,c3,c1);

	&add_c2($t_2,$t_1,$c_2,$c_3,$c_1,1,

		$a_2,$a_2);		# mul_add_c(a[2],b[2],c2,c3,c1);

$code.=<<___;

	mflo	$t_1

	mfhi	$t_2

	$ADDU	$c_2,$t_1
@@ -2016,97 +1992,23 @@ $code.=<<___; 
	sltu	$at,$c_3,$t_2

	$ADDU	$c_1,$at

	$ST	$c_2,4*$BNSZ($a0)



	mflo	$t_1

	mfhi	$t_2

	slt	$c_2,$t_2,$zero

	$SLL	$t_2,1

	$MULTU	$a_1,$a_4		# mul_add_c2(a[1],b[4],c3,c1,c2);

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_3,$t_1

	sltu	$at,$c_3,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_1,$t_2

	sltu	$at,$c_1,$t_2

	$ADDU	$c_2,$at

	mflo	$t_1

	mfhi	$t_2

	slt	$at,$t_2,$zero

	$ADDU	$c_2,$at

	$MULTU	$a_2,$a_3		# mul_add_c2(a[2],b[3],c3,c1,c2);

	$SLL	$t_2,1

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_3,$t_1

	sltu	$at,$c_3,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_1,$t_2

	sltu	$at,$c_1,$t_2

	$ADDU	$c_2,$at

	mflo	$t_1

	mfhi	$t_2

	slt	$at,$t_2,$zero

	 $MULTU	$a_6,$a_0		# mul_add_c2(a[6],b[0],c1,c2,c3);

	$ADDU	$c_2,$at

	$SLL	$t_2,1

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_3,$t_1

	sltu	$at,$c_3,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_1,$t_2

	sltu	$at,$c_1,$t_2

	$ADDU	$c_2,$at

___

	&add_c2($t_2,$t_1,$c_3,$c_1,$c_2,0,

		$a_1,$a_4);		# mul_add_c2(a[1],b[4],c3,c1,c2);

	&add_c2($t_2,$t_1,$c_3,$c_1,$c_2,1,

		$a_2,$a_3);		# mul_add_c2(a[2],b[3],c3,c1,c2);

	&add_c2($t_2,$t_1,$c_3,$c_1,$c_2,1,

		$a_6,$a_0);		# mul_add_c2(a[6],b[0],c1,c2,c3);

$code.=<<___;

	$ST	$c_3,5*$BNSZ($a0)



	mflo	$t_1

	mfhi	$t_2

	slt	$c_3,$t_2,$zero

	$SLL	$t_2,1

	$MULTU	$a_5,$a_1		# mul_add_c2(a[5],b[1],c1,c2,c3);

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_1,$t_1

	sltu	$at,$c_1,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_2,$t_2

	sltu	$at,$c_2,$t_2

	$ADDU	$c_3,$at

	mflo	$t_1

	mfhi	$t_2

	slt	$at,$t_2,$zero

	$ADDU	$c_3,$at

	$MULTU	$a_4,$a_2		# mul_add_c2(a[4],b[2],c1,c2,c3);

	$SLL	$t_2,1

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_1,$t_1

	sltu	$at,$c_1,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_2,$t_2

	sltu	$at,$c_2,$t_2

	$ADDU	$c_3,$at

	mflo	$t_1

	mfhi	$t_2

	slt	$at,$t_2,$zero

	$ADDU	$c_3,$at

	$MULTU	$a_3,$a_3		# mul_add_c(a[3],b[3],c1,c2,c3);

	$SLL	$t_2,1

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_1,$t_1

	sltu	$at,$c_1,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_2,$t_2

	sltu	$at,$c_2,$t_2

	$ADDU	$c_3,$at

___

	&add_c2($t_2,$t_1,$c_1,$c_2,$c_3,0,

		$a_5,$a_1);		# mul_add_c2(a[5],b[1],c1,c2,c3);

	&add_c2($t_2,$t_1,$c_1,$c_2,$c_3,1,

		$a_4,$a_2);		# mul_add_c2(a[4],b[2],c1,c2,c3);

	&add_c2($t_2,$t_1,$c_1,$c_2,$c_3,1,

		$a_3,$a_3);		# mul_add_c(a[3],b[3],c1,c2,c3);

$code.=<<___;

	mflo	$t_1

	mfhi	$t_2

	$ADDU	$c_1,$t_1
@@ -2117,112 +2019,25 @@ $code.=<<___; 
	sltu	$at,$c_2,$t_2

	$ADDU	$c_3,$at

	$ST	$c_1,6*$BNSZ($a0)



	mflo	$t_1

	mfhi	$t_2

	slt	$c_1,$t_2,$zero

	$SLL	$t_2,1

	$MULTU	$a_1,$a_6		# mul_add_c2(a[1],b[6],c2,c3,c1);

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_2,$t_1

	sltu	$at,$c_2,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_3,$t_2

	sltu	$at,$c_3,$t_2

	$ADDU	$c_1,$at

	mflo	$t_1

	mfhi	$t_2

	slt	$at,$t_2,$zero

	$ADDU	$c_1,$at

	$MULTU	$a_2,$a_5		# mul_add_c2(a[2],b[5],c2,c3,c1);

	$SLL	$t_2,1

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_2,$t_1

	sltu	$at,$c_2,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_3,$t_2

	sltu	$at,$c_3,$t_2

	$ADDU	$c_1,$at

	mflo	$t_1

	mfhi	$t_2

	slt	$at,$t_2,$zero

	$ADDU	$c_1,$at

	$MULTU	$a_3,$a_4		# mul_add_c2(a[3],b[4],c2,c3,c1);

	$SLL	$t_2,1

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_2,$t_1

	sltu	$at,$c_2,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_3,$t_2

	sltu	$at,$c_3,$t_2

	$ADDU	$c_1,$at

	mflo	$t_1

	mfhi	$t_2

	slt	$at,$t_2,$zero

	$ADDU	$c_1,$at

	 $MULTU	$a_7,$a_1		# mul_add_c2(a[7],b[1],c3,c1,c2);

	$SLL	$t_2,1

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_2,$t_1

	sltu	$at,$c_2,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_3,$t_2

	sltu	$at,$c_3,$t_2

	$ADDU	$c_1,$at

___

	&add_c2($t_2,$t_1,$c_2,$c_3,$c_1,0,

		$a_1,$a_6);		# mul_add_c2(a[1],b[6],c2,c3,c1);

	&add_c2($t_2,$t_1,$c_2,$c_3,$c_1,1,

		$a_2,$a_5);		# mul_add_c2(a[2],b[5],c2,c3,c1);

	&add_c2($t_2,$t_1,$c_2,$c_3,$c_1,1,

		$a_3,$a_4);		# mul_add_c2(a[3],b[4],c2,c3,c1);

	&add_c2($t_2,$t_1,$c_2,$c_3,$c_1,1,

		$a_7,$a_1);		# mul_add_c2(a[7],b[1],c3,c1,c2);

$code.=<<___;

	$ST	$c_2,7*$BNSZ($a0)



	mflo	$t_1

	mfhi	$t_2

	slt	$c_2,$t_2,$zero

	$SLL	$t_2,1

	$MULTU	$a_6,$a_2		# mul_add_c2(a[6],b[2],c3,c1,c2);

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_3,$t_1

	sltu	$at,$c_3,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_1,$t_2

	sltu	$at,$c_1,$t_2

	$ADDU	$c_2,$at

	mflo	$t_1

	mfhi	$t_2

	slt	$at,$t_2,$zero

	$ADDU	$c_2,$at

	$MULTU	$a_5,$a_3		# mul_add_c2(a[5],b[3],c3,c1,c2);

	$SLL	$t_2,1

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_3,$t_1

	sltu	$at,$c_3,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_1,$t_2

	sltu	$at,$c_1,$t_2

	$ADDU	$c_2,$at

	mflo	$t_1

	mfhi	$t_2

	slt	$at,$t_2,$zero

	$ADDU	$c_2,$at

	$MULTU	$a_4,$a_4		# mul_add_c(a[4],b[4],c3,c1,c2);

	$SLL	$t_2,1

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_3,$t_1

	sltu	$at,$c_3,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_1,$t_2

	sltu	$at,$c_1,$t_2

	$ADDU	$c_2,$at

___

	&add_c2($t_2,$t_1,$c_3,$c_1,$c_2,0,

		$a_6,$a_2);		# mul_add_c2(a[6],b[2],c3,c1,c2);

	&add_c2($t_2,$t_1,$c_3,$c_1,$c_2,1,

		$a_5,$a_3);		# mul_add_c2(a[5],b[3],c3,c1,c2);

	&add_c2($t_2,$t_1,$c_3,$c_1,$c_2,1,

		$a_4,$a_4);		# mul_add_c(a[4],b[4],c3,c1,c2);

$code.=<<___;

	mflo	$t_1

	mfhi	$t_2

	$ADDU	$c_3,$t_1
@@ -2233,82 +2048,21 @@ $code.=<<___; 
	sltu	$at,$c_1,$t_2

	$ADDU	$c_2,$at

	$ST	$c_3,8*$BNSZ($a0)



	mflo	$t_1

	mfhi	$t_2

	slt	$c_3,$t_2,$zero

	$SLL	$t_2,1

	$MULTU	$a_3,$a_6		# mul_add_c2(a[3],b[6],c1,c2,c3);

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_1,$t_1

	sltu	$at,$c_1,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_2,$t_2

	sltu	$at,$c_2,$t_2

	$ADDU	$c_3,$at

	mflo	$t_1

	mfhi	$t_2

	slt	$at,$t_2,$zero

	$ADDU	$c_3,$at

	$MULTU	$a_4,$a_5		# mul_add_c2(a[4],b[5],c1,c2,c3);

	$SLL	$t_2,1

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_1,$t_1

	sltu	$at,$c_1,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_2,$t_2

	sltu	$at,$c_2,$t_2

	$ADDU	$c_3,$at

	mflo	$t_1

	mfhi	$t_2

	slt	$at,$t_2,$zero

	$ADDU	$c_3,$at

	 $MULTU	$a_7,$a_3		# mul_add_c2(a[7],b[3],c2,c3,c1);

	$SLL	$t_2,1

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_1,$t_1

	sltu	$at,$c_1,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_2,$t_2

	sltu	$at,$c_2,$t_2

	$ADDU	$c_3,$at

___

	&add_c2($t_2,$t_1,$c_1,$c_2,$c_3,0,

		$a_3,$a_6);		# mul_add_c2(a[3],b[6],c1,c2,c3);

	&add_c2($t_2,$t_1,$c_1,$c_2,$c_3,1,

		$a_4,$a_5);		# mul_add_c2(a[4],b[5],c1,c2,c3);

	&add_c2($t_2,$t_1,$c_1,$c_2,$c_3,1,

		$a_7,$a_3);		# mul_add_c2(a[7],b[3],c2,c3,c1);

$code.=<<___;

	$ST	$c_1,9*$BNSZ($a0)



	mflo	$t_1

	mfhi	$t_2

	slt	$c_1,$t_2,$zero

	$SLL	$t_2,1

	$MULTU	$a_6,$a_4		# mul_add_c2(a[6],b[4],c2,c3,c1);

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_2,$t_1

	sltu	$at,$c_2,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_3,$t_2

	sltu	$at,$c_3,$t_2

	$ADDU	$c_1,$at

	mflo	$t_1

	mfhi	$t_2

	slt	$at,$t_2,$zero

	$ADDU	$c_1,$at

	$MULTU	$a_5,$a_5		# mul_add_c(a[5],b[5],c2,c3,c1);

	$SLL	$t_2,1

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_2,$t_1

	sltu	$at,$c_2,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_3,$t_2

	sltu	$at,$c_3,$t_2

	$ADDU	$c_1,$at

___

	&add_c2($t_2,$t_1,$c_2,$c_3,$c_1,0,

		$a_6,$a_4);		# mul_add_c2(a[6],b[4],c2,c3,c1);

	&add_c2($t_2,$t_1,$c_2,$c_3,$c_1,1,

		$a_5,$a_5);		# mul_add_c(a[5],b[5],c2,c3,c1);

$code.=<<___;

	mflo	$t_1

	mfhi	$t_2

	$ADDU	$c_2,$t_1
@@ -2319,52 +2073,17 @@ $code.=<<___; 
	sltu	$at,$c_3,$t_2

	$ADDU	$c_1,$at

	$ST	$c_2,10*$BNSZ($a0)



	mflo	$t_1

	mfhi	$t_2

	slt	$c_2,$t_2,$zero

	$SLL	$t_2,1

	$MULTU	$a_5,$a_6		# mul_add_c2(a[5],b[6],c3,c1,c2);

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_3,$t_1

	sltu	$at,$c_3,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_1,$t_2

	sltu	$at,$c_1,$t_2

	$ADDU	$c_2,$at

	mflo	$t_1

	mfhi	$t_2

	slt	$at,$t_2,$zero

	$ADDU	$c_2,$at

	 $MULTU	$a_7,$a_5		# mul_add_c2(a[7],b[5],c1,c2,c3);

	$SLL	$t_2,1

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_3,$t_1

	sltu	$at,$c_3,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_1,$t_2

	sltu	$at,$c_1,$t_2

	$ADDU	$c_2,$at

___

	&add_c2($t_2,$t_1,$c_3,$c_1,$c_2,0,

		$a_5,$a_6);		# mul_add_c2(a[5],b[6],c3,c1,c2);

	&add_c2($t_2,$t_1,$c_3,$c_1,$c_2,1,

		$a_7,$a_5);		# mul_add_c2(a[7],b[5],c1,c2,c3);

$code.=<<___;

	$ST	$c_3,11*$BNSZ($a0)



	mflo	$t_1

	mfhi	$t_2

	slt	$c_3,$t_2,$zero

	$SLL	$t_2,1

	$MULTU	$a_6,$a_6		# mul_add_c(a[6],b[6],c1,c2,c3);

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_1,$t_1

	sltu	$at,$c_1,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_2,$t_2

	sltu	$at,$c_2,$t_2

	$ADDU	$c_3,$at

___

	&add_c2($t_2,$t_1,$c_1,$c_2,$c_3,0,

		$a_6,$a_6);		# mul_add_c(a[6],b[6],c1,c2,c3);

$code.=<<___;

	mflo	$t_1

	mfhi	$t_2

	$ADDU	$c_1,$t_1
@@ -2375,21 +2094,10 @@ $code.=<<___; 
	sltu	$at,$c_2,$t_2

	$ADDU	$c_3,$at

	$ST	$c_1,12*$BNSZ($a0)



	mflo	$t_1

	mfhi	$t_2

	slt	$c_1,$t_2,$zero

	$SLL	$t_2,1

	 $MULTU	$a_7,$a_7		# mul_add_c(a[7],b[7],c3,c1,c2);

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_2,$t_1

	sltu	$at,$c_2,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_3,$t_2

	sltu	$at,$c_3,$t_2

	$ADDU	$c_1,$at

___

	&add_c2($t_2,$t_1,$c_2,$c_3,$c_1,0,

		$a_7,$a_7);		# mul_add_c(a[7],b[7],c3,c1,c2);

$code.=<<___;

	$ST	$c_2,13*$BNSZ($a0)



	mflo	$t_1
@@ -2457,21 +2165,10 @@ $code.=<<___; 
	sltu	$at,$c_2,$t_1

	$ADDU	$c_3,$t_2,$at

	$ST	$c_2,$BNSZ($a0)



	mflo	$t_1

	mfhi	$t_2

	slt	$c_2,$t_2,$zero

	$SLL	$t_2,1

	$MULTU	$a_1,$a_1		# mul_add_c(a[1],b[1],c3,c1,c2);

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_3,$t_1

	sltu	$at,$c_3,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_1,$t_2

	sltu	$at,$c_1,$t_2

	$ADDU	$c_2,$at

___

	&add_c2($t_2,$t_1,$c_3,$c_1,$c_2,0,

		$a_1,$a_1);		# mul_add_c(a[1],b[1],c3,c1,c2);

$code.=<<___;

	mflo	$t_1

	mfhi	$t_2

	$ADDU	$c_3,$t_1
@@ -2482,52 +2179,17 @@ $code.=<<___; 
	sltu	$at,$c_1,$t_2

	$ADDU	$c_2,$at

	$ST	$c_3,2*$BNSZ($a0)



	mflo	$t_1

	mfhi	$t_2

	slt	$c_3,$t_2,$zero

	$SLL	$t_2,1

	$MULTU	$a_1,$a_2		# mul_add_c(a2[1],b[2],c1,c2,c3);

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_1,$t_1

	sltu	$at,$c_1,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_2,$t_2

	sltu	$at,$c_2,$t_2

	$ADDU	$c_3,$at

	mflo	$t_1

	mfhi	$t_2

	slt	$at,$t_2,$zero

	$ADDU	$c_3,$at

	 $MULTU	$a_3,$a_1		# mul_add_c2(a[3],b[1],c2,c3,c1);

	$SLL	$t_2,1

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_1,$t_1

	sltu	$at,$c_1,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_2,$t_2

	sltu	$at,$c_2,$t_2

	$ADDU	$c_3,$at

___

	&add_c2($t_2,$t_1,$c_1,$c_2,$c_3,0,

		$a_1,$a_2);		# mul_add_c2(a2[1],b[2],c1,c2,c3);

	&add_c2($t_2,$t_1,$c_1,$c_2,$c_3,1,

		$a_3,$a_1);		# mul_add_c2(a[3],b[1],c2,c3,c1);

$code.=<<___;

	$ST	$c_1,3*$BNSZ($a0)



	mflo	$t_1

	mfhi	$t_2

	slt	$c_1,$t_2,$zero

	$SLL	$t_2,1

	$MULTU	$a_2,$a_2		# mul_add_c(a[2],b[2],c2,c3,c1);

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_2,$t_1

	sltu	$at,$c_2,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_3,$t_2

	sltu	$at,$c_3,$t_2

	$ADDU	$c_1,$at

___

	&add_c2($t_2,$t_1,$c_2,$c_3,$c_1,0,

		$a_2,$a_2);		# mul_add_c(a[2],b[2],c2,c3,c1);

$code.=<<___;

	mflo	$t_1

	mfhi	$t_2

	$ADDU	$c_2,$t_1
@@ -2538,21 +2200,10 @@ $code.=<<___; 
	sltu	$at,$c_3,$t_2

	$ADDU	$c_1,$at

	$ST	$c_2,4*$BNSZ($a0)



	mflo	$t_1

	mfhi	$t_2

	slt	$c_2,$t_2,$zero

	$SLL	$t_2,1

	 $MULTU	$a_3,$a_3		# mul_add_c(a[3],b[3],c1,c2,c3);

	slt	$a2,$t_1,$zero

	$ADDU	$t_2,$a2

	$SLL	$t_1,1

	$ADDU	$c_3,$t_1

	sltu	$at,$c_3,$t_1

	$ADDU	$t_2,$at

	$ADDU	$c_1,$t_2

	sltu	$at,$c_1,$t_2

	$ADDU	$c_2,$at

___

	&add_c2($t_2,$t_1,$c_3,$c_1,$c_2,0,

		$a_3,$a_3);		# mul_add_c(a[3],b[3],c1,c2,c3);

$code.=<<___;

	$ST	$c_3,5*$BNSZ($a0)



	mflo	$t_1

crypto/bn/asm/mips3.s

deleted100644 → 0
+0 −2201

File deleted.

Preview size limit exceeded, changes collapsed.

crypto/bn/asm/x86_64-gcc.c

+15 −19
Original line number Diff line number Diff line
@@ -273,6 +273,10 @@ BN_ULONG bn_sub_words(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n) 
/* sqr_add_c(a,i,c0,c1,c2)  -- c+=a[i]^2 for three word number c=(c2,c1,c0) */

/* sqr_add_c2(a,i,c0,c1,c2) -- c+=2*a[i]*a[j] for three word number c=(c2,c1,c0) */



/*

 * Keep in mind that carrying into high part of multiplication result

 * can not overflow, because it cannot be all-ones.

 */

#if 0

/* original macros are kept for reference purposes */

#define mul_add_c(a,b,c0,c1,c2) {	\
@@ -287,10 +291,10 @@ BN_ULONG bn_sub_words(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n) 
	BN_ULONG ta=(a),tb=(b),t0;	\

	t1 = BN_UMULT_HIGH(ta,tb);	\

	t0 = ta * tb;			\

	t2 = t1+t1; c2 += (t2<t1)?1:0;	\

	t1 = t0+t0; t2 += (t1<t0)?1:0;	\

	c0 += t1; t2 += (c0<t1)?1:0;	\

	c0 += t0; t2 = t1+((c0<t0)?1:0);\

	c1 += t2; c2 += (c1<t2)?1:0;	\

	c0 += t0; t1 += (c0<t0)?1:0;	\

	c1 += t1; c2 += (c1<t1)?1:0;	\

	}

#else

#define mul_add_c(a,b,c0,c1,c2)	do {	\
@@ -328,21 +332,13 @@ BN_ULONG bn_sub_words(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n) 
		: "=a"(t1),"=d"(t2)	\

		: "a"(a),"m"(b)		\

		: "cc");		\

	asm ("addq %0,%0; adcq %2,%1"	\

		: "+d"(t2),"+r"(c2)	\

		: "g"(0)		\

	asm ("addq %3,%0; adcq %4,%1; adcq %5,%2"	\

		: "+r"(c0),"+r"(c1),"+r"(c2)		\

		: "r"(t1),"r"(t2),"g"(0)		\

		: "cc");				\

	asm ("addq %0,%0; adcq %2,%1"	\

		: "+a"(t1),"+d"(t2)	\

		: "g"(0)		\

		: "cc");		\

	asm ("addq %2,%0; adcq %3,%1"	\

		: "+r"(c0),"+d"(t2)	\

		: "a"(t1),"g"(0)	\

		: "cc");		\

	asm ("addq %2,%0; adcq %3,%1"	\

		: "+r"(c1),"+r"(c2)	\

		: "d"(t2),"g"(0)	\

	asm ("addq %3,%0; adcq %4,%1; adcq %5,%2"	\

		: "+r"(c0),"+r"(c1),"+r"(c2)		\

		: "r"(t1),"r"(t2),"g"(0)		\

		: "cc");				\

	} while (0)

#endif

crypto/bn/bn_asm.c

+10 −6
Original line number Diff line number Diff line
@@ -438,6 +438,10 @@ BN_ULONG bn_sub_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b, int n) 
/* sqr_add_c(a,i,c0,c1,c2)  -- c+=a[i]^2 for three word number c=(c2,c1,c0) */

/* sqr_add_c2(a,i,c0,c1,c2) -- c+=2*a[i]*a[j] for three word number c=(c2,c1,c0) */



/*

 * Keep in mind that carrying into high part of multiplication result

 * can not overflow, because it cannot be all-ones.

 */

#ifdef BN_LLONG

#define mul_add_c(a,b,c0,c1,c2) \

	t=(BN_ULLONG)a*b; \
@@ -478,10 +482,10 @@ BN_ULONG bn_sub_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b, int n) 
#define mul_add_c2(a,b,c0,c1,c2) {	\

	BN_ULONG ta=(a),tb=(b),t0;	\

	BN_UMULT_LOHI(t0,t1,ta,tb);	\

	t2 = t1+t1; c2 += (t2<t1)?1:0;	\

	t1 = t0+t0; t2 += (t1<t0)?1:0;	\

	c0 += t1; t2 += (c0<t1)?1:0;	\

	c0 += t0; t2 = t1+((c0<t0)?1:0);\

	c1 += t2; c2 += (c1<t2)?1:0;	\

	c0 += t0; t1 += (c0<t0)?1:0;	\

	c1 += t1; c2 += (c1<t1)?1:0;	\

	}



#define sqr_add_c(a,i,c0,c1,c2)	{	\
@@ -508,10 +512,10 @@ BN_ULONG bn_sub_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b, int n) 
	BN_ULONG ta=(a),tb=(b),t0;	\

	t1 = BN_UMULT_HIGH(ta,tb);	\

	t0 = ta * tb;			\

	t2 = t1+t1; c2 += (t2<t1)?1:0;	\

	t1 = t0+t0; t2 += (t1<t0)?1:0;	\

	c0 += t1; t2 += (c0<t1)?1:0;	\

	c0 += t0; t2 = t1+((c0<t0)?1:0);\

	c1 += t2; c2 += (c1<t2)?1:0;	\

	c0 += t0; t1 += (c0<t0)?1:0;	\

	c1 += t1; c2 += (c1<t1)?1:0;	\

	}



#define sqr_add_c(a,i,c0,c1,c2)	{	\

crypto/bn/bntest.c

+78 −24
Original line number Diff line number Diff line
@@ -678,44 +678,98 @@ int test_mul(BIO *bp) 


int test_sqr(BIO *bp, BN_CTX *ctx)

	{

	BIGNUM a,c,d,e;

	int i;

	BIGNUM *a,*c,*d,*e;

	int i, ret = 0;



	BN_init(&a);

	BN_init(&c);

	BN_init(&d);

	BN_init(&e);

	a = BN_new();

	c = BN_new();

	d = BN_new();

	e = BN_new();

	if (a == NULL || c == NULL || d == NULL || e == NULL)

		{

		goto err;

		}



	for (i=0; i<num0; i++)

		{

		BN_bntest_rand(&a,40+i*10,0,0);

		a.neg=rand_neg();

		BN_sqr(&c,&a,ctx);

		BN_bntest_rand(a,40+i*10,0,0);

		a->neg=rand_neg();

		BN_sqr(c,a,ctx);

		if (bp != NULL)

			{

			if (!results)

				{

				BN_print(bp,&a);

				BN_print(bp,a);

				BIO_puts(bp," * ");

				BN_print(bp,&a);

				BN_print(bp,a);

				BIO_puts(bp," - ");

				}

			BN_print(bp,&c);

			BN_print(bp,c);

			BIO_puts(bp,"\n");

			}

		BN_div(&d,&e,&c,&a,ctx);

		BN_sub(&d,&d,&a);

		if(!BN_is_zero(&d) || !BN_is_zero(&e))

		BN_div(d,e,c,a,ctx);

		BN_sub(d,d,a);

		if(!BN_is_zero(d) || !BN_is_zero(e))

			{

			fprintf(stderr,"Square test failed!\n");

		    return 0;

			goto err;

			}

		}

	BN_free(&a);

	BN_free(&c);

	BN_free(&d);

	BN_free(&e);

	return(1);



	/* Regression test for a BN_sqr overflow bug. */

	BN_hex2bn(&a,

		"80000000000000008000000000000001FFFFFFFFFFFFFFFE0000000000000000");

	BN_sqr(c, a, ctx);

	if (bp != NULL)

		{

		if (!results)

			{

			BN_print(bp,a);

			BIO_puts(bp," * ");

			BN_print(bp,a);

			BIO_puts(bp," - ");

			}

		BN_print(bp,c);

		BIO_puts(bp,"\n");

		}

	BN_mul(d, a, a, ctx);

	if (BN_cmp(c, d))

		{

		fprintf(stderr, "Square test failed: BN_sqr and BN_mul produce "

			"different results!\n");

		goto err;

		}



	/* Regression test for a BN_sqr overflow bug. */

	BN_hex2bn(&a,

		"80000000000000000000000080000001FFFFFFFE000000000000000000000000");

	BN_sqr(c, a, ctx);

	if (bp != NULL)

		{

		if (!results)

			{

			BN_print(bp,a);

			BIO_puts(bp," * ");

			BN_print(bp,a);

			BIO_puts(bp," - ");

			}

		BN_print(bp,c);

		BIO_puts(bp,"\n");

		}

	BN_mul(d, a, a, ctx);

	if (BN_cmp(c, d))

		{

		fprintf(stderr, "Square test failed: BN_sqr and BN_mul produce "

			"different results!\n");

		goto err;

		}

	ret = 1;

err:

	if (a != NULL) BN_free(a);

	if (c != NULL) BN_free(c);

	if (d != NULL) BN_free(d);

	if (e != NULL) BN_free(e);

	return ret;

	}



int test_mont(BIO *bp, BN_CTX *ctx)