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

openssl/apps/speed.c

 /* apps/speed.c -*- mode:C; c-file-style: "eay" -*- */
 /* 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 90 matching lines @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #if !defined(OPENSSL_SYS_MSDOS)
 #include OPENSSL_UNISTD
 #endif
 
 #ifndef OPENSSL_SYS_NETWARE
 #include <signal.h>
 #endif
 
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(OPENSSL_SYS_MACOSX)
-# define USE_TOD
-#elif !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
-# define TIMES
-#endif
-#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) /* FIXME */
-# define TIMEB
-#endif
-
-#if defined(OPENSSL_SYS_NETWARE)
-#undef TIMES
-#undef TIMEB
-#include <time.h>
-#endif
-
-#ifndef _IRIX
-# include <time.h>
-#endif
-#ifdef TIMES
-# include <sys/types.h>
-# include <sys/times.h>
-#endif
-#ifdef USE_TOD
-# include <sys/time.h>
-# include <sys/resource.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
-
-#ifdef TIMEB
-#include <sys/timeb.h>
-#endif
-
-#if !defined(TIMES) && !defined(TIMEB) && !defined(USE_TOD) && !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_NETWARE)
-#error "It seems neither struct tms nor struct timeb is supported in this platform!"
-#endif
-
-#if defined(sun) || defined(__ultrix)
-#define _POSIX_SOURCE
-#include <limits.h>
-#include <sys/param.h>
+#ifdef _WIN32
+#include <windows.h>
 #endif
 
 #include <openssl/bn.h>
 #ifndef OPENSSL_NO_DES
 #include <openssl/des.h>
 #endif
 #ifndef OPENSSL_NO_AES
 #include <openssl/aes.h>
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
@@ skipping 14 matching lines @@
 #ifndef OPENSSL_NO_HMAC
 #include <openssl/hmac.h>
 #endif
 #include <openssl/evp.h>
 #ifndef OPENSSL_NO_SHA
 #include <openssl/sha.h>
 #endif
 #ifndef OPENSSL_NO_RIPEMD
 #include <openssl/ripemd.h>
 #endif
+#ifndef OPENSSL_NO_WHIRLPOOL
+#include <openssl/whrlpool.h>
+#endif
 #ifndef OPENSSL_NO_RC4
 #include <openssl/rc4.h>
 #endif
 #ifndef OPENSSL_NO_RC5
 #include <openssl/rc5.h>
 #endif
 #ifndef OPENSSL_NO_RC2
 #include <openssl/rc2.h>
 #endif
 #ifndef OPENSSL_NO_IDEA
@@ skipping 17 matching lines @@
 #include <openssl/dsa.h>
 #include "./testdsa.h"
 #endif
 #ifndef OPENSSL_NO_ECDSA
 #include <openssl/ecdsa.h>
 #endif
 #ifndef OPENSSL_NO_ECDH
 #include <openssl/ecdh.h>
 #endif
 
-/*
- * The following "HZ" timing stuff should be sync'd up with the code in
- * crypto/tmdiff.[ch]. That appears to try to do the same job, though I think
- * this code is more up to date than libcrypto's so there may be features to
- * migrate over first. This is used in two places further down AFAICS. 
- * The point is that nothing in openssl actually *uses* that tmdiff stuff, so
- * either speed.c should be using it or it should go because it's obviously not
- * useful enough. Anyone want to do a janitorial job on this?
- */
-
-/* The following if from times(3) man page.  It may need to be changed */
-#ifndef HZ
-# if defined(_SC_CLK_TCK) \
-     && (!defined(OPENSSL_SYS_VMS) || __CTRL_VER >= 70000000)
-#  define HZ 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
-
 #ifndef HAVE_FORK
 # if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_NETWARE)
 #  define HAVE_FORK 0
 # else
 #  define HAVE_FORK 1
 # endif
 #endif
 
 #if HAVE_FORK
-# undef NO_FORK
+#undef NO_FORK
 #else
