Commit 115f7fa5 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Merge branch 'OpenSSL_1_0_2-stable' of /home/steve/src/git/openssl into OpenSSL_1_0_2-stable

parents c867d871 2a713ead

crypto/bn/asm/x86_64-mont.pl

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; 
( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or

die "can't locate x86_64-xlate.pl";



open STDOUT,"| \"$^X\" $xlate $flavour $output";

open OUT,"| \"$^X\" $xlate $flavour $output";

*STDOUT=*OUT;



# int bn_mul_mont(

$rp="%rdi";	# BN_ULONG *rp,

crypto/bn/asm/x86_64-mont5.pl

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; 
( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or

die "can't locate x86_64-xlate.pl";



open STDOUT,"| \"$^X\" $xlate $flavour $output";

open OUT,"| \"$^X\" $xlate $flavour $output";

*STDOUT=*OUT;



# int bn_mul_mont_gather5(

$rp="%rdi";	# BN_ULONG *rp,

crypto/bn/bn_word.c

+8 −17
Original line number Diff line number Diff line
@@ -144,26 +144,17 @@ int BN_add_word(BIGNUM *a, BN_ULONG w) 
			a->neg=!(a->neg);

		return(i);

		}

	/* Only expand (and risk failing) if it's possibly necessary */

	if (((BN_ULONG)(a->d[a->top - 1] + 1) == 0) &&

			(bn_wexpand(a,a->top+1) == NULL))

		return(0);

	i=0;

	for (;;)

	for (i=0;w!=0 && i<a->top;i++)

		{

		if (i >= a->top)

			l=w;

		else

			l=(a->d[i]+w)&BN_MASK2;

		a->d[i]=l;

		if (w > l)

			w=1;

		else

			break;

		i++;

		a->d[i] = l = (a->d[i]+w)&BN_MASK2;

		w = (w>l)?1:0;

		}

	if (i >= a->top)

	if (w && i==a->top)

		{

		if (bn_wexpand(a,a->top+1) == NULL) return 0;

		a->top++;

		a->d[i]=w;

		}

	bn_check_top(a);

	return(1);

	}