Commit 1ff44a99 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 2111 

Submitted by: Martin Olsson <molsson@opera.com>

Check for bn_wexpand errors in bn_mul.c
parent 6cf61614

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ 


 Changes between 0.9.8l (?) and 0.9.8m (?)  [xx XXX xxxx]



  *) Replace the highly broken and deprecated SPKAC certification method with

     the updated NID creation version. This should correctly handle UTF8.

     [Steve Henson]



  *) Implement

     https://svn.resiprocate.org/rep/ietf-drafts/ekr/draft-rescorla-tls-renegotiate.txt. Re-enable

     renegotiation but require the extension as needed. Unfortunately,

crypto/bn/bn_mul.c

+4 −4
Original line number Diff line number Diff line
@@ -1032,15 +1032,15 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx) 
				goto err;

			if (al > j || bl > j)

				{

				bn_wexpand(t,k*4);

				bn_wexpand(rr,k*4);

				if (bn_wexpand(t,k*4) == NULL) goto err;

				if (bn_wexpand(rr,k*4) == NULL) goto err;

				bn_mul_part_recursive(rr->d,a->d,b->d,

					j,al-j,bl-j,t->d);

				}

			else	/* al <= j || bl <= j */

				{

				bn_wexpand(t,k*2);

				bn_wexpand(rr,k*2);

				if (bn_wexpand(t,k*2) == NULL) goto err;

				if (bn_wexpand(rr,k*2) == NULL) goto err;

				bn_mul_recursive(rr->d,a->d,b->d,

					j,al-j,bl-j,t->d);

				}