-# define NO_FORK
+#define NO_FORK
 #endif
 
 #undef BUFSIZE
 #define BUFSIZE ((long)1024*8+1)
 int run=0;
 
-static char ftime_used = 0, times_used = 0, gettimeofday_used = 0, getrusage_used = 0;
 static int mr=0;
 static int usertime=1;
 
 static double Time_F(int s);
 static void print_message(const char *s,long num,int length);
 static void pkey_print_message(const char *str, const char *str2,
         long num, int bits, int sec);
 static void print_result(int alg,int run_no,int count,double time_used);
 #ifndef NO_FORK
 static int do_multi(int multi);
 #endif
 
-#define ALGOR_NUM       28
+#define ALGOR_NUM       29
 #define SIZE_NUM        5
 #define RSA_NUM         4
 #define DSA_NUM         3
 
 #define EC_NUM       16
 #define MAX_ECDH_SIZE 256
 
 static const char *names[ALGOR_NUM]={
   "md2","mdc2","md4","md5","hmac(md5)","sha1","rmd160","rc4",
   "des cbc","des ede3","idea cbc","seed cbc",
   "rc2 cbc","rc5-32/12 cbc","blowfish cbc","cast cbc",
   "aes-128 cbc","aes-192 cbc","aes-256 cbc",
   "camellia-128 cbc","camellia-192 cbc","camellia-256 cbc",
-  "evp","sha256","sha512",
+  "evp","sha256","sha512","whirlpool",
   "aes-128 ige","aes-192 ige","aes-256 ige"};
 static double results[ALGOR_NUM][SIZE_NUM];
 static int lengths[SIZE_NUM]={16,64,256,1024,8*1024};
 #ifndef OPENSSL_NO_RSA
 static double rsa_results[RSA_NUM][2];
 #endif
 #ifndef OPENSSL_NO_DSA
 static double dsa_results[DSA_NUM][2];
 #endif
 #ifndef OPENSSL_NO_ECDSA
@@ skipping 22 matching lines @@
         run=0;
 #ifdef LINT
         sig=sig;
 #endif
         }
 #endif
 
 #define START   0
 #define STOP    1
 
-#if defined(OPENSSL_SYS_NETWARE)
+#if defined(_WIN32)
 
-   /* for NetWare the best we can do is use clock() which returns the
-    * time, in hundredths of a second, since the NLM began executing
-   */
+#define SIGALRM
+static unsigned int lapse,schlock;
+static void alarm(unsigned int secs) { lapse = secs*1000; }
+
+static DWORD WINAPI sleepy(VOID *arg)
+        {
+        schlock = 1;
+        Sleep(lapse);
+        run = 0;
+        return 0;
+        }
+
 static double Time_F(int s)
         {
-        double ret;
+        if (s == START)
+                {
+                HANDLE  thr;
+                schlock = 0;
+                thr = CreateThread(NULL,4096,sleepy,NULL,0,NULL);
+                if (thr==NULL)
+                        {
+                        DWORD ret=GetLastError();
+                        BIO_printf(bio_err,"unable to CreateThread (%d)",ret);
+                        ExitProcess(ret);
+                        }
+                CloseHandle(thr);               /* detach the thread    */
+                while (!schlock) Sleep(0);      /* scheduler spinlock   */
+                }
 
-   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);
-   }
-   }
-
+        return app_tminterval(s,usertime);
+        }
 #else
 
 static double Time_F(int s)
         {
-        double ret;
-
-#ifdef USE_TOD
-        if(usertime)
-                {
-                static struct rusage tstart,tend;
-
-                getrusage_used = 1;
-                if (s == START)
-                        {
-                        getrusage(RUSAGE_SELF,&tstart);
-                        return(0);
-                        }
-                else
-                        {
-                        long i;
-
-                        getrusage(RUSAGE_SELF,&tend);
-                        i=(long)tend.ru_utime.tv_usec-(long)tstart.ru_utime.tv_usec;
-                        ret=((double)(tend.ru_utime.tv_sec-tstart.ru_utime.tv_sec))
-                          +((double)i)/1000000.0;
-                        return((ret < 0.001)?0.001:ret);
-                        }
-                }
-        else
-                {
-                static struct timeval tstart,tend;
-                long i;
-
-                gettimeofday_used = 1;
-                if (s == START)
-                        {
-                        gettimeofday(&tstart,NULL);
-                        return(0);
-                        }
-                else
-                        {
-                        gettimeofday(&tend,NULL);
-                        i=(long)tend.tv_usec-(long)tstart.tv_usec;
-                        ret=((double)(tend.tv_sec-tstart.tv_sec))+((double)i)/1000000.0;
-                        return((ret < 0.001)?0.001:ret);
-                        }
-                }
-#else  /* ndef USE_TOD */
-                
-# ifdef TIMES
-        if (usertime)
-                {
-                static struct tms tstart,tend;
-
-                times_used = 1;
-                if (s == START)
-                        {
-                        times(&tstart);
-                        return(0);
-                        }
-                else
-                        {
-                        times(&tend);
-                        ret = HZ;
-                        ret=(double)(tend.tms_utime-tstart.tms_utime) / ret;
-                        return((ret < 1e-3)?1e-3:ret);
-                        }
-                }
-# endif /* times() */
-# if defined(TIMES) && defined(TIMEB)
-        else
-# endif
-# ifdef 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.001)?0.001:ret);
-                        }
-                }
-# elif defined(TIMEB)
-                {
-                static struct timeb tstart,tend;
-                long i;
-
-                ftime_used = 1;
-                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.001)?0.001:ret);
-                        }
-                }
-# endif
+        return app_tminterval(s,usertime);
+        }
 #endif
