Changeset 808 for openssl/trunk/crypto/bn/bn_word.c

Timestamp:

Aug 7, 2014, 8:25:37 PM (11 years ago)

Author:

dmik

Message:

openssl: Merge version 1.0.0n from vendor to trunk.

Location:

openssl/trunk

Files:

• . (modified) (1 prop)
• crypto/bn/bn_word.c (modified) (1 diff)

openssl/trunk/crypto/bn/bn_word.c ¶

@@ -145 +145 @@
                 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 (;;)
-                {
-                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++;
-                }
-        if (i >= a->top)
+        for (i=0;w!=0 && i<a->top;i++)
+                {
+                a->d[i] = l = (a->d[i]+w)&BN_MASK2;
+                w = (w>l)?1:0;
+                }
+        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);