OpenSSL 0.9.5 merge

*warning* this bumps shared lib minors for libssl and libcrypto from 2.1 to 2.2
if you are using the ssl26 packages for ssh and other things to work you will
need to get new ones (see ~beck/libsslsnap/<arch>) on cvs or ~beck/src-patent.tar.gz on cvs

1 files changed, 16 insertions, 9 deletions

diff --git a/src/lib/libcrypto/bn/bn_sqr.c b/src/lib/libcrypto/bn/bn_sqr.c
index 12cce4d7ce..fe00c5f69a 100644
--- a/src/lib/libcrypto/bn/bn_sqr.c
+++ b/src/lib/libcrypto/bn/bn_sqr.c
@@ -65,14 +65,13 @@
 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)
@@ -81,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)
@@ -120,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
                 }
@@ -139,7 +143,10 @@ 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 */
@@ -185,7 +192,7 @@ void bn_sqr_normal(BN_ULONG *r, BN_ULONG *a, int n, 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]