-        }
-#endif /* if defined(OPENSSL_SYS_NETWARE) */
 
 
 #ifndef OPENSSL_NO_ECDH
 static const int KDF1_SHA1_len = 20;
 static void *KDF1_SHA1(const void *in, size_t inlen, void *out, size_t *outlen)
         {
 #ifndef OPENSSL_NO_SHA
         if (*outlen < SHA_DIGEST_LENGTH)
                 return NULL;
         else
                 *outlen = SHA_DIGEST_LENGTH;
         return SHA1(in, inlen, out);
 #else
         return NULL;
 #endif  /* OPENSSL_NO_SHA */
         }
 #endif  /* OPENSSL_NO_ECDH */
 
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
         {
-#ifndef OPENSSL_NO_ENGINE
-        ENGINE *e = NULL;
-#endif
         unsigned char *buf=NULL,*buf2=NULL;
         int mret=1;
         long count=0,save_count=0;
         int i,j,k;
 #if !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_DSA)
         long rsa_count;
 #endif
 #ifndef OPENSSL_NO_RSA
         unsigned rsa_num;
 #endif
@@ skipping 13 matching lines @@
 #endif
 #ifndef OPENSSL_NO_SHA
         unsigned char sha[SHA_DIGEST_LENGTH];
 #ifndef OPENSSL_NO_SHA256
         unsigned char sha256[SHA256_DIGEST_LENGTH];
 #endif
 #ifndef OPENSSL_NO_SHA512
         unsigned char sha512[SHA512_DIGEST_LENGTH];
 #endif
 #endif
+#ifndef OPENSSL_NO_WHIRLPOOL
+        unsigned char whirlpool[WHIRLPOOL_DIGEST_LENGTH];
+#endif
 #ifndef OPENSSL_NO_RIPEMD
         unsigned char rmd160[RIPEMD160_DIGEST_LENGTH];
 #endif
 #ifndef OPENSSL_NO_RC4
         RC4_KEY rc4_ks;
 #endif
 #ifndef OPENSSL_NO_RC5
         RC5_32_KEY rc5_ks;
 #endif
 #ifndef OPENSSL_NO_RC2
@@ skipping 37 matching lines @@
                  0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34,0x56};
 #endif
 #ifndef OPENSSL_NO_AES
 #define MAX_BLOCK_SIZE 128
 #else
 #define MAX_BLOCK_SIZE 64
 #endif
         unsigned char DES_iv[8];
         unsigned char iv[2*MAX_BLOCK_SIZE/8];
 #ifndef OPENSSL_NO_DES
