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

openssl/crypto/rc4/rc4_skey.c

 /* crypto/rc4/rc4_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 41 matching lines @@
  * 
  * 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/rc4.h>
 #include "rc4_locl.h"
 #include <openssl/opensslv.h>
-#include <openssl/crypto.h>
-#ifdef OPENSSL_FIPS
-#include <openssl/fips.h>
-#endif
-
 
 const char RC4_version[]="RC4" OPENSSL_VERSION_PTEXT;
 
 const char *RC4_options(void)
         {
 #ifdef RC4_INDEX
         if (sizeof(RC4_INT) == 1)
                 return("rc4(idx,char)");
         else
                 return("rc4(idx,int)");
 #else
         if (sizeof(RC4_INT) == 1)
                 return("rc4(ptr,char)");
         else
                 return("rc4(ptr,int)");
 #endif
         }
 
 /* RC4 as implemented from a posting from
  * Newsgroups: sci.crypt
  * From: sterndark@netcom.com (David Sterndark)
  * Subject: RC4 Algorithm revealed.
  * Message-ID: <sternCvKL4B.Hyy@netcom.com>
  * Date: Wed, 14 Sep 1994 06:35:31 GMT
  */
 
-#ifdef OPENSSL_FIPS
-void private_RC4_set_key(RC4_KEY *key, int len, const unsigned char *data)
-#else
 void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data)
-#endif
         {
         register RC4_INT tmp;
         register int id1,id2;
         register RC4_INT *d;
         unsigned int i;
         
         d= &(key->data[0]);
         key->x = 0;     
         key->y = 0;     
         id1=id2=0;     
@@ skipping 13 matching lines @@
                 /*
                  * Unlike all other x86 [and x86_64] implementations,
                  * Intel P4 core [including EM64T] was found to perform
                  * poorly with wider RC4_INT. Performance improvement
                  * for IA-32 hand-coded assembler turned out to be 2.8x
                  * if re-coded for RC4_CHAR! It's however inappropriate
                  * to just switch to RC4_CHAR for x86[_64], as non-P4
                  * implementations suffer from significant performance
                  * losses then, e.g. PIII exhibits >2x deterioration,
                  * and so does Opteron. In order to assure optimal
-                 * all-round performance, we detect P4 at run-time by
-                 * checking upon reserved bit 20 in CPU capability
+                 * all-round performance, let us [try to] detect P4 at
+                 * run-time by checking upon HTT bit in CPU capability
                  * vector and set up compressed key schedule, which is
                  * recognized by correspondingly updated assembler
-                 * module... Bit 20 is set up by OPENSSL_ia32_cpuid.
-                 *
+                 * module...
                  *                              <appro@fy.chalmers.se>
                  */
-#ifdef OPENSSL_FIPS
-                unsigned long *ia32cap_ptr = OPENSSL_ia32cap_loc();
-                if (ia32cap_ptr && (*ia32cap_ptr & (1<<28))) {
-#else
                 if (OPENSSL_ia32cap_P & (1<<28)) {
-#endif
                         unsigned char *cp=(unsigned char *)d;
 
                         for (i=0;i<256;i++) cp[i]=i;
                         for (i=0;i<256;i++) SK_LOOP(cp,i);
                         /* mark schedule as compressed! */
                         d[256/sizeof(RC4_INT)]=-1;
                         return;
                 }
         }
 # endif
 #endif
         for (i=0; i < 256; i++) d[i]=i;
         for (i=0; i < 256; i+=4)
                 {
                 SK_LOOP(d,i+0);
                 SK_LOOP(d,i+1);
                 SK_LOOP(d,i+2);
                 SK_LOOP(d,i+3);
                 }
         }