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

openssl/crypto/ec/ecp_nist.c

 /* crypto/ec/ecp_nist.c */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
 /* ====================================================================
  * Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 94 matching lines @@
                 ec_GFp_nist_field_mul,
                 ec_GFp_nist_field_sqr,
                 0 /* field_div */,
                 0 /* field_encode */,
                 0 /* field_decode */,
                 0 /* field_set_to_one */ };
 
         return &ret;
         }
 
-#if BN_BITS2 == 64
-#define NO_32_BIT_TYPE
-#endif
-
 int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src)
         {
         dest->field_mod_func = src->field_mod_func;
 
         return ec_GFp_simple_group_copy(dest, src);
         }
 
 int ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
         const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
         {
         int ret = 0;
         BN_CTX *new_ctx = NULL;
         BIGNUM *tmp_bn;
         
         if (ctx == NULL)
                 if ((ctx = new_ctx = BN_CTX_new()) == NULL) return 0;
 
         BN_CTX_start(ctx);
         if ((tmp_bn = BN_CTX_get(ctx)) == NULL) goto err;
 
         if (BN_ucmp(BN_get0_nist_prime_192(), p) == 0)
                 group->field_mod_func = BN_nist_mod_192;
         else if (BN_ucmp(BN_get0_nist_prime_224(), p) == 0)
-                {
-#ifndef NO_32_BIT_TYPE
                 group->field_mod_func = BN_nist_mod_224;
-#else
-                ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE, EC_R_NOT_A_SUPPORTED_NIST_PRIME);
-                goto err;
-#endif
-                }
         else if (BN_ucmp(BN_get0_nist_prime_256(), p) == 0)
-                {
-#ifndef NO_32_BIT_TYPE
                 group->field_mod_func = BN_nist_mod_256;
-#else
-                ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE, EC_R_NOT_A_SUPPORTED_NIST_PRIME);
-                goto err;
-#endif
-                }
         else if (BN_ucmp(BN_get0_nist_prime_384(), p) == 0)
-                {
-#ifndef NO_32_BIT_TYPE
                 group->field_mod_func = BN_nist_mod_384;
-#else
-                ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE, EC_R_NOT_A_SUPPORTED_NIST_PRIME);
-                goto err;
-#endif
-                }
         else if (BN_ucmp(BN_get0_nist_prime_521(), p) == 0)
-                /* this one works in the NO_32_BIT_TYPE case */
                 group->field_mod_func = BN_nist_mod_521;
         else
                 {
                 ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE, EC_R_NOT_A_NIST_PRIME);
                 goto err;
                 }
 
         ret = ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
 
  err:
@@ skipping 47 matching lines @@
         if (!BN_sqr(r, a, ctx)) goto err;
         if (!group->field_mod_func(r, r, &group->field, ctx))
                 goto err;
 
         ret=1;
 err:
         if (ctx_new)
                 BN_CTX_free(ctx_new);
         return ret;
         }