Abdelilah Essiari <aes@george.lbl.gov> reports that for very small

[openssl.git] / crypto / bn / bn_sqr.c

diff --git a/crypto/bn/bn_sqr.c b/crypto/bn/bn_sqr.c
index bcd9c3b6af463c2254612adae7c253ecee73246f..fe00c5f69a01025918a5b06e271cfb52f269e415 100644 (file)
--- a/crypto/bn/bn_sqr.c
+++ b/crypto/bn/bn_sqr.c
@@ -62,20 +62,16 @@
 
 /* r must not be a */
 /* I've just gone over this and it is now %20 faster on x86 - eay - 27 Jun 96 */
-int BN_sqr(r, a, ctx)
-BIGNUM *r;
-BIGNUM *a;
-BN_CTX *ctx;
+int BN_sqr(BIGNUM *r, BIGNUM *a, BN_CTX *ctx)
        {
        int max,al;
+       int ret = 0;
        BIGNUM *tmp,*rr;
 
 #ifdef BN_COUNT
 printf("BN_sqr %d * %d\n",a->top,a->top);
 #endif
        bn_check_top(a);
-       tmp= &(ctx->bn[ctx->tos]);
-       rr=(a != r)?r: (&ctx->bn[ctx->tos+1]);
 
        al=a->top;
        if (al <= 0)
@@ -84,8 +80,13 @@ printf("BN_sqr %d * %d\n",a->top,a->top);
                return(1);
                }
 
+       BN_CTX_start(ctx);
+       rr=(a != r) ? r : BN_CTX_get(ctx);
+       tmp=BN_CTX_get(ctx);
+       if (tmp == NULL) goto err;
+
        max=(al+al);
-       if (bn_wexpand(rr,max+1) == NULL) return(0);
+       if (bn_wexpand(rr,max+1) == NULL) goto err;
 
        r->neg=0;
        if (al == 4)
@@ -123,18 +124,18 @@ printf("BN_sqr %d * %d\n",a->top,a->top);
                        k=j+j;
                        if (al == j)
                                {
-                               if (bn_wexpand(a,k*2) == NULL) return(0);
-                               if (bn_wexpand(tmp,k*2) == NULL) return(0);
+                               if (bn_wexpand(a,k*2) == NULL) goto err;
+                               if (bn_wexpand(tmp,k*2) == NULL) goto err;
                                bn_sqr_recursive(rr->d,a->d,al,tmp->d);
                                }
                        else
                                {
-                               if (bn_wexpand(tmp,max) == NULL) return(0);
+                               if (bn_wexpand(tmp,max) == NULL) goto err;
                                bn_sqr_normal(rr->d,a->d,al,tmp->d);
                                }
                        }
 #else
-               if (bn_wexpand(tmp,max) == NULL) return(0);
+               if (bn_wexpand(tmp,max) == NULL) goto err;
                bn_sqr_normal(rr->d,a->d,al,tmp->d);
 #endif
                }
@@ -142,15 +143,14 @@ printf("BN_sqr %d * %d\n",a->top,a->top);
        rr->top=max;
        if ((max > 0) && (rr->d[max-1] == 0)) rr->top--;
        if (rr != r) BN_copy(r,rr);
-       return(1);
+       ret = 1;
+ err:
+       BN_CTX_end(ctx);
+       return(ret);
        }
 
 /* tmp must have 2*n words */
-void bn_sqr_normal(r, a, n, tmp)
-BN_ULONG *r;
-BN_ULONG *a;
-int n;
-BN_ULONG *tmp;
+void bn_sqr_normal(BN_ULONG *r, BN_ULONG *a, int n, BN_ULONG *tmp)
        {
        int i,j,max;
        BN_ULONG *ap,*rp;
@@ -192,15 +192,12 @@ BN_ULONG *tmp;
  * n must be a power of 2.
  * We multiply and return the result.
  * t must be 2*n words in size
- * We calulate
+ * We calculate
  * a[0]*b[0]
  * a[0]*b[0]+a[1]*b[1]+(a[0]-a[1])*(b[1]-b[0])
  * a[1]*b[1]
  */
-void bn_sqr_recursive(r,a,n2,t)
-BN_ULONG *r,*a;
-int n2;
-BN_ULONG *t;
+void bn_sqr_recursive(BN_ULONG *r, BN_ULONG *a, int n2, BN_ULONG *t)
        {
        int n=n2/2;
        int zero,c1;