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

openssl/crypto/bio/bss_fd.c

 /* crypto/bio/bss_fd.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 42 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 <stdio.h>
 #include <errno.h>
 #define USE_SOCKETS
 #include "cryptlib.h"
+
+#if defined(OPENSSL_NO_POSIX_IO)
+/*
+ * One can argue that one should implement dummy placeholder for
+ * BIO_s_fd here...
+ */
+#else
 /*
  * As for unconditional usage of "UPLINK" interface in this module.
  * Trouble is that unlike Unix file descriptors [which are indexes
  * in kernel-side per-process table], corresponding descriptors on
  * platforms which require "UPLINK" interface seem to be indexes
  * in a user-land, non-global table. Well, in fact they are indexes
  * in stdio _iob[], and recall that _iob[] was the very reason why
  * "UPLINK" interface was introduced in first place. But one way on
  * another. Neither libcrypto or libssl use this BIO meaning that
  * file descriptors can only be provided by application. Therefore
  * "UPLINK" calls are due...
  */
 #include "bio_lcl.h"
 
 static int fd_write(BIO *h, const char *buf, int num);
 static int fd_read(BIO *h, char *buf, int size);
 static int fd_puts(BIO *h, const char *str);
+static int fd_gets(BIO *h, char *buf, int size);
 static long fd_ctrl(BIO *h, int cmd, long arg1, void *arg2);
 static int fd_new(BIO *h);
 static int fd_free(BIO *data);
 int BIO_fd_should_retry(int s);
 
 static BIO_METHOD methods_fdp=
         {
         BIO_TYPE_FD,"file descriptor",
         fd_write,
         fd_read,
         fd_puts,
-        NULL, /* fd_gets, */
+        fd_gets,
         fd_ctrl,
         fd_new,
         fd_free,
         NULL,
         };
 
 BIO_METHOD *BIO_s_fd(void)
         {
         return(&methods_fdp);
         }
@@ skipping 118 matching lines @@
 
 static int fd_puts(BIO *bp, const char *str)
         {
         int n,ret;
 
         n=strlen(str);
         ret=fd_write(bp,str,n);
         return(ret);
         }
 
+static int fd_gets(BIO *bp, char *buf, int size)
+        {
+        int ret=0;
+        char *ptr=buf;
+        char *end=buf+size-1;
+
+        while ( (ptr < end) && (fd_read(bp, ptr, 1) > 0) && (ptr[0] != '\n') )
+                ptr++;
+
+        ptr[0]='\0';
+
+        if (buf[0] != '\0')
+                ret=strlen(buf);
+        return(ret);
+        }
+
 int BIO_fd_should_retry(int i)
         {
         int err;
 
         if ((i == 0) || (i == -1))
                 {
                 err=get_last_sys_error();
 
 #if defined(OPENSSL_SYS_WINDOWS) && 0 /* more microsoft stupidity? perhaps not? Ben 4/1/99 */
                 if ((i == -1) && (err == 0))
@@ skipping 45 matching lines @@
 #ifdef EALREADY
         case EALREADY:
 #endif
                 return(1);
                 /* break; */
         default:
                 break;
                 }
         return(0);
         }
+#endif