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

openssl/crypto/idea/i_skey.c

 /* crypto/idea/i_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/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;
 
         kt= &(ks->data[0][0]);
         n2s(key,kt[0]); n2s(key,kt[1]); n2s(key,kt[2]); n2s(key,kt[3]);
         n2s(key,kt[4]); n2s(key,kt[5]); n2s(key,kt[6]); n2s(key,kt[7]);
 
         kf=kt;
         kt+=8;
         for (i=0; i<6; i++)
@@ skipping 12 matching lines @@
                 r0= kf[7];
                 *(kt++)= ((r1<<9) | (r0>>7))&0xffff;
                 r1= kf[0];
                 if (i >= 5) break;
                 *(kt++)= ((r0<<9) | (r1>>7))&0xffff;
                 *(kt++)= ((r1<<9) | (r2>>7))&0xffff;
                 kf+=8;
                 }
         }
 
-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]);
         for (r=0; r<9; r++)
                 {
                 *(tp++)=inverse(fp[0]);
                 *(tp++)=((int)(0x10000L-fp[2])&0xffff);
                 *(tp++)=((int)(0x10000L-fp[1])&0xffff);
                 *(tp++)=inverse(fp[3]);
                 if (r == 8) break;
@@ skipping 36 matching lines @@
                                 n1=n2;
                                 n2=r;
                                 t=b2;
                                 b2=b1-q*b2;
                                 b1=t;
                                 }
                         } while (r != 0);
                 }
         return((IDEA_INT)b2);
         }