Commit 2714e2ac authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Merge from stable branch.

parent 1139eeec

crypto/bn/bn_div.c

+2 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ int BN_div_no_branch(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, 


	if (BN_is_zero(divisor))

		{

		BNerr(BN_F_BN_DIV,BN_R_DIV_BY_ZERO);

		BNerr(BN_F_BN_DIV_NO_BRANCH,BN_R_DIV_BY_ZERO);

		return(0);

		}
@@ -618,6 +618,7 @@ X) -> 0x%08X\n", 
			rm->neg = neg;

		bn_check_top(rm);

		}

	bn_correct_top(res);

	BN_CTX_end(ctx);

	return(1);

err:

crypto/bn/bn_gcd.c

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ BIGNUM *BN_mod_inverse_no_branch(BIGNUM *in, 
		}

	else

		{

		BNerr(BN_F_BN_MOD_INVERSE,BN_R_NO_INVERSE);

		BNerr(BN_F_BN_MOD_INVERSE_NO_BRANCH,BN_R_NO_INVERSE);

		goto err;

		}

	ret=R;