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

openssl/crypto/des/set_key.c

 /* crypto/des/set_key.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 46 matching lines @@
  */
 
 /* set_key.c v 1.4 eay 24/9/91
  * 1.4 Speed up by 400% :-)
  * 1.3 added register declarations.
  * 1.2 unrolled make_key_sched a bit more
  * 1.1 added norm_expand_bits
  * 1.0 First working version
  */
 #include "des_locl.h"
-#ifdef OPENSSL_FIPS
-#include <openssl/fips.h>
-#endif
 
-
-OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key);    /* defaults to false */
+OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key,0)   /* defaults to false */
 
 static const unsigned char odd_parity[256]={
   1,  1,  2,  2,  4,  4,  7,  7,  8,  8, 11, 11, 13, 13, 14, 14,
  16, 16, 19, 19, 21, 21, 22, 22, 25, 25, 26, 26, 28, 28, 31, 31,
  32, 32, 35, 35, 37, 37, 38, 38, 41, 41, 42, 42, 44, 44, 47, 47,
  49, 49, 50, 50, 52, 52, 55, 55, 56, 56, 59, 59, 61, 61, 62, 62,
  64, 64, 67, 67, 69, 69, 70, 70, 73, 73, 74, 74, 76, 76, 79, 79,
  81, 81, 82, 82, 84, 84, 87, 87, 88, 88, 91, 91, 93, 93, 94, 94,
  97, 97, 98, 98,100,100,103,103,104,104,107,107,109,109,110,110,
 112,112,115,115,117,117,118,118,121,121,122,122,124,124,127,127,
@@ skipping 250 matching lines @@
         if (!DES_check_key_parity(key))
                 return(-1);
         if (DES_is_weak_key(key))
                 return(-2);
         DES_set_key_unchecked(key, schedule);
         return 0;
         }
 
 void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)
         {
-        static int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
+        static const int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
         register DES_LONG c,d,t,s,t2;
         register const unsigned char *in;
         register DES_LONG *k;
         register int i;
 
 #ifdef OPENBSD_DEV_CRYPTO
         memcpy(schedule->key,key,sizeof schedule->key);
         schedule->session=NULL;
 #endif
         k = &schedule->ks->deslong[0];
         in = &(*key)[0];
 
-#ifdef OPENSSL_FIPS
-        FIPS_selftest_check();
-#endif
-
         c2l(in,c);
         c2l(in,d);
 
         /* do PC1 in 47 simple operations :-)
          * Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov)
          * for the inspiration. :-) */
         PERM_OP (d,c,t,4,0x0f0f0f0fL);
         HPERM_OP(c,t,-2,0xcccc0000L);
         HPERM_OP(d,t,-2,0xcccc0000L);
         PERM_OP (d,c,t,1,0x55555555L);
@@ skipping 36 matching lines @@
         {
         return(DES_set_key(key,schedule));
         }
 /*
 #undef des_fixup_key_parity
 void des_fixup_key_parity(des_cblock *key)
         {
         des_set_odd_parity(key);
         }
 */
-