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

openssl/crypto/cast/c_skey.c

 /* crypto/cast/c_skey.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 39 matching lines @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
 
 #include <openssl/cast.h>
-#include <openssl/crypto.h>
-#ifdef OPENSSL_FIPS
-#include <openssl/fips.h>
-#endif
-
 #include "cast_lcl.h"
 #include "cast_s.h"
 
 #define CAST_exp(l,A,a,n) \
         A[n/4]=l; \
         a[n+3]=(l    )&0xff; \
         a[n+2]=(l>> 8)&0xff; \
         a[n+1]=(l>>16)&0xff; \
         a[n+0]=(l>>24)&0xff;
 
 #define S4 CAST_S_table4
 #define S5 CAST_S_table5
 #define S6 CAST_S_table6
 #define S7 CAST_S_table7
 
-FIPS_NON_FIPS_VCIPHER_Init(CAST)
+void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data)
         {
         CAST_LONG x[16];
         CAST_LONG z[16];
         CAST_LONG k[32];
         CAST_LONG X[4],Z[4];
         CAST_LONG l,*K;
         int i;
 
         for (i=0; i<16; i++) x[i]=0;
         if (len > 16) len=16;
@@ skipping 71 matching lines @@
         K+=16;
                 }
 
         for (i=0; i<16; i++)
                 {
                 key->data[i*2]=k[i];
                 key->data[i*2+1]=((k[i+16])+16)&0x1f;
                 }
         }