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

openssl/crypto/des/des_enc.c

 /* crypto/des/des_enc.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 "des_locl.h"
+#include "spr.h"
 
 void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc)
         {
         register DES_LONG l,r,t,u;
 #ifdef DES_PTR
         register const unsigned char *des_SP=(const unsigned char *)DES_SPtrans;
 #endif
 #ifndef DES_UNROLL
         register int i;
 #endif
@@ skipping 30 matching lines @@
                 D_ENCRYPT(r,l,14); /*  8 */
                 D_ENCRYPT(l,r,16); /*  9 */
                 D_ENCRYPT(r,l,18); /*  10 */
                 D_ENCRYPT(l,r,20); /*  11 */
                 D_ENCRYPT(r,l,22); /*  12 */
                 D_ENCRYPT(l,r,24); /*  13 */
                 D_ENCRYPT(r,l,26); /*  14 */
                 D_ENCRYPT(l,r,28); /*  15 */
                 D_ENCRYPT(r,l,30); /*  16 */
 #else
-                for (i=0; i<32; i+=8)
+                for (i=0; i<32; i+=4)
                         {
                         D_ENCRYPT(l,r,i+0); /*  1 */
                         D_ENCRYPT(r,l,i+2); /*  2 */
-                        D_ENCRYPT(l,r,i+4); /*  3 */
-                        D_ENCRYPT(r,l,i+6); /*  4 */
                         }
 #endif
                 }
         else
                 {
 #ifdef DES_UNROLL
                 D_ENCRYPT(l,r,30); /* 16 */
                 D_ENCRYPT(r,l,28); /* 15 */
                 D_ENCRYPT(l,r,26); /* 14 */
                 D_ENCRYPT(r,l,24); /* 13 */
                 D_ENCRYPT(l,r,22); /* 12 */
                 D_ENCRYPT(r,l,20); /* 11 */
                 D_ENCRYPT(l,r,18); /* 10 */
                 D_ENCRYPT(r,l,16); /*  9 */
                 D_ENCRYPT(l,r,14); /*  8 */
                 D_ENCRYPT(r,l,12); /*  7 */
                 D_ENCRYPT(l,r,10); /*  6 */
                 D_ENCRYPT(r,l, 8); /*  5 */
                 D_ENCRYPT(l,r, 6); /*  4 */
                 D_ENCRYPT(r,l, 4); /*  3 */
                 D_ENCRYPT(l,r, 2); /*  2 */
                 D_ENCRYPT(r,l, 0); /*  1 */
 #else
-                for (i=30; i>0; i-=8)
+                for (i=30; i>0; i-=4)
                         {
                         D_ENCRYPT(l,r,i-0); /* 16 */
                         D_ENCRYPT(r,l,i-2); /* 15 */
-                        D_ENCRYPT(l,r,i-4); /* 14 */
-                        D_ENCRYPT(r,l,i-6); /* 13 */
                         }
 #endif
                 }
 
         /* rotate and clear the top bits on machines with 8byte longs */
         l=ROTATE(l,3)&0xffffffffL;
         r=ROTATE(r,3)&0xffffffffL;
 
         FP(r,l);
         data[0]=l;
@@ skipping 41 matching lines @@
                 D_ENCRYPT(r,l,14); /*  8 */
                 D_ENCRYPT(l,r,16); /*  9 */
                 D_ENCRYPT(r,l,18); /*  10 */
                 D_ENCRYPT(l,r,20); /*  11 */
                 D_ENCRYPT(r,l,22); /*  12 */
                 D_ENCRYPT(l,r,24); /*  13 */
                 D_ENCRYPT(r,l,26); /*  14 */
                 D_ENCRYPT(l,r,28); /*  15 */
                 D_ENCRYPT(r,l,30); /*  16 */
 #else
-                for (i=0; i<32; i+=8)
+                for (i=0; i<32; i+=4)
                         {
                         D_ENCRYPT(l,r,i+0); /*  1 */
                         D_ENCRYPT(r,l,i+2); /*  2 */
-                        D_ENCRYPT(l,r,i+4); /*  3 */
-                        D_ENCRYPT(r,l,i+6); /*  4 */
                         }
 #endif
                 }
         else
                 {
 #ifdef DES_UNROLL
                 D_ENCRYPT(l,r,30); /* 16 */
                 D_ENCRYPT(r,l,28); /* 15 */
                 D_ENCRYPT(l,r,26); /* 14 */
                 D_ENCRYPT(r,l,24); /* 13 */
                 D_ENCRYPT(l,r,22); /* 12 */
                 D_ENCRYPT(r,l,20); /* 11 */
                 D_ENCRYPT(l,r,18); /* 10 */
                 D_ENCRYPT(r,l,16); /*  9 */
                 D_ENCRYPT(l,r,14); /*  8 */
                 D_ENCRYPT(r,l,12); /*  7 */
                 D_ENCRYPT(l,r,10); /*  6 */
                 D_ENCRYPT(r,l, 8); /*  5 */
                 D_ENCRYPT(l,r, 6); /*  4 */
                 D_ENCRYPT(r,l, 4); /*  3 */
                 D_ENCRYPT(l,r, 2); /*  2 */
                 D_ENCRYPT(r,l, 0); /*  1 */
 #else
-                for (i=30; i>0; i-=8)
+                for (i=30; i>0; i-=4)
                         {
                         D_ENCRYPT(l,r,i-0); /* 16 */
                         D_ENCRYPT(r,l,i-2); /* 15 */
-                        D_ENCRYPT(l,r,i-4); /* 14 */
-                        D_ENCRYPT(r,l,i-6); /* 13 */
                         }
 #endif
                 }
         /* rotate and clear the top bits on machines with 8byte longs */
         data[0]=ROTATE(l,3)&0xffffffffL;
         data[1]=ROTATE(r,3)&0xffffffffL;
         l=r=t=u=0;
         }
 
 void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1,
@@ skipping 31 matching lines @@
         DES_encrypt2((DES_LONG *)data,ks1,DES_DECRYPT);
         l=data[0];
         r=data[1];
         FP(r,l);
         data[0]=l;
         data[1]=r;
         }
 
 #ifndef DES_DEFAULT_OPTIONS
 
-#if !defined(OPENSSL_FIPS_DES_ASM)
-
 #undef CBC_ENC_C__DONT_UPDATE_IV
 #include "ncbc_enc.c" /* DES_ncbc_encrypt */
 
 void DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,
                           long length, DES_key_schedule *ks1,
                           DES_key_schedule *ks2, DES_key_schedule *ks3,
                           DES_cblock *ivec, int enc)
         {
         register DES_LONG tin0,tin1;
         register DES_LONG tout0,tout1,xor0,xor1;
@@ skipping 95 matching lines @@
                         }
 
                 iv = &(*ivec)[0];
                 l2c(xor0,iv);
                 l2c(xor1,iv);
                 }
         tin0=tin1=tout0=tout1=xor0=xor1=0;
         tin[0]=tin[1]=0;
         }
 
-#endif
-
 #endif /* DES_DEFAULT_OPTIONS */