Upgrade chrome's OpenSSL to same version Android ships with.

openssl/crypto/bn/bn_div.c

 /* crypto/bn/bn_div.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
@@ skipping 320 matching lines @@
                                 {
                                 if (t2 <= ((((BN_ULLONG)rem)<<BN_BITS2)|wnump[-2]))
                                         break;
                                 q--;
                                 rem += d0;
                                 if (rem < d0) break; /* don't let rem overflow */
                                 t2 -= d1;
                                 }
 #else /* !BN_LLONG */
                         BN_ULONG t2l,t2h;
-#if !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH)
-                        BN_ULONG ql,qh;
-#endif
 
                         q=bn_div_words(n0,n1,d0);
 #ifdef BN_DEBUG_LEVITTE
                         fprintf(stderr,"DEBUG: bn_div_words(0x%08X,0x%08X,0x%08\
 X) -> 0x%08X\n",
                                 n0, n1, d0, q);
 #endif
 #ifndef REMAINDER_IS_ALREADY_CALCULATED
                         rem=(n1-q*d0)&BN_MASK2;
 #endif
 
 #if defined(BN_UMULT_LOHI)
                         BN_UMULT_LOHI(t2l,t2h,d1,q);
 #elif defined(BN_UMULT_HIGH)
                         t2l = d1 * q;
                         t2h = BN_UMULT_HIGH(d1,q);
 #else
+                        {
+                        BN_ULONG ql, qh;
                         t2l=LBITS(d1); t2h=HBITS(d1);
                         ql =LBITS(q);  qh =HBITS(q);
                         mul64(t2l,t2h,ql,qh); /* t2=(BN_ULLONG)d1*q; */
+                        }
 #endif
 
                         for (;;)
                                 {
                                 if ((t2h < rem) ||
                                         ((t2h == rem) && (t2l <= wnump[-2])))
                                         break;
                                 q--;
                                 rem += d0;
                                 if (rem < d0) break; /* don't let rem overflow */
@@ skipping 184 matching lines @@
                                 {
                                 if (t2 <= ((((BN_ULLONG)rem)<<BN_BITS2)|wnump[-2]))
                                         break;
                                 q--;
                                 rem += d0;
                                 if (rem < d0) break; /* don't let rem overflow */
                                 t2 -= d1;
                                 }
 #else /* !BN_LLONG */
                         BN_ULONG t2l,t2h;
-#if !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH)
-                        BN_ULONG ql,qh;
-#endif
 
                         q=bn_div_words(n0,n1,d0);
 #ifdef BN_DEBUG_LEVITTE
                         fprintf(stderr,"DEBUG: bn_div_words(0x%08X,0x%08X,0x%08\
 X) -> 0x%08X\n",
                                 n0, n1, d0, q);
 #endif
 #ifndef REMAINDER_IS_ALREADY_CALCULATED
                         rem=(n1-q*d0)&BN_MASK2;
 #endif
 
 #if defined(BN_UMULT_LOHI)
                         BN_UMULT_LOHI(t2l,t2h,d1,q);
 #elif defined(BN_UMULT_HIGH)
                         t2l = d1 * q;
                         t2h = BN_UMULT_HIGH(d1,q);
 #else
+                        {
+                        BN_ULONG ql, qh;
                         t2l=LBITS(d1); t2h=HBITS(d1);
                         ql =LBITS(q);  qh =HBITS(q);
                         mul64(t2l,t2h,ql,qh); /* t2=(BN_ULLONG)d1*q; */
+                        }
 #endif
 
                         for (;;)
                                 {
                                 if ((t2h < rem) ||
                                         ((t2h == rem) && (t2l <= wnump[-2])))
                                         break;
                                 q--;
                                 rem += d0;
                                 if (rem < d0) break; /* don't let rem overflow */
@@ skipping 40 matching lines @@
         bn_correct_top(res);
         BN_CTX_end(ctx);
         return(1);
 err:
         bn_check_top(rm);
         BN_CTX_end(ctx);
         return(0);
         }
 
 #endif