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

openssl/crypto/pkcs12/p12_crt.c

 /* p12_crt.c */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
 /* ====================================================================
  * Copyright (c) 1999-2002 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 41 matching lines @@
  *
  * This product includes cryptographic software written by Eric Young
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com).
  *
  */
 
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/pkcs12.h>
-#ifdef OPENSSL_FIPS
-#include <openssl/fips.h>
-#endif
-
 
 
 static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags, PKCS12_SAFEBAG *bag);
 
 static int copy_bag_attr(PKCS12_SAFEBAG *bag, EVP_PKEY *pkey, int nid)
         {
         int idx;
         X509_ATTRIBUTE *attr;
         idx = EVP_PKEY_get_attr_by_NID(pkey, nid, -1);
         if (idx < 0)
@@ skipping 11 matching lines @@
         PKCS12 *p12 = NULL;
         STACK_OF(PKCS7) *safes = NULL;
         STACK_OF(PKCS12_SAFEBAG) *bags = NULL;
         PKCS12_SAFEBAG *bag = NULL;
         int i;
         unsigned char keyid[EVP_MAX_MD_SIZE];
         unsigned int keyidlen = 0;
 
         /* Set defaults */
         if (!nid_cert)
-                {
-#ifdef OPENSSL_FIPS
-                if (FIPS_mode())
-                        nid_cert = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
-                else
-#endif
                 nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC;
-                }
         if (!nid_key)
                 nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
         if (!iter)
                 iter = PKCS12_DEFAULT_ITER;
         if (!mac_iter)
                 mac_iter = 1;
 
         if(!pkey && !cert && !ca)
                 {
                 PKCS12err(PKCS12_F_PKCS12_CREATE,PKCS12_R_INVALID_NULL_ARGUMENT);
@@ skipping 246 matching lines @@
 
         if(!PKCS12_pack_authsafes(p12, safes))
                 {
                 PKCS12_free(p12);
                 return NULL;
                 }
 
         return p12;
 
         }