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

openssl/crypto/rc5/rc5_skey.c

 /* crypto/rc5/rc5_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 38 matching lines @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * 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/crypto.h>
 #include <openssl/rc5.h>
-#ifdef OPENSSL_FIPS
-#include <openssl/fips.h>
-#endif
-
 #include "rc5_locl.h"
 
-#ifdef OPENSSL_FIPS
 void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
                     int rounds)
         {
-        if (FIPS_mode())
-                FIPS_BAD_ABORT(RC5)
-        private_RC5_32_set_key(key, len, data, rounds);
-        }
-void private_RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
-                    int rounds)
-#else
-void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
-                    int rounds)
-#endif
-        {
         RC5_32_INT L[64],l,ll,A,B,*S,k;
         int i,j,m,c,t,ii,jj;
 
         if (    (rounds != RC5_16_ROUNDS) &&
                 (rounds != RC5_12_ROUNDS) &&
                 (rounds != RC5_8_ROUNDS))
                 rounds=RC5_16_ROUNDS;
 
         key->rounds=rounds;
         S= &(key->data[0]);
@@ skipping 29 matching lines @@
                 k=(S[ii]+A+B)&RC5_32_MASK;
                 A=S[ii]=ROTATE_l32(k,3);
                 m=(int)(A+B);
                 k=(L[jj]+A+B)&RC5_32_MASK;
                 B=L[jj]=ROTATE_l32(k,m);
                 if (++ii >= t) ii=0;
                 if (++jj >= c) jj=0;
                 }
         }