-        DES_cblock *buf_as_des_cblock = NULL;
         static DES_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0};
         static DES_cblock key2={0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12};
         static DES_cblock key3={0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34};
         DES_key_schedule sch;
         DES_key_schedule sch2;
         DES_key_schedule sch3;
 #endif
 #ifndef OPENSSL_NO_AES
         AES_KEY aes_ks1, aes_ks2, aes_ks3;
 #endif
@@ skipping 18 matching lines @@
 #define D_CBC_CAST      15
 #define D_CBC_128_AES   16
 #define D_CBC_192_AES   17
 #define D_CBC_256_AES   18
 #define D_CBC_128_CML   19 
 #define D_CBC_192_CML   20
 #define D_CBC_256_CML   21 
 #define D_EVP           22
 #define D_SHA256        23      
 #define D_SHA512        24
-#define D_IGE_128_AES   25
-#define D_IGE_192_AES   26
-#define D_IGE_256_AES   27
+#define D_WHIRLPOOL     25
+#define D_IGE_128_AES   26
+#define D_IGE_192_AES   27
+#define D_IGE_256_AES   28
         double d=0.0;
         long c[ALGOR_NUM][SIZE_NUM];
 #define R_DSA_512       0
 #define R_DSA_1024      1
 #define R_DSA_2048      2
 #define R_RSA_512       0
 #define R_RSA_1024      1
 #define R_RSA_2048      2
 #define R_RSA_4096      3
 
@@ skipping 151 matching lines @@
         memset(rsa_key,0,sizeof(rsa_key));
         for (i=0; i<RSA_NUM; i++)
                 rsa_key[i]=NULL;
 #endif
 
         if ((buf=(unsigned char *)OPENSSL_malloc((int)BUFSIZE)) == NULL)
                 {
                 BIO_printf(bio_err,"out of memory\n");
                 goto end;
                 }
-#ifndef OPENSSL_NO_DES
-        buf_as_des_cblock = (DES_cblock *)buf;
-#endif
         if ((buf2=(unsigned char *)OPENSSL_malloc((int)BUFSIZE)) == NULL)
                 {
                 BIO_printf(bio_err,"out of memory\n");
                 goto end;
                 }
 
         memset(c,0,sizeof(c));
         memset(DES_iv,0,sizeof(DES_iv));
         memset(iv,0,sizeof(iv));
 
