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

openssl/crypto/idea/i_skey.c

Index: openssl/crypto/idea/i_skey.c
===================================================================
--- openssl/crypto/idea/i_skey.c	(revision 105093)
+++ openssl/crypto/idea/i_skey.c	(working copy)
@@ -57,28 +57,11 @@
  */
 
 #include <openssl/idea.h>
-#include <openssl/crypto.h>
-#ifdef OPENSSL_FIPS
-#include <openssl/fips.h>
-#endif
-
 #include "idea_lcl.h"
 
 static IDEA_INT inverse(unsigned int xin);
-
-#ifdef OPENSSL_FIPS
 void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks)
 	{
-	if (FIPS_mode())
-		FIPS_BAD_ABORT(IDEA)
-	private_idea_set_encrypt_key(key, ks);
-	}
-void private_idea_set_encrypt_key(const unsigned char *key,
-						IDEA_KEY_SCHEDULE *ks)
-#else
-void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks)
-#endif
-	{
 	int i;
 	register IDEA_INT *kt,*kf,r0,r1,r2;
 
@@ -111,11 +94,10 @@
 		}
 	}
 
-void idea_set_decrypt_key(const IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk)
+void idea_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk)
 	{
 	int r;
-	register IDEA_INT *tp,t;
-	const IDEA_INT *fp;
+	register IDEA_INT *fp,*tp,t;
 
 	tp= &(dk->data[0][0]);
 	fp= &(ek->data[8][0]);