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

openssl/crypto/des/enc_read.c

 /* crypto/des/enc_read.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 45 matching lines @@
  * [including the GNU Public Licence.]
  */
 
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
 #include "des_locl.h"
 
 /* This has some uglies in it but it works - even over sockets. */
 /*extern int errno;*/
-OPENSSL_IMPLEMENT_GLOBAL(int,DES_rw_mode)=DES_PCBC_MODE;
+OPENSSL_IMPLEMENT_GLOBAL(int,DES_rw_mode,DES_PCBC_MODE)
 
 
 /*
  * WARNINGS:
  *
  *  -  The data format used by DES_enc_write() and DES_enc_read()
  *     has a cryptographic weakness: When asked to write more
  *     than MAXWRITE bytes, DES_enc_write will split the data
  *     into several chunks that are all encrypted
  *     using the same IV.  So don't use these functions unless you
  *     are sure you know what you do (in which case you might
  *     not want to use them anyway).
  *
  *  -  This code cannot handle non-blocking sockets.
  *
  *  -  This function uses an internal state and thus cannot be
  *     used on multiple files.
  */
 
 
 int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched,
                  DES_cblock *iv)
         {
+#if defined(OPENSSL_NO_POSIX_IO)
+        return(0);
+#else
         /* data to be unencrypted */
         int net_num=0;
         static unsigned char *net=NULL;
         /* extra unencrypted data 
          * for when a block of 100 comes in but is des_read one byte at
          * a time. */
         static unsigned char *unnet=NULL;
         static int unnet_start=0;
         static int unnet_left=0;
         static unsigned char *tmpbuf=NULL;
@@ skipping 40 matching lines @@
                         }
                 return(i);
                 }
 
         /* We need to get more data. */
         if (len > MAXWRITE) len=MAXWRITE;
 
         /* first - get the length */
         while (net_num < HDRSIZE) 
                 {
-#ifndef _WIN32
+#ifndef OPENSSL_SYS_WIN32
                 i=read(fd,(void *)&(net[net_num]),HDRSIZE-net_num);
 #else
                 i=_read(fd,(void *)&(net[net_num]),HDRSIZE-net_num);
 #endif
 #ifdef EINTR
                 if ((i == -1) && (errno == EINTR)) continue;
 #endif
                 if (i <= 0) return(0);
                 net_num+=i;
                 }
 
         /* we now have at net_num bytes in net */
         p=net;
         /* num=0;  */
         n2l(p,num);
         /* num should be rounded up to the next group of eight
          * we make sure that we have read a multiple of 8 bytes from the net.
          */
         if ((num > MAXWRITE) || (num < 0)) /* error */
                 return(-1);
         rnum=(num < 8)?8:((num+7)/8*8);
 
         net_num=0;
         while (net_num < rnum)
                 {
+#ifndef OPENSSL_SYS_WIN32
                 i=read(fd,(void *)&(net[net_num]),rnum-net_num);
+#else
+                i=_read(fd,(void *)&(net[net_num]),rnum-net_num);
+#endif
 #ifdef EINTR
                 if ((i == -1) && (errno == EINTR)) continue;
 #endif
                 if (i <= 0) return(0);
                 net_num+=i;
                 }
 
         /* Check if there will be data left over. */
         if (len < num)
                 {
@@ skipping 34 matching lines @@
                         {
                         if (DES_rw_mode & DES_PCBC_MODE)
                                 DES_pcbc_encrypt(net,buf,num,sched,iv,
                                                  DES_DECRYPT);
                         else
                                 DES_cbc_encrypt(net,buf,num,sched,iv,
                                                 DES_DECRYPT);
                         }
                 }
         return num;
+#endif /* OPENSSL_NO_POSIX_IO */
         }