@@ skipping 54 matching lines @@
 #ifndef OPENSSL_NO_ENGINE
                 else if ((argc > 0) && (strcmp(*argv,"-engine") == 0))
                         {
                         argc--;
                         argv++;
                         if(argc == 0)
                                 {
                                 BIO_printf(bio_err,"no engine given\n");
                                 goto end;
                                 }
-                        e = setup_engine(bio_err, *argv, 0);
+                        setup_engine(bio_err, *argv, 0);
                         /* j will be increased again further down.  We just
                            don't want speed to confuse an engine with an
                            algorithm, especially when none is given (which
                            means all of them should be run) */
                         j--;
                         }
 #endif
 #ifndef NO_FORK
                 else if ((argc > 0) && (strcmp(*argv,"-multi") == 0))
                         {
@@ skipping 50 matching lines @@
                 else
 #ifndef OPENSSL_NO_SHA256
                         if (strcmp(*argv,"sha256") == 0) doit[D_SHA256]=1;
                 else
 #endif
 #ifndef OPENSSL_NO_SHA512
                         if (strcmp(*argv,"sha512") == 0) doit[D_SHA512]=1;
                 else
 #endif
 #endif
+#ifndef OPENSSL_NO_WHIRLPOOL
+                        if (strcmp(*argv,"whirlpool") == 0) doit[D_WHIRLPOOL]=1;
+                else
+#endif
 #ifndef OPENSSL_NO_RIPEMD
                         if (strcmp(*argv,"ripemd") == 0) doit[D_RMD160]=1;
                 else
                         if (strcmp(*argv,"rmd160") == 0) doit[D_RMD160]=1;
                 else
                         if (strcmp(*argv,"ripemd160") == 0) doit[D_RMD160]=1;
                 else
 #endif
 #ifndef OPENSSL_NO_RC4
                         if (strcmp(*argv,"rc4") == 0) doit[D_RC4]=1;
@@ skipping 191 matching lines @@
 #endif
 #ifndef OPENSSL_NO_SHA1
                         BIO_printf(bio_err,"sha1     ");
 #endif
 #ifndef OPENSSL_NO_SHA256
                         BIO_printf(bio_err,"sha256   ");
 #endif
 #ifndef OPENSSL_NO_SHA512
                         BIO_printf(bio_err,"sha512   ");
 #endif
+#ifndef OPENSSL_NO_WHIRLPOOL
+                        BIO_printf(bio_err,"whirlpool");
+#endif
 #ifndef OPENSSL_NO_RIPEMD160
                         BIO_printf(bio_err,"rmd160");
 #endif
 #if !defined(OPENSSL_NO_MD2) || !defined(OPENSSL_NO_MDC2) || \
     !defined(OPENSSL_NO_MD4) || !defined(OPENSSL_NO_MD5) || \
-    !defined(OPENSSL_NO_SHA1) || !defined(OPENSSL_NO_RIPEMD160)
+    !defined(OPENSSL_NO_SHA1) || !defined(OPENSSL_NO_RIPEMD160) || \
+    !defined(OPENSSL_NO_WHIRLPOOL)
                         BIO_printf(bio_err,"\n");
 #endif
 
 #ifndef OPENSSL_NO_IDEA
                         BIO_printf(bio_err,"idea-cbc ");
 #endif
 #ifndef OPENSSL_NO_SEED
                         BIO_printf(bio_err,"seed-cbc ");
 #endif
 #ifndef OPENSSL_NO_RC2
@@ skipping 106 matching lines @@
                 {
                 for (i=0; i<ALGOR_NUM; i++)
                         {
                         if (i != D_EVP)
                                 doit[i]=1;
                         }
                 for (i=0; i<RSA_NUM; i++)
                         rsa_doit[i]=1;
                 for (i=0; i<DSA_NUM; i++)
                         dsa_doit[i]=1;
+#ifndef OPENSSL_NO_ECDSA
+                for (i=0; i<EC_NUM; i++)
+                        ecdsa_doit[i]=1;
+#endif
+#ifndef OPENSSL_NO_ECDH
+                for (i=0; i<EC_NUM; i++)
+                        ecdh_doit[i]=1;
+#endif
                 }
         for (i=0; i<ALGOR_NUM; i++)
                 if (doit[i]) pr_header++;
 
         if (usertime == 0 && !mr)
                 BIO_printf(bio_err,"You have chosen to measure elapsed time instead of user CPU time.\n");
-        if (usertime <= 0 && !mr)
-                {
-                BIO_printf(bio_err,"To get the most accurate results, try to run this\n");
-                BIO_printf(bio_err,"program when this computer is idle.\n");
-                }
 
 #ifndef OPENSSL_NO_RSA
         for (i=0; i<RSA_NUM; i++)
                 {
                 const unsigned char *p;
 
                 p=rsa_data[i];
                 rsa_key[i]=d2i_RSAPrivateKey(NULL,&p,rsa_data_length[i]);
                 if (rsa_key[i] == NULL)
                         {
@@ skipping 60 matching lines @@
 #endif
 #ifndef SIGALRM
 #ifndef OPENSSL_NO_DES
         BIO_printf(bio_err,"First we calculate the approximate speed ...\n");
         count=10;
         do      {
                 long it;
                 count*=2;
                 Time_F(START);
                 for (it=count; it; it--)
-                        DES_ecb_encrypt(buf_as_des_cblock,buf_as_des_cblock,
+                        DES_ecb_encrypt((DES_cblock *)buf,
+                                (DES_cblock *)buf,
                                 &sch,DES_ENCRYPT);
                 d=Time_F(STOP);
                 } while (d <3);
         save_count=count;
         c[D_MD2][0]=count/10;
         c[D_MDC2][0]=count/10;
         c[D_MD4][0]=count;
         c[D_MD5][0]=count;
         c[D_HMAC][0]=count;
         c[D_SHA1][0]=count;
         c[D_RMD160][0]=count;
         c[D_RC4][0]=count*5;
         c[D_CBC_DES][0]=count;
         c[D_EDE3_DES][0]=count/3;
         c[D_CBC_IDEA][0]=count;
         c[D_CBC_SEED][0]=count;
         c[D_CBC_RC2][0]=count;
         c[D_CBC_RC5][0]=count;
         c[D_CBC_BF][0]=count;
         c[D_CBC_CAST][0]=count;
         c[D_CBC_128_AES][0]=count;
         c[D_CBC_192_AES][0]=count;
         c[D_CBC_256_AES][0]=count;
         c[D_CBC_128_CML][0]=count;
         c[D_CBC_192_CML][0]=count;
         c[D_CBC_256_CML][0]=count;
         c[D_SHA256][0]=count;
         c[D_SHA512][0]=count;
+        c[D_WHIRLPOOL][0]=count;
         c[D_IGE_128_AES][0]=count;
         c[D_IGE_192_AES][0]=count;
         c[D_IGE_256_AES][0]=count;
 
         for (i=1; i<SIZE_NUM; i++)
                 {
                 c[D_MD2][i]=c[D_MD2][0]*4*lengths[0]/lengths[i];
                 c[D_MDC2][i]=c[D_MDC2][0]*4*lengths[0]/lengths[i];
                 c[D_MD4][i]=c[D_MD4][0]*4*lengths[0]/lengths[i];
                 c[D_MD5][i]=c[D_MD5][0]*4*lengths[0]/lengths[i];
                 c[D_HMAC][i]=c[D_HMAC][0]*4*lengths[0]/lengths[i];
                 c[D_SHA1][i]=c[D_SHA1][0]*4*lengths[0]/lengths[i];
                 c[D_RMD160][i]=c[D_RMD160][0]*4*lengths[0]/lengths[i];
                 c[D_SHA256][i]=c[D_SHA256][0]*4*lengths[0]/lengths[i];
                 c[D_SHA512][i]=c[D_SHA512][0]*4*lengths[0]/lengths[i];
+                c[D_WHIRLPOOL][i]=c[D_WHIRLPOOL][0]*4*lengths[0]/lengths[i];
                 }
         for (i=1; i<SIZE_NUM; i++)
                 {
                 long l0,l1;
 
                 l0=(long)lengths[i-1];
                 l1=(long)lengths[i];
                 c[D_RC4][i]=c[D_RC4][i-1]*l0/l1;
                 c[D_CBC_DES][i]=c[D_CBC_DES][i-1]*l0/l1;
                 c[D_EDE3_DES][i]=c[D_EDE3_DES][i-1]*l0/l1;
@@ skipping 163 matching lines @@
 
 #define COND(d) (count < (d))
 #define COUNT(d) (d)
 #else
 /* not worth fixing */
 # error "You cannot disable DES on systems without SIGALRM."
 #endif /* OPENSSL_NO_DES */
 #else
 #define COND(c) (run)
 #define COUNT(d) (count)
+#ifndef _WIN32
         signal(SIGALRM,sig_done);
+#endif
 #endif /* SIGALRM */
 
 #ifndef OPENSSL_NO_MD2
         if (doit[D_MD2])
                 {
                 for (j=0; j<SIZE_NUM; j++)
                         {
                         print_message(names[D_MD2],c[D_MD2][j],lengths[j]);
                         Time_F(START);
                         for (count=0,run=1; COND(c[D_MD2][j]); count++)
@@ skipping 109 matching lines @@
                         {
                         print_message(names[D_SHA512],c[D_SHA512][j],lengths[j]);
                         Time_F(START);
                         for (count=0,run=1; COND(c[D_SHA512][j]); count++)
                                 SHA512(buf,lengths[j],sha512);
                         d=Time_F(STOP);
                         print_result(D_SHA512,j,count,d);
                         }
                 }
 #endif
+#endif
+
+#ifndef OPENSSL_NO_WHIRLPOOL
+        if (doit[D_WHIRLPOOL])
+                {
+                for (j=0; j<SIZE_NUM; j++)
+                        {
+                        print_message(names[D_WHIRLPOOL],c[D_WHIRLPOOL][j],lengths[j]);
+                        Time_F(START);
+                        for (count=0,run=1; COND(c[D_WHIRLPOOL][j]); count++)
+                                WHIRLPOOL(buf,lengths[j],whirlpool);
+                        d=Time_F(STOP);
+                        print_result(D_WHIRLPOOL,j,count,d);
+                        }
+                }
+#endif
 
-#endif
 #ifndef OPENSSL_NO_RIPEMD
         if (doit[D_RMD160])
                 {
                 for (j=0; j<SIZE_NUM; j++)
                         {
                         print_message(names[D_RMD160],c[D_RMD160][j],lengths[j]);
                         Time_F(START);
                         for (count=0,run=1; COND(c[D_RMD160][j]); count++)
                                 EVP_Digest(buf,(unsigned long)lengths[j],&(rmd160[0]),NULL,EVP_ripemd160(),NULL);
                         d=Time_F(STOP);
@@ skipping 83 matching lines @@
                         Time_F(START);
                         for (count=0,run=1; COND(c[D_CBC_256_AES][j]); count++)
                                 AES_cbc_encrypt(buf,buf,
                                         (unsigned long)lengths[j],&aes_ks3,
                                         iv,AES_ENCRYPT);
                         d=Time_F(STOP);
                         print_result(D_CBC_256_AES,j,count,d);
                         }
                 }
 
+#if 0 /* ANDROID */
         if (doit[D_IGE_128_AES])
                 {
                 for (j=0; j<SIZE_NUM; j++)
                         {
                         print_message(names[D_IGE_128_AES],c[D_IGE_128_AES][j],lengths[j]);
                         Time_F(START);
                         for (count=0,run=1; COND(c[D_IGE_128_AES][j]); count++)
                                 AES_ige_encrypt(buf,buf2,
                                         (unsigned long)lengths[j],&aes_ks1,
                                         iv,AES_ENCRYPT);
@@ skipping 22 matching lines @@
                         print_message(names[D_IGE_256_AES],c[D_IGE_256_AES][j],lengths[j]);
                         Time_F(START);
                         for (count=0,run=1; COND(c[D_IGE_256_AES][j]); count++)
                                 AES_ige_encrypt(buf,buf2,
                                         (unsigned long)lengths[j],&aes_ks3,
                                         iv,AES_ENCRYPT);
                         d=Time_F(STOP);
                         print_result(D_IGE_256_AES,j,count,d);
                         }
                 }
+
+
+#endif
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
         if (doit[D_CBC_128_CML])
                 {
                 for (j=0; j<SIZE_NUM; j++)
                         {
                         print_message(names[D_CBC_128_CML],c[D_CBC_128_CML][j],lengths[j]);
                         Time_F(START);
                         for (count=0,run=1; COND(c[D_CBC_128_CML][j]); count++)
                                 Camellia_cbc_encrypt(buf,buf,
@@ skipping 592 matching lines @@
 #ifndef OPENSSL_NO_AES
                 printf("%s ",AES_options());
 #endif
 #ifndef OPENSSL_NO_IDEA
                 printf("%s ",idea_options());
 #endif
 #ifndef OPENSSL_NO_BF
                 printf("%s ",BF_options());
 #endif
                 fprintf(stdout,"\n%s\n",SSLeay_version(SSLEAY_CFLAGS));
-                printf("available timing options: ");
-#ifdef TIMES
-                printf("TIMES ");
-#endif
-#ifdef TIMEB
-                printf("TIMEB ");
-#endif
-#ifdef USE_TOD
-                printf("USE_TOD ");
-#endif
-#ifdef HZ
-#define as_string(s) (#s)
-                {
-                double dbl = HZ;
-                printf("HZ=%g", dbl);
-                }
-# ifdef _SC_CLK_TCK
-                printf(" [sysconf value]");
-# endif
-#endif
-                printf("\n");
-                printf("timing function used: %s%s%s%s%s%s%s\n",
-                       (ftime_used ? "ftime" : ""),
-                       (ftime_used + times_used > 1 ? "," : ""),
-                       (times_used ? "times" : ""),
-                       (ftime_used + times_used + gettimeofday_used > 1 ? "," : ""),
-                       (gettimeofday_used ? "gettimeofday" : ""),
-                       (ftime_used + times_used + gettimeofday_used + getrusage_used > 1 ? "," : ""),
-                       (getrusage_used ? "getrusage" : ""));
                 }
 
         if (pr_header)
                 {
                 if(mr)
                         fprintf(stdout,"+H");
                 else
                         {
                         fprintf(stdout,"The 'numbers' are in 1000s of bytes per second processed.\n"); 
                         fprintf(stdout,"type        ");
@@ skipping 236 matching lines @@
                         fds[n]=fd[0];
                         }
                 else
                         {
                         close(fd[0]);
                         close(1);
                         dup(fd[1]);
                         close(fd[1]);
                         mr=1;
                         usertime=0;
+                        free(fds);
                         return 0;
                         }
                 printf("Forked child %d\n",n);
                 }
 
         /* for now, assume the pipe is long enough to take all the output */
         for(n=0 ; n < multi ; ++n)
                 {
                 FILE *f;
                 char buf[1024];
@@ skipping 58 matching lines @@
                                         rsa_results[k][0]=1/(1/rsa_results[k][0]+1/d);
                                 else
                                         rsa_results[k][0]=d;
 
                                 d=atof(sstrsep(&p,sep));
                                 if(n)
                                         rsa_results[k][1]=1/(1/rsa_results[k][1]+1/d);
                                 else
                                         rsa_results[k][1]=d;
                                 }
+#ifndef OPENSSL_NO_DSA
                         else if(!strncmp(buf,"+F3:",4))
                                 {
                                 int k;
                                 double d;
                                 
                                 p=buf+4;
                                 k=atoi(sstrsep(&p,sep));
                                 sstrsep(&p,sep);
 
                                 d=atof(sstrsep(&p,sep));
                                 if(n)
                                         dsa_results[k][0]=1/(1/dsa_results[k][0]+1/d);
                                 else
                                         dsa_results[k][0]=d;
 
                                 d=atof(sstrsep(&p,sep));
                                 if(n)
                                         dsa_results[k][1]=1/(1/dsa_results[k][1]+1/d);
                                 else
                                         dsa_results[k][1]=d;
                                 }
+#endif
 #ifndef OPENSSL_NO_ECDSA
                         else if(!strncmp(buf,"+F4:",4))
                                 {
                                 int k;
                                 double d;
                                 
                                 p=buf+4;
                                 k=atoi(sstrsep(&p,sep));
                                 sstrsep(&p,sep);
 
@@ skipping 29 matching lines @@
 
                                 }
 #endif
 
                         else if(!strncmp(buf,"+H:",3))
                                 {
                                 }
                         else
                                 fprintf(stderr,"Unknown type '%s' from child %d\n",buf,n);
                         }
+
+                fclose(f);
                 }
+        free(fds);
         return 1;
         }
 #endif
 #endif