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

openssl/apps/s_time.c

 /* apps/s_time.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 67 matching lines @@
 #include "s_apps.h"
 #include <openssl/err.h>
 #ifdef WIN32_STUFF
 #include "winmain.h"
 #include "wintext.h"
 #endif
 #if !defined(OPENSSL_SYS_MSDOS)
 #include OPENSSL_UNISTD
 #endif
 
-#if !defined(OPENSSL_SYS_NETWARE) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
-#define TIMES
-#endif
-
-#ifndef _IRIX
-#include <time.h>
-#endif
-#ifdef TIMES
-#include <sys/types.h>
-#include <sys/times.h>
-#endif
-
-/* Depending on the VMS version, the tms structure is perhaps defined.
-   The __TMS macro will show if it was.  If it wasn't defined, we should
-   undefine TIMES, since that tells the rest of the program how things
-   should be handled.                           -- Richard Levitte */
-#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS)
-#undef TIMES
-#endif
-
-#if !defined(TIMES) && !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_NETWARE)
-#include <sys/timeb.h>
-#endif
-
-#if defined(sun) || defined(__ultrix)
-#define _POSIX_SOURCE
-#include <limits.h>
-#include <sys/param.h>
-#endif
-
-/* The following if from times(3) man page.  It may need to be changed
-*/
-#ifndef HZ
-# ifdef _SC_CLK_TCK
-#  define HZ ((double)sysconf(_SC_CLK_TCK))
-# else
-#  ifndef CLK_TCK
-#   ifndef _BSD_CLK_TCK_ /* FreeBSD hack */
-#    define HZ  100.0
-#   else /* _BSD_CLK_TCK_ */
-#    define HZ ((double)_BSD_CLK_TCK_)
-#   endif
-#  else /* CLK_TCK */
-#   define HZ ((double)CLK_TCK)
-#  endif
-# endif
-#endif
-
 #undef PROG
 #define PROG s_time_main
 
 #undef ioctl
 #define ioctl ioctlsocket
 
 #define SSL_CONNECT_NAME        "localhost:4433"
 
 /*#define TEST_CERT "client.pem" */ /* no default cert. */
 
@@ skipping 24 matching lines @@
 /* static char *port=PORT_STR;*/
 static char *host=SSL_CONNECT_NAME;
 static char *t_cert_file=NULL;
 static char *t_key_file=NULL;
 static char *CApath=NULL;
 static char *CAfile=NULL;
 static char *tm_cipher=NULL;
 static int tm_verify = SSL_VERIFY_NONE;
 static int maxTime = SECONDS;
 static SSL_CTX *tm_ctx=NULL;
-static SSL_METHOD *s_time_meth=NULL;
+static const SSL_METHOD *s_time_meth=NULL;
 static char *s_www_path=NULL;
 static long bytes_read=0; 
 static int st_bugs=0;
 static int perform=0;
 #ifdef FIONBIO
 static int t_nbio=0;
 #endif
 #ifdef OPENSSL_SYS_WIN32
 static int exitNow = 0;         /* Set when it's time to exit main */
 #endif
@@ skipping 174 matching lines @@
 }
 
 /***********************************************************************
  * TIME - time functions
  */
 #define START   0
 #define STOP    1
 
 static double tm_Time_F(int s)
         {
-        static double ret;
-#ifdef TIMES
-        static struct tms tstart,tend;
-
-        if(s == START) {
-                times(&tstart);
-                return(0);
-        } else {
-                times(&tend);
-                ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
-                return((ret == 0.0)?1e-6:ret);
+        return app_tminterval(s,1);
         }
-#elif defined(OPENSSL_SYS_NETWARE)
-    static clock_t tstart,tend;
-
-    if (s == START)
-    {
-        tstart=clock();
-        return(0);
-    }
-    else
-    {
-        tend=clock();
-        ret=(double)((double)(tend)-(double)(tstart));
-        return((ret < 0.001)?0.001:ret);
-    }
-#elif defined(OPENSSL_SYS_VXWORKS)
-        {
-        static unsigned long tick_start, tick_end;
-
-        if( s == START )
-                {
-                tick_start = tickGet();
-                return 0;
-                }
-        else
-                {
-                tick_end = tickGet();
-                ret = (double)(tick_end - tick_start) / (double)sysClkRateGet();
-                return((ret == 0.0)?1e-6:ret);
-                }
-        }
-#else /* !times() */
-        static struct timeb tstart,tend;
-        long i;
-
-        if(s == START) {
-                ftime(&tstart);
-                return(0);
-        } else {
-                ftime(&tend);
-                i=(long)tend.millitm-(long)tstart.millitm;
-                ret=((double)(tend.time-tstart.time))+((double)i)/1000.0;
-                return((ret == 0.0)?1e-6:ret);
-        }
-#endif
-}
 
 /***********************************************************************
  * MAIN - main processing area for client
  *                      real name depends on MONOLITH
  */
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
         {
         double totalTime = 0.0;
@@ skipping 255 matching lines @@
         /* ok, lets connect */
         for(;;) {
                 i=SSL_connect(serverCon);
                 if (BIO_sock_should_retry(i))
                         {
                         BIO_printf(bio_err,"DELAY\n");
 
                         i=SSL_get_fd(serverCon);
                         width=i+1;
                         FD_ZERO(&readfds);
-                        FD_SET(i,&readfds);
+                        openssl_fdset(i,&readfds);
                         /* Note: under VMS with SOCKETSHR the 2nd parameter
                          * is currently of type (int *) whereas under other
                          * systems it is (void *) if you don't have a cast it
                          * will choke the compiler: if you do have a cast then
                          * you can either go for (int *) or (void *).
                          */
                         select(width,(void *)&readfds,NULL,NULL,NULL);
                         continue;
                         }
                 break;
                 }
         if(i <= 0)
                 {
                 BIO_printf(bio_err,"ERROR\n");
                 if (verify_error != X509_V_OK)
                         BIO_printf(bio_err,"verify error:%s\n",
                                 X509_verify_cert_error_string(verify_error));
                 else
                         ERR_print_errors(bio_err);
                 if (scon == NULL)
                         SSL_free(serverCon);
                 return NULL;
                 }
 
         return serverCon;
         }