Remove #ifdef's for IRIX_CC_BUG

[oweals/openssl.git] / crypto / bn / bn_mul.c

diff --git a/crypto/bn/bn_mul.c b/crypto/bn/bn_mul.c
index 6938c88cb229b5f9b5670f1e3e7d152ee132de92..dde0919218e06f61f023df962dfc6fb4a59d6222 100644 (file)
--- a/crypto/bn/bn_mul.c
+++ b/crypto/bn/bn_mul.c
@@ -61,7 +61,6 @@
 # define NDEBUG
 #endif
 
-#include <stdio.h>
 #include <assert.h>
 #include "cryptlib.h"
 #include "bn_lcl.h"
@@ -78,8 +77,8 @@
    assembler counterparts for the systems that use assembler files.  */
 
 BN_ULONG bn_sub_part_words(BN_ULONG *r,
-                          const BN_ULONG *a, const BN_ULONG *b,
-                          size_t cl, ssize_t dl)
+       const BN_ULONG *a, const BN_ULONG *b,
+       int cl, int dl)
        {
        BN_ULONG c, t;
 
@@ -95,9 +94,6 @@ BN_ULONG bn_sub_part_words(BN_ULONG *r,
 
        if (dl < 0)
                {
-#ifdef BN_COUNT
-               fprintf(stderr, "  bn_sub_part_words %d + %d (dl < 0, c = %d)\n", cl, dl, c);
-#endif
                for (;;)
                        {
                        t = b[0];
@@ -126,10 +122,7 @@ BN_ULONG bn_sub_part_words(BN_ULONG *r,
                }
        else
                {
-               ssize_t save_dl = dl;
-#ifdef BN_COUNT
-               fprintf(stderr, "  bn_sub_part_words %d + %d (dl > 0, c = %d)\n", cl, dl, c);
-#endif
+               int save_dl = dl;
                while(c)
                        {
                        t = a[0];
@@ -158,9 +151,6 @@ BN_ULONG bn_sub_part_words(BN_ULONG *r,
                        }
                if (dl > 0)
                        {
-#ifdef BN_COUNT
-                       fprintf(stderr, "  bn_sub_part_words %d + %d (dl > 0, c == 0)\n", cl, dl);
-#endif
                        if (save_dl > dl)
                                {
                                switch (save_dl - dl)
@@ -181,9 +171,6 @@ BN_ULONG bn_sub_part_words(BN_ULONG *r,
                        }
                if (dl > 0)
                        {
-#ifdef BN_COUNT
-                       fprintf(stderr, "  bn_sub_part_words %d + %d (dl > 0, copy)\n", cl, dl);
-#endif
                        for(;;)
                                {
                                r[0] = a[0];
@@ -205,8 +192,8 @@ BN_ULONG bn_sub_part_words(BN_ULONG *r,
 #endif
 
 BN_ULONG bn_add_part_words(BN_ULONG *r,
-                          const BN_ULONG *a, const BN_ULONG *b,
-                          size_t cl, ssize_t dl)
+       const BN_ULONG *a, const BN_ULONG *b,
+       int cl, int dl)
        {
        BN_ULONG c, l, t;
 
@@ -222,10 +209,7 @@ BN_ULONG bn_add_part_words(BN_ULONG *r,
 
        if (dl < 0)
                {
-               ssize_t save_dl = dl;
-#ifdef BN_COUNT
-               fprintf(stderr, "  bn_add_part_words %d + %d (dl < 0, c = %d)\n", cl, dl, c);
-#endif
+               int save_dl = dl;
                while (c)
                        {
                        l=(c+b[0])&BN_MASK2;
@@ -254,9 +238,6 @@ BN_ULONG bn_add_part_words(BN_ULONG *r,
                        }
                if (dl < 0)
                        {
-#ifdef BN_COUNT
-                       fprintf(stderr, "  bn_add_part_words %d + %d (dl < 0, c == 0)\n", cl, dl);
-#endif
                        if (save_dl < dl)
                                {
                                switch (dl - save_dl)
@@ -277,9 +258,6 @@ BN_ULONG bn_add_part_words(BN_ULONG *r,
                        }
                if (dl < 0)
                        {
-#ifdef BN_COUNT
-                       fprintf(stderr, "  bn_add_part_words %d + %d (dl < 0, copy)\n", cl, dl);
-#endif
                        for(;;)
                                {
                                r[0] = b[0];
@@ -299,9 +277,6 @@ BN_ULONG bn_add_part_words(BN_ULONG *r,
        else
                {
                int save_dl = dl;
-#ifdef BN_COUNT
-               fprintf(stderr, "  bn_add_part_words %d + %d (dl > 0)\n", cl, dl);
-#endif
                while (c)
                        {
                        t=(a[0]+c)&BN_MASK2;
@@ -328,9 +303,6 @@ BN_ULONG bn_add_part_words(BN_ULONG *r,
                        a+=4;
                        r+=4;
                        }
-#ifdef BN_COUNT
-               fprintf(stderr, "  bn_add_part_words %d + %d (dl > 0, c == 0)\n", cl, dl);
-#endif
                if (dl > 0)
                        {
                        if (save_dl > dl)
@@ -353,9 +325,6 @@ BN_ULONG bn_add_part_words(BN_ULONG *r,
                        }
                if (dl > 0)
                        {
-#ifdef BN_COUNT
-                       fprintf(stderr, "  bn_add_part_words %d + %d (dl > 0, copy)\n", cl, dl);
-#endif
                        for(;;)
                                {
                                r[0] = a[0];
@@ -390,17 +359,14 @@ BN_ULONG bn_add_part_words(BN_ULONG *r,
  * a[1]*b[1]
  */
 /* dnX may not be positive, but n2/2+dnX has to be */
-void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, size_t n2,
-                     int dna, int dnb, BN_ULONG *t)
+void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
+       int dna, int dnb, BN_ULONG *t)
        {
        int n=n2/2,c1,c2;
        int tna=n+dna, tnb=n+dnb;
        unsigned int neg,zero;
        BN_ULONG ln,lo,*p;
 
-# ifdef BN_COUNT
-       fprintf(stderr," bn_mul_recursive %d%+d * %d%+d\n",n2,dna,n2,dnb);
-# endif
 # ifdef BN_MUL_COMBA
 #  if 0
        if (n2 == 4)
@@ -505,16 +471,16 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, size_t n2,
         * r[32] holds (b[1]*b[1])
         */
 
-       c1=bn_add_words(t,r,&(r[n2]),n2);
+       c1=(int)(bn_add_words(t,r,&(r[n2]),n2));
 
        if (neg) /* if t[32] is negative */
                {
-               c1-=bn_sub_words(&(t[n2]),t,&(t[n2]),n2);
+               c1-=(int)(bn_sub_words(&(t[n2]),t,&(t[n2]),n2));
                }
        else
                {
                /* Might have a carry */
-               c1+=bn_add_words(&(t[n2]),&(t[n2]),t,n2);
+               c1+=(int)(bn_add_words(&(t[n2]),&(t[n2]),t,n2));
                }
 
        /* t[32] holds (a[0]-a[1])*(b[1]-b[0])+(a[0]*b[0])+(a[1]*b[1])
@@ -522,7 +488,7 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, size_t n2,
         * r[32] holds (b[1]*b[1])
         * c1 holds the carry bits
         */
-       c1+=bn_add_words(&(r[n]),&(r[n]),&(t[n2]),n2);
+       c1+=(int)(bn_add_words(&(r[n]),&(r[n]),&(t[n2]),n2));
        if (c1)
                {
                p= &(r[n+n2]);
@@ -551,13 +517,9 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
             int tna, int tnb, BN_ULONG *t)
        {
        int i,j,n2=n*2;
-       int c1,c2,neg,zero;
+       int c1,c2,neg;
        BN_ULONG ln,lo,*p;
 
-# ifdef BN_COUNT
-       fprintf(stderr," bn_mul_part_recursive (%d%+d) * (%d%+d)\n",
-               n, tna, n, tnb);
-# endif
        if (n < 8)
                {
                bn_mul_normal(r,a,n+tna,b,n+tnb);
@@ -567,7 +529,7 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
        /* r=(a[0]-a[1])*(b[1]-b[0]) */
        c1=bn_cmp_part_words(a,&(a[n]),tna,n-tna);
        c2=bn_cmp_part_words(&(b[n]),b,tnb,tnb-n);
-       zero=neg=0;
+       neg=0;
        switch (c1*3+c2)
                {
        case -4:
@@ -575,7 +537,6 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
                bn_sub_part_words(&(t[n]),b,      &(b[n]),tnb,n-tnb); /* - */
                break;
        case -3:
-               zero=1;
                /* break; */
        case -2:
                bn_sub_part_words(t,      &(a[n]),a,      tna,tna-n); /* - */
@@ -585,7 +546,6 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
        case -1:
        case 0:
        case 1:
-               zero=1;
                /* break; */
        case 2:
                bn_sub_part_words(t,      a,      &(a[n]),tna,n-tna); /* + */
@@ -593,7 +553,6 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
                neg=1;
                break;
        case 3:
-               zero=1;
                /* break; */
        case 4:
                bn_sub_part_words(t,      a,      &(a[n]),tna,n-tna);
@@ -731,10 +690,6 @@ void bn_mul_low_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
        {
        int n=n2/2;
 
-# ifdef BN_COUNT
-       fprintf(stderr," bn_mul_low_recursive %d * %d\n",n2,n2);
-# endif
-
        bn_mul_recursive(r,a,b,n,0,0,&(t[0]));
        if (n >= BN_MUL_LOW_RECURSIVE_SIZE_NORMAL)
                {
@@ -765,9 +720,6 @@ void bn_mul_high(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, BN_ULONG *l, int n2,
        int neg,oneg,zero;
        BN_ULONG ll,lc,*lp,*mp;
 
-# ifdef BN_COUNT
-       fprintf(stderr," bn_mul_high %d * %d\n",n2,n2);
-# endif
        n=n2/2;
 
        /* Calculate (al-ah)*(bh-bl) */
@@ -956,10 +908,6 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
        int j=0,k;
 #endif
 
-#ifdef BN_COUNT
-       fprintf(stderr,"BN_mul %d * %d\n",a->top,b->top);
-#endif
-
        bn_check_top(a);
        bn_check_top(b);
        bn_check_top(r);
@@ -1012,7 +960,6 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
                {
                if (i >= -1 && i <= 1)
                        {
-                       int sav_j =0;
                        /* Find out the power of two lower or equal
                           to the longest of the two numbers */
                        if (i >= 0)
@@ -1023,22 +970,23 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
                                {
                                j = BN_num_bits_word((BN_ULONG)bl);
                                }
-                       sav_j = j;
                        j = 1<<(j-1);
                        assert(j <= al || j <= bl);
                        k = j+j;
                        t = BN_CTX_get(ctx);
+                       if (t == NULL)
+                               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);
                                }
@@ -1108,10 +1056,6 @@ void bn_mul_normal(BN_ULONG *r, BN_ULONG *a, int na, BN_ULONG *b, int nb)
        {
        BN_ULONG *rr;
 
-#ifdef BN_COUNT
-       fprintf(stderr," bn_mul_normal %d * %d\n",na,nb);
-#endif
-
        if (na < nb)
                {
                int itmp;
@@ -1148,9 +1092,6 @@ void bn_mul_normal(BN_ULONG *r, BN_ULONG *a, int na, BN_ULONG *b, int nb)
 
 void bn_mul_low_normal(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n)
        {
-#ifdef BN_COUNT
-       fprintf(stderr," bn_mul_low_normal %d * %d\n",n,n);
-#endif
        bn_mul_words(r,a,n,b[0]);
 
        for (;;)