make depend
[openssl.git] / apps / speed.c
index 7010681..9232418 100644 (file)
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * Portions of the attached software ("Contribution") are developed by 
+ * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
+ *
+ * The Contribution is licensed pursuant to the OpenSSL open source
+ * license provided above.
+ *
+ * The ECDH and ECDSA speed test software is originally written by 
+ * Sumit Gupta of Sun Microsystems Laboratories.
+ *
+ */
 
 /* most of this code has been pilfered from my libdes speed.c program */
 
+#ifndef OPENSSL_NO_SPEED
+
 #undef SECONDS
 #define SECONDS                3       
 #define RSA_SECONDS    10
 #define DSA_SECONDS    10
+#define ECDSA_SECONDS   10
+#define ECDH_SECONDS    10
 
 /* 11-Sep-92 Andrew Daviel   Support for Silicon Graphics IRIX added */
 /* 06-Apr-92 Luke Brennan    Support for VMS and add extra signal calls */
@@ -71,7 +88,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <signal.h>
+
 #include <string.h>
 #include <math.h>
 #include "apps.h"
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
+#if !defined(OPENSSL_SYS_MSDOS)
 #include OPENSSL_UNISTD
-
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(OPENSSL_SYS_MACOSX)
-# define USE_TOD
-#elif !defined(OPENSSL_SYS_MSDOS) && (!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__) /* FIXME */
-# define TIMEB
-#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
+#ifndef OPENSSL_SYS_NETWARE
+#include <signal.h>
 #endif
 
-#ifdef TIMEB
-#include <sys/timeb.h>
+#if defined(_WIN32) || defined(__CYGWIN__)
+#include <windows.h>
+# if defined(__CYGWIN__) && !defined(_WIN32)
+  /* <windows.h> should define _WIN32, which normally is mutually
+   * exclusive with __CYGWIN__, but if it didn't... */
+#  define _WIN32
+  /* this is done because Cygwin alarm() fails sometimes. */
+# endif
 #endif
 
-#if !defined(TIMES) && !defined(TIMEB) && !defined(USE_TOD)
-#error "It seems neither struct tms nor struct timeb is supported in this platform!"
+#include <openssl/bn.h>
+#ifndef OPENSSL_NO_DES
+#include <openssl/des.h>
 #endif
-
-#if defined(sun) || defined(__ultrix)
-#define _POSIX_SOURCE
-#include <limits.h>
-#include <sys/param.h>
+#ifndef OPENSSL_NO_AES
+#include <openssl/aes.h>
 #endif
-
-#ifndef OPENSSL_NO_DES
-#include <openssl/des_old.h>
+#ifndef OPENSSL_NO_CAMELLIA
+#include <openssl/camellia.h>
 #endif
 #ifndef OPENSSL_NO_MD2
 #include <openssl/md2.h>
 #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_IDEA
 #include <openssl/idea.h>
 #endif
+#ifndef OPENSSL_NO_SEED
+#include <openssl/seed.h>
+#endif
 #ifndef OPENSSL_NO_BF
 #include <openssl/blowfish.h>
 #endif
 #endif
 #include <openssl/x509.h>
 #ifndef OPENSSL_NO_DSA
+#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
+#include <openssl/modes.h>
 
-/* 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))
+#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
-#  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
+#  define HAVE_FORK 1
 # endif
 #endif
 
-#if !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MACINTOSH_CLASSIC) && !defined(OPENSSL_SYS_OS2)
-# define HAVE_FORK 1
+#if HAVE_FORK
+#undef NO_FORK
+#else
+#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(char *str,char *str2,long num,int bits,int sec);
+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);
-#ifdef HAVE_FORK
+#ifndef NO_FORK
 static int do_multi(int multi);
 #endif
-#ifdef SIGALRM
-#if defined(__STDC__) || defined(sgi) || defined(_AIX)
-#define SIGRETTYPE void
-#else
-#define SIGRETTYPE int
-#endif 
 
-#define ALGOR_NUM      16
+#define ALGOR_NUM      30
 #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",
-  "rc2 cbc","rc5-32/12 cbc","blowfish cbc","cast cbc"};
+  "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","whirlpool",
+  "aes-128 ige","aes-192 ige","aes-256 ige","ghash" };
 static double results[ALGOR_NUM][SIZE_NUM];
-static int lengths[SIZE_NUM]={8,64,256,1024,8*1024};
+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
+static double ecdsa_results[EC_NUM][2];
+#endif
+#ifndef OPENSSL_NO_ECDH
+static double ecdh_results[EC_NUM][1];
+#endif
+
+#if defined(OPENSSL_NO_DSA) && !(defined(OPENSSL_NO_ECDSA) && defined(OPENSSL_NO_ECDH))
+static const char rnd_seed[] = "string to make the random number generator think it has entropy";
+static int rnd_fake = 0;
+#endif
+
+#ifdef SIGALRM
+#if defined(__STDC__) || defined(sgi) || defined(_AIX)
+#define SIGRETTYPE void
+#else
+#define SIGRETTYPE int
+#endif 
 
 static SIGRETTYPE sig_done(int sig);
 static SIGRETTYPE sig_done(int sig)
@@ -250,110 +278,93 @@ static SIGRETTYPE sig_done(int sig)
 #define START  0
 #define STOP   1
 
+#if defined(_WIN32)
+
+#if !defined(SIGALRM)
+# define SIGALRM
+#endif
+static unsigned int lapse,schlock;
+static void alarm_win32(unsigned int secs) { lapse = secs*1000; }
+#define alarm alarm_win32
+
+static DWORD WINAPI sleepy(VOID *arg)
+       {
+       schlock = 1;
+       Sleep(lapse);
+       run = 0;
+       return 0;
+       }
+
 static double Time_F(int s)
        {
        double ret;
+       static HANDLE thr;
 
-#ifdef USE_TOD
-       if(usertime)
-           {
-               static struct rusage tstart,tend;
-
-               getrusage_used = 1;
-               if (s == START)
-                       {
-                       getrusage(RUSAGE_SELF,&tstart);
-                       return(0);
-                       }
-               else
+       if (s == START)
+               {
+               schlock = 0;
+               thr = CreateThread(NULL,4096,sleepy,NULL,0,NULL);
+               if (thr==NULL)
                        {
-                       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);
+                       DWORD ret=GetLastError();
+                       BIO_printf(bio_err,"unable to CreateThread (%d)",ret);
+                       ExitProcess(ret);
                        }
+               while (!schlock) Sleep(0);      /* scheduler spinlock   */
+               ret = app_tminterval(s,usertime);
                }
        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);
-                       }
+               ret = app_tminterval(s,usertime);
+               if (run) TerminateThread(thr,0);
+               CloseHandle(thr);
                }
-#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=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
-                       return((ret < 1e-3)?1e-3:ret);
-                       }
-               }
-# endif /* times() */
-# if defined(TIMES) && defined(TIMEB)
-       else
-# endif
-# ifdef TIMEB
-               {
-               static struct timeb tstart,tend;
-               long i;
+       return ret;
+       }
+#else
 
-               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
+static double Time_F(int s)
+       {
+       double ret = app_tminterval(s,usertime);
+       if (s == STOP) alarm(0);
+       return ret;
+       }
 #endif
+
+
+#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)
        {
-       ENGINE *e;
        unsigned char *buf=NULL,*buf2=NULL;
        int mret=1;
-       long count,rsa_count,save_count=0;
+       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
+       unsigned char md[EVP_MAX_MD_SIZE];
 #ifndef OPENSSL_NO_MD2
        unsigned char md2[MD2_DIGEST_LENGTH];
 #endif
@@ -369,6 +380,15 @@ int MAIN(int argc, char **argv)
 #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];
@@ -385,25 +405,61 @@ int MAIN(int argc, char **argv)
 #ifndef OPENSSL_NO_IDEA
        IDEA_KEY_SCHEDULE idea_ks;
 #endif
+#ifndef OPENSSL_NO_SEED
+       SEED_KEY_SCHEDULE seed_ks;
+#endif
 #ifndef OPENSSL_NO_BF
        BF_KEY bf_ks;
 #endif
 #ifndef OPENSSL_NO_CAST
        CAST_KEY cast_ks;
 #endif
-       static unsigned char key16[16]=
+       static const unsigned char key16[16]=
                {0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
                 0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12};
-       unsigned char iv[8];
+#ifndef OPENSSL_NO_AES
+       static const unsigned char key24[24]=
+               {0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
+                0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,
+                0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34};
+       static const unsigned char key32[32]=
+               {0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
+                0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,
+                0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34,
+                0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34,0x56};
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+       static const unsigned char ckey24[24]=
+               {0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
+                0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,
+                0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34};
+       static const unsigned char ckey32[32]=
+               {0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
+                0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,
+                0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34,
+                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};
+       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
+#ifndef OPENSSL_NO_CAMELLIA
+       CAMELLIA_KEY camellia_ks1, camellia_ks2, camellia_ks3;
+#endif
 #define        D_MD2           0
 #define        D_MDC2          1
 #define        D_MD4           2
@@ -415,12 +471,26 @@ int MAIN(int argc, char **argv)
 #define        D_CBC_DES       8
 #define        D_EDE3_DES      9
 #define        D_CBC_IDEA      10
-#define        D_CBC_RC2       11
-#define        D_CBC_RC5       12
-#define        D_CBC_BF        13
-#define        D_CBC_CAST      14
-#define D_EVP          15
-       double d;
+#define        D_CBC_SEED      11
+#define        D_CBC_RC2       12
+#define        D_CBC_RC5       13
+#define        D_CBC_BF        14
+#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_WHIRLPOOL    25
+#define D_IGE_128_AES   26
+#define D_IGE_192_AES   27
+#define D_IGE_256_AES   28
+#define D_GHASH                29
+       double d=0.0;
        long c[ALGOR_NUM][SIZE_NUM];
 #define        R_DSA_512       0
 #define        R_DSA_1024      1
@@ -429,6 +499,24 @@ int MAIN(int argc, char **argv)
 #define        R_RSA_1024      1
 #define        R_RSA_2048      2
 #define        R_RSA_4096      3
+
+#define R_EC_P160    0
+#define R_EC_P192    1 
+#define R_EC_P224    2
+#define R_EC_P256    3
+#define R_EC_P384    4
+#define R_EC_P521    5
+#define R_EC_K163    6
+#define R_EC_K233    7
+#define R_EC_K283    8
+#define R_EC_K409    9
+#define R_EC_K571    10
+#define R_EC_B163    11
+#define R_EC_B233    12
+#define R_EC_B283    13
+#define R_EC_B409    14
+#define R_EC_B571    15
+
 #ifndef OPENSSL_NO_RSA
        RSA *rsa_key[RSA_NUM];
        long rsa_c[RSA_NUM][2];
@@ -444,13 +532,93 @@ int MAIN(int argc, char **argv)
        long dsa_c[DSA_NUM][2];
        static unsigned int dsa_bits[DSA_NUM]={512,1024,2048};
 #endif
+#ifndef OPENSSL_NO_EC
+       /* We only test over the following curves as they are representative, 
+        * To add tests over more curves, simply add the curve NID
+        * and curve name to the following arrays and increase the 
+        * EC_NUM value accordingly. 
+        */
+       static unsigned int test_curves[EC_NUM] = 
+       {       
+       /* Prime Curves */
+       NID_secp160r1,
+       NID_X9_62_prime192v1,
+       NID_secp224r1,
+       NID_X9_62_prime256v1,
+       NID_secp384r1,
+       NID_secp521r1,
+       /* Binary Curves */
+       NID_sect163k1,
+       NID_sect233k1,
+       NID_sect283k1,
+       NID_sect409k1,
+       NID_sect571k1,
+       NID_sect163r2,
+       NID_sect233r1,
+       NID_sect283r1,
+       NID_sect409r1,
+       NID_sect571r1
+       }; 
+       static const char * test_curves_names[EC_NUM] = 
+       {
+       /* Prime Curves */
+       "secp160r1",
+       "nistp192",
+       "nistp224",
+       "nistp256",
+       "nistp384",
+       "nistp521",
+       /* Binary Curves */
+       "nistk163",
+       "nistk233",
+       "nistk283",
+       "nistk409",
+       "nistk571",
+       "nistb163",
+       "nistb233",
+       "nistb283",
+       "nistb409",
+       "nistb571"
+       };
+       static int test_curves_bits[EC_NUM] =
+        {
+        160, 192, 224, 256, 384, 521,
+        163, 233, 283, 409, 571,
+        163, 233, 283, 409, 571
+        };
+
+#endif
+
+#ifndef OPENSSL_NO_ECDSA
+       unsigned char ecdsasig[256];
+       unsigned int ecdsasiglen;
+       EC_KEY *ecdsa[EC_NUM];
+       long ecdsa_c[EC_NUM][2];
+#endif
+
+#ifndef OPENSSL_NO_ECDH
+       EC_KEY *ecdh_a[EC_NUM], *ecdh_b[EC_NUM];
+       unsigned char secret_a[MAX_ECDH_SIZE], secret_b[MAX_ECDH_SIZE];
+       int secret_size_a, secret_size_b;
+       int ecdh_checks = 0;
+       int secret_idx = 0;
+       long ecdh_c[EC_NUM][2];
+#endif
+
        int rsa_doit[RSA_NUM];
        int dsa_doit[DSA_NUM];
+#ifndef OPENSSL_NO_ECDSA
+       int ecdsa_doit[EC_NUM];
+#endif
+#ifndef OPENSSL_NO_ECDH
+        int ecdh_doit[EC_NUM];
+#endif
        int doit[ALGOR_NUM];
        int pr_header=0;
-       const EVP_CIPHER *evp=NULL;
+       const EVP_CIPHER *evp_cipher=NULL;
+       const EVP_MD *evp_md=NULL;
        int decrypt=0;
-#ifdef HAVE_FORK
+#ifndef NO_FORK
        int multi=0;
 #endif
 
@@ -463,11 +631,25 @@ int MAIN(int argc, char **argv)
 #ifndef OPENSSL_NO_DSA
        memset(dsa_key,0,sizeof(dsa_key));
 #endif
+#ifndef OPENSSL_NO_ECDSA
+       for (i=0; i<EC_NUM; i++) ecdsa[i] = NULL;
+#endif
+#ifndef OPENSSL_NO_ECDH
+       for (i=0; i<EC_NUM; i++)
+               {
+               ecdh_a[i] = NULL;
+               ecdh_b[i] = NULL;
+               }
+#endif
+
 
        if (bio_err == NULL)
                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
                        BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
+       if (!load_config(bio_err, NULL))
+               goto end;
+
 #ifndef OPENSSL_NO_RSA
        memset(rsa_key,0,sizeof(rsa_key));
        for (i=0; i<RSA_NUM; i++)
@@ -479,9 +661,6 @@ int MAIN(int argc, char **argv)
                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");
@@ -489,6 +668,7 @@ int MAIN(int argc, char **argv)
                }
 
        memset(c,0,sizeof(c));
+       memset(DES_iv,0,sizeof(DES_iv));
        memset(iv,0,sizeof(iv));
 
        for (i=0; i<ALGOR_NUM; i++)
@@ -497,6 +677,15 @@ int MAIN(int argc, char **argv)
                rsa_doit[i]=0;
        for (i=0; i<DSA_NUM; i++)
                dsa_doit[i]=0;
+#ifndef OPENSSL_NO_ECDSA
+       for (i=0; i<EC_NUM; i++)
+               ecdsa_doit[i]=0;
+#endif
+#ifndef OPENSSL_NO_ECDH
+       for (i=0; i<EC_NUM; i++)
+               ecdh_doit[i]=0;
+#endif
+
        
        j=0;
        argc--;
@@ -518,10 +707,14 @@ int MAIN(int argc, char **argv)
                                BIO_printf(bio_err,"no EVP given\n");
                                goto end;
                                }
-                       evp=EVP_get_cipherbyname(*argv);
-                       if(!evp)
+                       evp_cipher=EVP_get_cipherbyname(*argv);
+                       if(!evp_cipher)
+                               {
+                               evp_md=EVP_get_digestbyname(*argv);
+                               }
+                       if(!evp_cipher && !evp_md)
                                {
-                               BIO_printf(bio_err,"%s is an unknown cipher\n",*argv);
+                               BIO_printf(bio_err,"%s is an unknown cipher or digest\n",*argv);
                                goto end;
                                }
                        doit[D_EVP]=1;
@@ -532,6 +725,7 @@ int MAIN(int argc, char **argv)
                        j--;    /* Otherwise, -elapsed gets confused with
                                   an algorithm. */
                        }
+#ifndef OPENSSL_NO_ENGINE
                else if ((argc > 0) && (strcmp(*argv,"-engine") == 0))
                        {
                        argc--;
@@ -541,14 +735,15 @@ int MAIN(int argc, char **argv)
                                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--;
                        }
-#ifdef HAVE_FORK
+#endif
+#ifndef NO_FORK
                else if ((argc > 0) && (strcmp(*argv,"-multi") == 0))
                        {
                        argc--;
@@ -598,7 +793,21 @@ int MAIN(int argc, char **argv)
 #ifndef OPENSSL_NO_SHA
                        if (strcmp(*argv,"sha1") == 0) doit[D_SHA1]=1;
                else
-                       if (strcmp(*argv,"sha") == 0) doit[D_SHA1]=1;
+                       if (strcmp(*argv,"sha") == 0)   doit[D_SHA1]=1,
+                                                       doit[D_SHA256]=1,
+                                                       doit[D_SHA512]=1;
+               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
@@ -618,6 +827,21 @@ int MAIN(int argc, char **argv)
                else    if (strcmp(*argv,"des-ede3") == 0) doit[D_EDE3_DES]=1;
                else
 #endif
+#ifndef OPENSSL_NO_AES
+                       if (strcmp(*argv,"aes-128-cbc") == 0) doit[D_CBC_128_AES]=1;
+               else    if (strcmp(*argv,"aes-192-cbc") == 0) doit[D_CBC_192_AES]=1;
+               else    if (strcmp(*argv,"aes-256-cbc") == 0) doit[D_CBC_256_AES]=1;
+               else    if (strcmp(*argv,"aes-128-ige") == 0) doit[D_IGE_128_AES]=1;
+               else    if (strcmp(*argv,"aes-192-ige") == 0) doit[D_IGE_192_AES]=1;
+               else    if (strcmp(*argv,"aes-256-ige") == 0) doit[D_IGE_256_AES]=1;
+                else
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+                       if (strcmp(*argv,"camellia-128-cbc") == 0) doit[D_CBC_128_CML]=1;
+               else    if (strcmp(*argv,"camellia-192-cbc") == 0) doit[D_CBC_192_CML]=1;
+               else    if (strcmp(*argv,"camellia-256-cbc") == 0) doit[D_CBC_256_CML]=1;
+               else
+#endif
 #ifndef OPENSSL_NO_RSA
 #if 0 /* was: #ifdef RSAref */
                        if (strcmp(*argv,"rsaref") == 0) 
@@ -659,6 +883,11 @@ int MAIN(int argc, char **argv)
                else if (strcmp(*argv,"idea") == 0) doit[D_CBC_IDEA]=1;
                else
 #endif
+#ifndef OPENSSL_NO_SEED
+                    if (strcmp(*argv,"seed-cbc") == 0) doit[D_CBC_SEED]=1;
+               else if (strcmp(*argv,"seed") == 0) doit[D_CBC_SEED]=1;
+               else
+#endif
 #ifndef OPENSSL_NO_BF
                     if (strcmp(*argv,"bf-cbc") == 0) doit[D_CBC_BF]=1;
                else if (strcmp(*argv,"blowfish") == 0) doit[D_CBC_BF]=1;
@@ -679,6 +908,28 @@ int MAIN(int argc, char **argv)
                        }
                else
 #endif
+#ifndef OPENSSL_NO_AES
+                       if (strcmp(*argv,"aes") == 0)
+                       {
+                       doit[D_CBC_128_AES]=1;
+                       doit[D_CBC_192_AES]=1;
+                       doit[D_CBC_256_AES]=1;
+                       }
+               else if (strcmp(*argv,"ghash") == 0)
+                       {
+                       doit[D_GHASH]=1;
+                       }
+               else
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+                       if (strcmp(*argv,"camellia") == 0)
+                       {
+                       doit[D_CBC_128_CML]=1;
+                       doit[D_CBC_192_CML]=1;
+                       doit[D_CBC_256_CML]=1;
+                       }
+               else
+#endif
 #ifndef OPENSSL_NO_RSA
                        if (strcmp(*argv,"rsa") == 0)
                        {
@@ -694,6 +945,55 @@ int MAIN(int argc, char **argv)
                        {
                        dsa_doit[R_DSA_512]=1;
                        dsa_doit[R_DSA_1024]=1;
+                       dsa_doit[R_DSA_2048]=1;
+                       }
+               else
+#endif
+#ifndef OPENSSL_NO_ECDSA
+                    if (strcmp(*argv,"ecdsap160") == 0) ecdsa_doit[R_EC_P160]=2;
+               else if (strcmp(*argv,"ecdsap192") == 0) ecdsa_doit[R_EC_P192]=2;
+               else if (strcmp(*argv,"ecdsap224") == 0) ecdsa_doit[R_EC_P224]=2;
+               else if (strcmp(*argv,"ecdsap256") == 0) ecdsa_doit[R_EC_P256]=2;
+               else if (strcmp(*argv,"ecdsap384") == 0) ecdsa_doit[R_EC_P384]=2;
+               else if (strcmp(*argv,"ecdsap521") == 0) ecdsa_doit[R_EC_P521]=2;
+               else if (strcmp(*argv,"ecdsak163") == 0) ecdsa_doit[R_EC_K163]=2;
+               else if (strcmp(*argv,"ecdsak233") == 0) ecdsa_doit[R_EC_K233]=2;
+               else if (strcmp(*argv,"ecdsak283") == 0) ecdsa_doit[R_EC_K283]=2;
+               else if (strcmp(*argv,"ecdsak409") == 0) ecdsa_doit[R_EC_K409]=2;
+               else if (strcmp(*argv,"ecdsak571") == 0) ecdsa_doit[R_EC_K571]=2;
+               else if (strcmp(*argv,"ecdsab163") == 0) ecdsa_doit[R_EC_B163]=2;
+               else if (strcmp(*argv,"ecdsab233") == 0) ecdsa_doit[R_EC_B233]=2;
+               else if (strcmp(*argv,"ecdsab283") == 0) ecdsa_doit[R_EC_B283]=2;
+               else if (strcmp(*argv,"ecdsab409") == 0) ecdsa_doit[R_EC_B409]=2;
+               else if (strcmp(*argv,"ecdsab571") == 0) ecdsa_doit[R_EC_B571]=2;
+               else if (strcmp(*argv,"ecdsa") == 0)
+                       {
+                       for (i=0; i < EC_NUM; i++)
+                               ecdsa_doit[i]=1;
+                       }
+               else
+#endif
+#ifndef OPENSSL_NO_ECDH
+                    if (strcmp(*argv,"ecdhp160") == 0) ecdh_doit[R_EC_P160]=2;
+               else if (strcmp(*argv,"ecdhp192") == 0) ecdh_doit[R_EC_P192]=2;
+               else if (strcmp(*argv,"ecdhp224") == 0) ecdh_doit[R_EC_P224]=2;
+               else if (strcmp(*argv,"ecdhp256") == 0) ecdh_doit[R_EC_P256]=2;
+               else if (strcmp(*argv,"ecdhp384") == 0) ecdh_doit[R_EC_P384]=2;
+               else if (strcmp(*argv,"ecdhp521") == 0) ecdh_doit[R_EC_P521]=2;
+               else if (strcmp(*argv,"ecdhk163") == 0) ecdh_doit[R_EC_K163]=2;
+               else if (strcmp(*argv,"ecdhk233") == 0) ecdh_doit[R_EC_K233]=2;
+               else if (strcmp(*argv,"ecdhk283") == 0) ecdh_doit[R_EC_K283]=2;
+               else if (strcmp(*argv,"ecdhk409") == 0) ecdh_doit[R_EC_K409]=2;
+               else if (strcmp(*argv,"ecdhk571") == 0) ecdh_doit[R_EC_K571]=2;
+               else if (strcmp(*argv,"ecdhb163") == 0) ecdh_doit[R_EC_B163]=2;
+               else if (strcmp(*argv,"ecdhb233") == 0) ecdh_doit[R_EC_B233]=2;
+               else if (strcmp(*argv,"ecdhb283") == 0) ecdh_doit[R_EC_B283]=2;
+               else if (strcmp(*argv,"ecdhb409") == 0) ecdh_doit[R_EC_B409]=2;
+               else if (strcmp(*argv,"ecdhb571") == 0) ecdh_doit[R_EC_B571]=2;
+               else if (strcmp(*argv,"ecdh") == 0)
+                       {
+                       for (i=0; i < EC_NUM; i++)
+                               ecdh_doit[i]=1;
                        }
                else
 #endif
@@ -719,18 +1019,31 @@ int MAIN(int argc, char **argv)
 #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
                        BIO_printf(bio_err,"rc2-cbc  ");
 #endif
@@ -740,12 +1053,21 @@ int MAIN(int argc, char **argv)
 #ifndef OPENSSL_NO_BF
                        BIO_printf(bio_err,"bf-cbc");
 #endif
-#if !defined(OPENSSL_NO_IDEA) || !defined(OPENSSL_NO_RC2) || \
+#if !defined(OPENSSL_NO_IDEA) || !defined(OPENSSL_NO_SEED) || !defined(OPENSSL_NO_RC2) || \
     !defined(OPENSSL_NO_BF) || !defined(OPENSSL_NO_RC5)
                        BIO_printf(bio_err,"\n");
 #endif
-
+#ifndef OPENSSL_NO_DES
                        BIO_printf(bio_err,"des-cbc  des-ede3 ");
+#endif
+#ifndef OPENSSL_NO_AES
+                       BIO_printf(bio_err,"aes-128-cbc aes-192-cbc aes-256-cbc ");
+                       BIO_printf(bio_err,"aes-128-ige aes-192-ige aes-256-ige ");
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+                       BIO_printf(bio_err,"\n");
+                       BIO_printf(bio_err,"camellia-128-cbc camellia-192-cbc camellia-256-cbc ");
+#endif
 #ifndef OPENSSL_NO_RC4
                        BIO_printf(bio_err,"rc4");
 #endif
@@ -758,38 +1080,62 @@ int MAIN(int argc, char **argv)
 #ifndef OPENSSL_NO_DSA
                        BIO_printf(bio_err,"dsa512   dsa1024  dsa2048\n");
 #endif
+#ifndef OPENSSL_NO_ECDSA
+                       BIO_printf(bio_err,"ecdsap160 ecdsap192 ecdsap224 ecdsap256 ecdsap384 ecdsap521\n");
+                       BIO_printf(bio_err,"ecdsak163 ecdsak233 ecdsak283 ecdsak409 ecdsak571\n");
+                       BIO_printf(bio_err,"ecdsab163 ecdsab233 ecdsab283 ecdsab409 ecdsab571\n");
+                       BIO_printf(bio_err,"ecdsa\n");
+#endif
+#ifndef OPENSSL_NO_ECDH
+                       BIO_printf(bio_err,"ecdhp160  ecdhp192  ecdhp224  ecdhp256  ecdhp384  ecdhp521\n");
+                       BIO_printf(bio_err,"ecdhk163  ecdhk233  ecdhk283  ecdhk409  ecdhk571\n");
+                       BIO_printf(bio_err,"ecdhb163  ecdhb233  ecdhb283  ecdhb409  ecdhb571\n");
+                       BIO_printf(bio_err,"ecdh\n");
+#endif
 
 #ifndef OPENSSL_NO_IDEA
                        BIO_printf(bio_err,"idea     ");
 #endif
+#ifndef OPENSSL_NO_SEED
+                       BIO_printf(bio_err,"seed     ");
+#endif
 #ifndef OPENSSL_NO_RC2
                        BIO_printf(bio_err,"rc2      ");
 #endif
 #ifndef OPENSSL_NO_DES
                        BIO_printf(bio_err,"des      ");
 #endif
+#ifndef OPENSSL_NO_AES
+                       BIO_printf(bio_err,"aes      ");
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+                       BIO_printf(bio_err,"camellia ");
+#endif
 #ifndef OPENSSL_NO_RSA
                        BIO_printf(bio_err,"rsa      ");
 #endif
 #ifndef OPENSSL_NO_BF
                        BIO_printf(bio_err,"blowfish");
 #endif
-#if !defined(OPENSSL_NO_IDEA) || !defined(OPENSSL_NO_RC2) || \
-    !defined(OPENSSL_NO_DES) || !defined(OPENSSL_NO_RSA) || \
-    !defined(OPENSSL_NO_BF)
+#if !defined(OPENSSL_NO_IDEA) || !defined(OPENSSL_NO_SEED) || \
+    !defined(OPENSSL_NO_RC2) || !defined(OPENSSL_NO_DES) || \
+    !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_BF) || \
+    !defined(OPENSSL_NO_AES) || !defined(OPENSSL_NO_CAMELLIA)
                        BIO_printf(bio_err,"\n");
 #endif
 
                        BIO_printf(bio_err,"\n");
                        BIO_printf(bio_err,"Available options:\n");
-#ifdef TIMES
+#if defined(TIMES) || defined(USE_TOD)
                        BIO_printf(bio_err,"-elapsed        measure time in real time instead of CPU user time.\n");
 #endif
+#ifndef OPENSSL_NO_ENGINE
                        BIO_printf(bio_err,"-engine e       use engine e, possibly a hardware device.\n");
+#endif
                        BIO_printf(bio_err,"-evp e          use EVP e.\n");
                        BIO_printf(bio_err,"-decrypt        time decryption instead of encryption (only EVP).\n");
                        BIO_printf(bio_err,"-mr             produce machine readable output.\n");
-#ifdef HAVE_FORK
+#ifndef NO_FORK
                        BIO_printf(bio_err,"-multi n        run n benchmarks in parallel.\n");
 #endif
                        goto end;
@@ -799,7 +1145,7 @@ int MAIN(int argc, char **argv)
                j++;
                }
 
-#ifdef HAVE_FORK
+#ifndef NO_FORK
        if(multi && do_multi(multi))
                goto show_res;
 #endif
@@ -815,17 +1161,20 @@ int MAIN(int argc, char **argv)
                        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++)
@@ -863,9 +1212,22 @@ int MAIN(int argc, char **argv)
        DES_set_key_unchecked(&key2,&sch2);
        DES_set_key_unchecked(&key3,&sch3);
 #endif
+#ifndef OPENSSL_NO_AES
+       AES_set_encrypt_key(key16,128,&aes_ks1);
+       AES_set_encrypt_key(key24,192,&aes_ks2);
+       AES_set_encrypt_key(key32,256,&aes_ks3);
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+       Camellia_set_key(key16,128,&camellia_ks1);
+       Camellia_set_key(ckey24,192,&camellia_ks2);
+       Camellia_set_key(ckey32,256,&camellia_ks3);
+#endif
 #ifndef OPENSSL_NO_IDEA
        idea_set_encrypt_key(key16,&idea_ks);
 #endif
+#ifndef OPENSSL_NO_SEED
+       SEED_set_key(key16,&seed_ks);
+#endif
 #ifndef OPENSSL_NO_RC4
        RC4_set_key(&rc4_ks,16,key16);
 #endif
@@ -889,11 +1251,12 @@ int MAIN(int argc, char **argv)
        BIO_printf(bio_err,"First we calculate the approximate speed ...\n");
        count=10;
        do      {
-               long i;
+               long it;
                count*=2;
-               Time_F(START,usertime);
-               for (i=count; i; i--)
-                       des_ecb_encrypt(buf_as_des_cblock,buf_as_des_cblock,
+               Time_F(START);
+               for (it=count; it; it--)
+                       DES_ecb_encrypt((DES_cblock *)buf,
+                               (DES_cblock *)buf,
                                &sch,DES_ENCRYPT);
                d=Time_F(STOP);
                } while (d <3);
@@ -909,10 +1272,24 @@ int MAIN(int argc, char **argv)
        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;
+       c[D_GHASH][0]=count;
 
        for (i=1; i<SIZE_NUM; i++)
                {
@@ -923,6 +1300,9 @@ int MAIN(int argc, char **argv)
                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++)
                {
@@ -934,10 +1314,20 @@ int MAIN(int argc, char **argv)
                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;
                c[D_CBC_IDEA][i]=c[D_CBC_IDEA][i-1]*l0/l1;
+               c[D_CBC_SEED][i]=c[D_CBC_SEED][i-1]*l0/l1;
                c[D_CBC_RC2][i]=c[D_CBC_RC2][i-1]*l0/l1;
                c[D_CBC_RC5][i]=c[D_CBC_RC5][i-1]*l0/l1;
                c[D_CBC_BF][i]=c[D_CBC_BF][i-1]*l0/l1;
                c[D_CBC_CAST][i]=c[D_CBC_CAST][i-1]*l0/l1;
+               c[D_CBC_128_AES][i]=c[D_CBC_128_AES][i-1]*l0/l1;
+               c[D_CBC_192_AES][i]=c[D_CBC_192_AES][i-1]*l0/l1;
+               c[D_CBC_256_AES][i]=c[D_CBC_256_AES][i-1]*l0/l1;
+               c[D_CBC_128_CML][i]=c[D_CBC_128_CML][i-1]*l0/l1;
+               c[D_CBC_192_CML][i]=c[D_CBC_192_CML][i-1]*l0/l1;
+               c[D_CBC_256_CML][i]=c[D_CBC_256_CML][i-1]*l0/l1;
+               c[D_IGE_128_AES][i]=c[D_IGE_128_AES][i-1]*l0/l1;
+               c[D_IGE_192_AES][i]=c[D_IGE_192_AES][i-1]*l0/l1;
+               c[D_IGE_256_AES][i]=c[D_IGE_256_AES][i-1]*l0/l1;
                }
 #ifndef OPENSSL_NO_RSA
        rsa_c[R_RSA_512][0]=count/2000;
@@ -979,6 +1369,114 @@ int MAIN(int argc, char **argv)
                }
 #endif
 
+#ifndef OPENSSL_NO_ECDSA
+       ecdsa_c[R_EC_P160][0]=count/1000;
+       ecdsa_c[R_EC_P160][1]=count/1000/2;
+       for (i=R_EC_P192; i<=R_EC_P521; i++)
+               {
+               ecdsa_c[i][0]=ecdsa_c[i-1][0]/2;
+               ecdsa_c[i][1]=ecdsa_c[i-1][1]/2;
+               if ((ecdsa_doit[i] <= 1) && (ecdsa_c[i][0] == 0))
+                       ecdsa_doit[i]=0;
+               else
+                       {
+                       if (ecdsa_c[i] == 0)
+                               {
+                               ecdsa_c[i][0]=1;
+                               ecdsa_c[i][1]=1;
+                               }
+                       }
+               }
+       ecdsa_c[R_EC_K163][0]=count/1000;
+       ecdsa_c[R_EC_K163][1]=count/1000/2;
+       for (i=R_EC_K233; i<=R_EC_K571; i++)
+               {
+               ecdsa_c[i][0]=ecdsa_c[i-1][0]/2;
+               ecdsa_c[i][1]=ecdsa_c[i-1][1]/2;
+               if ((ecdsa_doit[i] <= 1) && (ecdsa_c[i][0] == 0))
+                       ecdsa_doit[i]=0;
+               else
+                       {
+                       if (ecdsa_c[i] == 0)
+                               {
+                               ecdsa_c[i][0]=1;
+                               ecdsa_c[i][1]=1;
+                               }
+                       }
+               }
+       ecdsa_c[R_EC_B163][0]=count/1000;
+       ecdsa_c[R_EC_B163][1]=count/1000/2;
+       for (i=R_EC_B233; i<=R_EC_B571; i++)
+               {
+               ecdsa_c[i][0]=ecdsa_c[i-1][0]/2;
+               ecdsa_c[i][1]=ecdsa_c[i-1][1]/2;
+               if ((ecdsa_doit[i] <= 1) && (ecdsa_c[i][0] == 0))
+                       ecdsa_doit[i]=0;
+               else
+                       {
+                       if (ecdsa_c[i] == 0)
+                               {
+                               ecdsa_c[i][0]=1;
+                               ecdsa_c[i][1]=1;
+                               }
+                       }
+               }
+#endif
+
+#ifndef OPENSSL_NO_ECDH
+       ecdh_c[R_EC_P160][0]=count/1000;
+       ecdh_c[R_EC_P160][1]=count/1000;
+       for (i=R_EC_P192; i<=R_EC_P521; i++)
+               {
+               ecdh_c[i][0]=ecdh_c[i-1][0]/2;
+               ecdh_c[i][1]=ecdh_c[i-1][1]/2;
+               if ((ecdh_doit[i] <= 1) && (ecdh_c[i][0] == 0))
+                       ecdh_doit[i]=0;
+               else
+                       {
+                       if (ecdh_c[i] == 0)
+                               {
+                               ecdh_c[i][0]=1;
+                               ecdh_c[i][1]=1;
+                               }
+                       }
+               }
+       ecdh_c[R_EC_K163][0]=count/1000;
+       ecdh_c[R_EC_K163][1]=count/1000;
+       for (i=R_EC_K233; i<=R_EC_K571; i++)
+               {
+               ecdh_c[i][0]=ecdh_c[i-1][0]/2;
+               ecdh_c[i][1]=ecdh_c[i-1][1]/2;
+               if ((ecdh_doit[i] <= 1) && (ecdh_c[i][0] == 0))
+                       ecdh_doit[i]=0;
+               else
+                       {
+                       if (ecdh_c[i] == 0)
+                               {
+                               ecdh_c[i][0]=1;
+                               ecdh_c[i][1]=1;
+                               }
+                       }
+               }
+       ecdh_c[R_EC_B163][0]=count/1000;
+       ecdh_c[R_EC_B163][1]=count/1000;
+       for (i=R_EC_B233; i<=R_EC_B571; i++)
+               {
+               ecdh_c[i][0]=ecdh_c[i-1][0]/2;
+               ecdh_c[i][1]=ecdh_c[i-1][1]/2;
+               if ((ecdh_doit[i] <= 1) && (ecdh_c[i][0] == 0))
+                       ecdh_doit[i]=0;
+               else
+                       {
+                       if (ecdh_c[i] == 0)
+                               {
+                               ecdh_c[i][0]=1;
+                               ecdh_c[i][1]=1;
+                               }
+                       }
+               }
+#endif
+
 #define COND(d)        (count < (d))
 #define COUNT(d) (d)
 #else
@@ -986,9 +1484,11 @@ int MAIN(int argc, char **argv)
 # error "You cannot disable DES on systems without SIGALRM."
 #endif /* OPENSSL_NO_DES */
 #else
-#define COND(c)        (run)
+#define COND(c)        (run && count<0x7fffffff)
 #define COUNT(d) (count)
+#ifndef _WIN32
        signal(SIGALRM,sig_done);
+#endif
 #endif /* SIGALRM */
 
 #ifndef OPENSSL_NO_MD2
@@ -1043,7 +1543,7 @@ int MAIN(int argc, char **argv)
                        print_message(names[D_MD5],c[D_MD5][j],lengths[j]);
                        Time_F(START);
                        for (count=0,run=1; COND(c[D_MD5][j]); count++)
-                               EVP_Digest(&(buf[0]),(unsigned long)lengths[j],&(md5[0]),NULL,EVP_get_digestbyname("md5"),NULL);
+                               MD5(buf,lengths[j],md5);
                        d=Time_F(STOP);
                        print_result(D_MD5,j,count,d);
                        }
@@ -1056,8 +1556,8 @@ int MAIN(int argc, char **argv)
                HMAC_CTX hctx;
 
                HMAC_CTX_init(&hctx);
-               HMAC_Init(&hctx,(unsigned char *)"This is a key...",
-                       16,EVP_md5());
+               HMAC_Init_ex(&hctx,(unsigned char *)"This is a key...",
+                       16,EVP_md5(), NULL);
 
                for (j=0; j<SIZE_NUM; j++)
                        {
@@ -1065,9 +1565,9 @@ int MAIN(int argc, char **argv)
                        Time_F(START);
                        for (count=0,run=1; COND(c[D_HMAC][j]); count++)
                                {
-                               HMAC_Init(&hctx,NULL,0,NULL);
-                                HMAC_Update(&hctx,buf,lengths[j]);
-                                HMAC_Final(&hctx,&(hmac[0]),NULL);
+                               HMAC_Init_ex(&hctx,NULL,0,NULL,NULL);
+                               HMAC_Update(&hctx,buf,lengths[j]);
+                               HMAC_Final(&hctx,&(hmac[0]),NULL);
                                }
                        d=Time_F(STOP);
                        print_result(D_HMAC,j,count,d);
@@ -1083,42 +1583,92 @@ int MAIN(int argc, char **argv)
                        print_message(names[D_SHA1],c[D_SHA1][j],lengths[j]);
                        Time_F(START);
                        for (count=0,run=1; COND(c[D_SHA1][j]); count++)
+#if 0
                                EVP_Digest(buf,(unsigned long)lengths[j],&(sha[0]),NULL,EVP_sha1(),NULL);
+#else
+                               SHA1(buf,lengths[j],sha);
+#endif
                        d=Time_F(STOP);
                        print_result(D_SHA1,j,count,d);
                        }
                }
-#endif
-#ifndef OPENSSL_NO_RIPEMD
-       if (doit[D_RMD160])
+
+#ifndef OPENSSL_NO_SHA256
+       if (doit[D_SHA256])
                {
                for (j=0; j<SIZE_NUM; j++)
                        {
-                       print_message(names[D_RMD160],c[D_RMD160][j],lengths[j]);
+                       print_message(names[D_SHA256],c[D_SHA256][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);
+                       for (count=0,run=1; COND(c[D_SHA256][j]); count++)
+                               SHA256(buf,lengths[j],sha256);
                        d=Time_F(STOP);
-                       print_result(D_RMD160,j,count,d);
+                       print_result(D_SHA256,j,count,d);
                        }
                }
 #endif
-#ifndef OPENSSL_NO_RC4
-       if (doit[D_RC4])
+
+#ifndef OPENSSL_NO_SHA512
+       if (doit[D_SHA512])
                {
                for (j=0; j<SIZE_NUM; j++)
                        {
-                       print_message(names[D_RC4],c[D_RC4][j],lengths[j]);
+                       print_message(names[D_SHA512],c[D_SHA512][j],lengths[j]);
                        Time_F(START);
-                       for (count=0,run=1; COND(c[D_RC4][j]); count++)
-                               RC4(&rc4_ks,(unsigned int)lengths[j],
-                                       buf,buf);
+                       for (count=0,run=1; COND(c[D_SHA512][j]); count++)
+                               SHA512(buf,lengths[j],sha512);
                        d=Time_F(STOP);
-                       print_result(D_RC4,j,count,d);
+                       print_result(D_SHA512,j,count,d);
                        }
                }
 #endif
-#ifndef OPENSSL_NO_DES
+#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
+
+#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);
+                       print_result(D_RMD160,j,count,d);
+                       }
+               }
+#endif
+#ifndef OPENSSL_NO_RC4
+       if (doit[D_RC4])
+               {
+               for (j=0; j<SIZE_NUM; j++)
+                       {
+                       print_message(names[D_RC4],c[D_RC4][j],lengths[j]);
+                       Time_F(START);
+                       for (count=0,run=1; COND(c[D_RC4][j]); count++)
+                               RC4(&rc4_ks,(unsigned int)lengths[j],
+                                       buf,buf);
+                       d=Time_F(STOP);
+                       print_result(D_RC4,j,count,d);
+                       }
+               }
+#endif
+#ifndef OPENSSL_NO_DES
        if (doit[D_CBC_DES])
                {
                for (j=0; j<SIZE_NUM; j++)
@@ -1127,7 +1677,7 @@ int MAIN(int argc, char **argv)
                        Time_F(START);
                        for (count=0,run=1; COND(c[D_CBC_DES][j]); count++)
                                DES_ncbc_encrypt(buf,buf,lengths[j],&sch,
-                                                &iv,DES_ENCRYPT);
+                                                &DES_iv,DES_ENCRYPT);
                        d=Time_F(STOP);
                        print_result(D_CBC_DES,j,count,d);
                        }
@@ -1142,12 +1692,161 @@ int MAIN(int argc, char **argv)
                        for (count=0,run=1; COND(c[D_EDE3_DES][j]); count++)
                                DES_ede3_cbc_encrypt(buf,buf,lengths[j],
                                                     &sch,&sch2,&sch3,
-                                                    &iv,DES_ENCRYPT);
+                                                    &DES_iv,DES_ENCRYPT);
                        d=Time_F(STOP);
                        print_result(D_EDE3_DES,j,count,d);
                        }
                }
 #endif
+#ifndef OPENSSL_NO_AES
+       if (doit[D_CBC_128_AES])
+               {
+               for (j=0; j<SIZE_NUM; j++)
+                       {
+                       print_message(names[D_CBC_128_AES],c[D_CBC_128_AES][j],lengths[j]);
+                       Time_F(START);
+                       for (count=0,run=1; COND(c[D_CBC_128_AES][j]); count++)
+                               AES_cbc_encrypt(buf,buf,
+                                       (unsigned long)lengths[j],&aes_ks1,
+                                       iv,AES_ENCRYPT);
+                       d=Time_F(STOP);
+                       print_result(D_CBC_128_AES,j,count,d);
+                       }
+               }
+       if (doit[D_CBC_192_AES])
+               {
+               for (j=0; j<SIZE_NUM; j++)
+                       {
+                       print_message(names[D_CBC_192_AES],c[D_CBC_192_AES][j],lengths[j]);
+                       Time_F(START);
+                       for (count=0,run=1; COND(c[D_CBC_192_AES][j]); count++)
+                               AES_cbc_encrypt(buf,buf,
+                                       (unsigned long)lengths[j],&aes_ks2,
+                                       iv,AES_ENCRYPT);
+                       d=Time_F(STOP);
+                       print_result(D_CBC_192_AES,j,count,d);
+                       }
+               }
+       if (doit[D_CBC_256_AES])
+               {
+               for (j=0; j<SIZE_NUM; j++)
+                       {
+                       print_message(names[D_CBC_256_AES],c[D_CBC_256_AES][j],lengths[j]);
+                       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 (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);
+                       d=Time_F(STOP);
+                       print_result(D_IGE_128_AES,j,count,d);
+                       }
+               }
+       if (doit[D_IGE_192_AES])
+               {
+               for (j=0; j<SIZE_NUM; j++)
+                       {
+                       print_message(names[D_IGE_192_AES],c[D_IGE_192_AES][j],lengths[j]);
+                       Time_F(START);
+                       for (count=0,run=1; COND(c[D_IGE_192_AES][j]); count++)
+                               AES_ige_encrypt(buf,buf2,
+                                       (unsigned long)lengths[j],&aes_ks2,
+                                       iv,AES_ENCRYPT);
+                       d=Time_F(STOP);
+                       print_result(D_IGE_192_AES,j,count,d);
+                       }
+               }
+       if (doit[D_IGE_256_AES])
+               {
+               for (j=0; j<SIZE_NUM; j++)
+                       {
+                       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);
+                       }
+               }
+       if (doit[D_GHASH])
+               {
+               GCM128_CONTEXT *ctx = CRYPTO_gcm128_new(&aes_ks1,(block128_f)AES_encrypt);
+               CRYPTO_gcm128_setiv (ctx,(unsigned char *)"0123456789ab",12);
+
+               for (j=0; j<SIZE_NUM; j++)
+                       {
+                       print_message(names[D_GHASH],c[D_GHASH][j],lengths[j]);
+                       Time_F(START);
+                       for (count=0,run=1; COND(c[D_GHASH][j]); count++)
+                               CRYPTO_gcm128_aad(ctx,buf,lengths[j]);
+                       d=Time_F(STOP);
+                       print_result(D_GHASH,j,count,d);
+                       }
+               CRYPTO_gcm128_release(ctx);
+               }
+
+#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,
+                                       (unsigned long)lengths[j],&camellia_ks1,
+                                       iv,CAMELLIA_ENCRYPT);
+                       d=Time_F(STOP);
+                       print_result(D_CBC_128_CML,j,count,d);
+                       }
+               }
+       if (doit[D_CBC_192_CML])
+               {
+               for (j=0; j<SIZE_NUM; j++)
+                       {
+                       print_message(names[D_CBC_192_CML],c[D_CBC_192_CML][j],lengths[j]);
+                       Time_F(START);
+                       for (count=0,run=1; COND(c[D_CBC_192_CML][j]); count++)
+                               Camellia_cbc_encrypt(buf,buf,
+                                       (unsigned long)lengths[j],&camellia_ks2,
+                                       iv,CAMELLIA_ENCRYPT);
+                       d=Time_F(STOP);
+                       print_result(D_CBC_192_CML,j,count,d);
+                       }
+               }
+       if (doit[D_CBC_256_CML])
+               {
+               for (j=0; j<SIZE_NUM; j++)
+                       {
+                       print_message(names[D_CBC_256_CML],c[D_CBC_256_CML][j],lengths[j]);
+                       Time_F(START);
+                       for (count=0,run=1; COND(c[D_CBC_256_CML][j]); count++)
+                               Camellia_cbc_encrypt(buf,buf,
+                                       (unsigned long)lengths[j],&camellia_ks3,
+                                       iv,CAMELLIA_ENCRYPT);
+                       d=Time_F(STOP);
+                       print_result(D_CBC_256_CML,j,count,d);
+                       }
+               }
+
+#endif
 #ifndef OPENSSL_NO_IDEA
        if (doit[D_CBC_IDEA])
                {
@@ -1164,6 +1863,21 @@ int MAIN(int argc, char **argv)
                        }
                }
 #endif
+#ifndef OPENSSL_NO_SEED
+       if (doit[D_CBC_SEED])
+               {
+               for (j=0; j<SIZE_NUM; j++)
+                       {
+                       print_message(names[D_CBC_SEED],c[D_CBC_SEED][j],lengths[j]);
+                       Time_F(START);
+                       for (count=0,run=1; COND(c[D_CBC_SEED][j]); count++)
+                               SEED_cbc_encrypt(buf,buf,
+                                       (unsigned long)lengths[j],&seed_ks,iv,1);
+                       d=Time_F(STOP);
+                       print_result(D_CBC_SEED,j,count,d);
+                       }
+               }
+#endif
 #ifndef OPENSSL_NO_RC2
        if (doit[D_CBC_RC2])
                {
@@ -1233,30 +1947,51 @@ int MAIN(int argc, char **argv)
                {
                for (j=0; j<SIZE_NUM; j++)
                        {
-                       EVP_CIPHER_CTX ctx;
-                       int outl;
+                       if (evp_cipher)
+                               {
+                               EVP_CIPHER_CTX ctx;
+                               int outl;
+
+                               names[D_EVP]=OBJ_nid2ln(evp_cipher->nid);
+                               /* -O3 -fschedule-insns messes up an
+                                * optimization here!  names[D_EVP]
+                                * somehow becomes NULL */
+                               print_message(names[D_EVP],save_count,
+                                       lengths[j]);
+
+                               EVP_CIPHER_CTX_init(&ctx);
+                               if(decrypt)
+                                       EVP_DecryptInit_ex(&ctx,evp_cipher,NULL,key16,iv);
+                               else
+                                       EVP_EncryptInit_ex(&ctx,evp_cipher,NULL,key16,iv);
+                               EVP_CIPHER_CTX_set_padding(&ctx, 0);
 
-                       names[D_EVP]=OBJ_nid2ln(evp->nid);
-                       print_message(names[D_EVP],save_count,
-                                                 lengths[j]);
-                       EVP_CIPHER_CTX_init(&ctx);
-                       if(decrypt)
-                               EVP_DecryptInit_ex(&ctx,evp,NULL,key16,iv);
-                       else
-                               EVP_EncryptInit_ex(&ctx,evp,NULL,key16,iv);
-                               
-                       Time_F(START);
-                       if(decrypt)
-                               for (count=0,run=1; COND(save_count*4*lengths[0]/lengths[j]); count++)
-                                       EVP_DecryptUpdate(&ctx,buf,&outl,buf,lengths[j]);
-                       else
+                               Time_F(START);
+                               if(decrypt)
+                                       for (count=0,run=1; COND(save_count*4*lengths[0]/lengths[j]); count++)
+                                               EVP_DecryptUpdate(&ctx,buf,&outl,buf,lengths[j]);
+                               else
+                                       for (count=0,run=1; COND(save_count*4*lengths[0]/lengths[j]); count++)
+                                               EVP_EncryptUpdate(&ctx,buf,&outl,buf,lengths[j]);
+                               if(decrypt)
+                                       EVP_DecryptFinal_ex(&ctx,buf,&outl);
+                               else
+                                       EVP_EncryptFinal_ex(&ctx,buf,&outl);
+                               d=Time_F(STOP);
+                               EVP_CIPHER_CTX_cleanup(&ctx);
+                               }
+                       if (evp_md)
+                               {
+                               names[D_EVP]=OBJ_nid2ln(evp_md->type);
+                               print_message(names[D_EVP],save_count,
+                                       lengths[j]);
+
+                               Time_F(START);
                                for (count=0,run=1; COND(save_count*4*lengths[0]/lengths[j]); count++)
-                                       EVP_EncryptUpdate(&ctx,buf,&outl,buf,lengths[j]);
-                       if(decrypt)
-                               EVP_DecryptFinal_ex(&ctx,buf,&outl);
-                       else
-                               EVP_EncryptFinal_ex(&ctx,buf,&outl);
-                       d=Time_F(STOP);
+                                       EVP_Digest(buf,lengths[j],&(md[0]),NULL,evp_md,NULL);
+
+                               d=Time_F(STOP);
+                               }
                        print_result(D_EVP,j,count,d);
                        }
                }
@@ -1320,7 +2055,7 @@ int MAIN(int argc, char **argv)
                                {
                                ret=RSA_verify(NID_md5_sha1, buf,36, buf2,
                                        rsa_num, rsa_key[j]);
-                               if (ret == 0)
+                               if (ret <= 0)
                                        {
                                        BIO_printf(bio_err,
                                                "RSA verify failure\n");
@@ -1439,7 +2174,220 @@ int MAIN(int argc, char **argv)
                }
        if (rnd_fake) RAND_cleanup();
 #endif
+
+#ifndef OPENSSL_NO_ECDSA
+       if (RAND_status() != 1) 
+               {
+               RAND_seed(rnd_seed, sizeof rnd_seed);
+               rnd_fake = 1;
+               }
+       for (j=0; j<EC_NUM; j++) 
+               {
+               int ret;
+
+               if (!ecdsa_doit[j]) continue; /* Ignore Curve */ 
+               ecdsa[j] = EC_KEY_new_by_curve_name(test_curves[j]);
+               if (ecdsa[j] == NULL) 
+                       {
+                       BIO_printf(bio_err,"ECDSA failure.\n");
+                       ERR_print_errors(bio_err);
+                       rsa_count=1;
+                       } 
+               else 
+                       {
+#if 1
+                       EC_KEY_precompute_mult(ecdsa[j], NULL);
+#endif
+                       /* Perform ECDSA signature test */
+                       EC_KEY_generate_key(ecdsa[j]);
+                       ret = ECDSA_sign(0, buf, 20, ecdsasig, 
+                               &ecdsasiglen, ecdsa[j]);
+                       if (ret == 0) 
+                               {
+                               BIO_printf(bio_err,"ECDSA sign failure.  No ECDSA sign will be done.\n");
+                               ERR_print_errors(bio_err);
+                               rsa_count=1;
+                               } 
+                       else 
+                               {
+                               pkey_print_message("sign","ecdsa",
+                                       ecdsa_c[j][0], 
+                                       test_curves_bits[j],
+                                       ECDSA_SECONDS);
+
+                               Time_F(START);
+                               for (count=0,run=1; COND(ecdsa_c[j][0]);
+                                       count++) 
+                                       {
+                                       ret=ECDSA_sign(0, buf, 20, 
+                                               ecdsasig, &ecdsasiglen,
+                                               ecdsa[j]);
+                                       if (ret == 0) 
+                                               {
+                                               BIO_printf(bio_err, "ECDSA sign failure\n");
+                                               ERR_print_errors(bio_err);
+                                               count=1;
+                                               break;
+                                               }
+                                       }
+                               d=Time_F(STOP);
+
+                               BIO_printf(bio_err, mr ? "+R5:%ld:%d:%.2f\n" :
+                                       "%ld %d bit ECDSA signs in %.2fs \n", 
+                                       count, test_curves_bits[j], d);
+                               ecdsa_results[j][0]=d/(double)count;
+                               rsa_count=count;
+                               }
+
+                       /* Perform ECDSA verification test */
+                       ret=ECDSA_verify(0, buf, 20, ecdsasig, 
+                               ecdsasiglen, ecdsa[j]);
+                       if (ret != 1) 
+                               {
+                               BIO_printf(bio_err,"ECDSA verify failure.  No ECDSA verify will be done.\n");
+                               ERR_print_errors(bio_err);
+                               ecdsa_doit[j] = 0;
+                               } 
+                       else 
+                               {
+                               pkey_print_message("verify","ecdsa",
+                               ecdsa_c[j][1],
+                               test_curves_bits[j],
+                               ECDSA_SECONDS);
+                               Time_F(START);
+                               for (count=0,run=1; COND(ecdsa_c[j][1]); count++) 
+                                       {
+                                       ret=ECDSA_verify(0, buf, 20, ecdsasig, ecdsasiglen, ecdsa[j]);
+                                       if (ret != 1) 
+                                               {
+                                               BIO_printf(bio_err, "ECDSA verify failure\n");
+                                               ERR_print_errors(bio_err);
+                                               count=1;
+                                               break;
+                                               }
+                                       }
+                               d=Time_F(STOP);
+                               BIO_printf(bio_err, mr? "+R6:%ld:%d:%.2f\n"
+                                               : "%ld %d bit ECDSA verify in %.2fs\n",
+                               count, test_curves_bits[j], d);
+                               ecdsa_results[j][1]=d/(double)count;
+                               }
+
+                       if (rsa_count <= 1) 
+                               {
+                               /* if longer than 10s, don't do any more */
+                               for (j++; j<EC_NUM; j++)
+                               ecdsa_doit[j]=0;
+                               }
+                       }
+               }
+       if (rnd_fake) RAND_cleanup();
+#endif
+
+#ifndef OPENSSL_NO_ECDH
+       if (RAND_status() != 1)
+               {
+               RAND_seed(rnd_seed, sizeof rnd_seed);
+               rnd_fake = 1;
+               }
+       for (j=0; j<EC_NUM; j++)
+               {
+               if (!ecdh_doit[j]) continue;
+               ecdh_a[j] = EC_KEY_new_by_curve_name(test_curves[j]);
+               ecdh_b[j] = EC_KEY_new_by_curve_name(test_curves[j]);
+               if ((ecdh_a[j] == NULL) || (ecdh_b[j] == NULL))
+                       {
+                       BIO_printf(bio_err,"ECDH failure.\n");
+                       ERR_print_errors(bio_err);
+                       rsa_count=1;
+                       }
+               else
+                       {
+                       /* generate two ECDH key pairs */
+                       if (!EC_KEY_generate_key(ecdh_a[j]) ||
+                               !EC_KEY_generate_key(ecdh_b[j]))
+                               {
+                               BIO_printf(bio_err,"ECDH key generation failure.\n");
+                               ERR_print_errors(bio_err);
+                               rsa_count=1;            
+                               }
+                       else
+                               {
+                               /* If field size is not more than 24 octets, then use SHA-1 hash of result;
+                                * otherwise, use result (see section 4.8 of draft-ietf-tls-ecc-03.txt).
+                                */
+                               int field_size, outlen;
+                               void *(*kdf)(const void *in, size_t inlen, void *out, size_t *xoutlen);
+                               field_size = EC_GROUP_get_degree(EC_KEY_get0_group(ecdh_a[j]));
+                               if (field_size <= 24 * 8)
+                                       {
+                                       outlen = KDF1_SHA1_len;
+                                       kdf = KDF1_SHA1;
+                                       }
+                               else
+                                       {
+                                       outlen = (field_size+7)/8;
+                                       kdf = NULL;
+                                       }
+                               secret_size_a = ECDH_compute_key(secret_a, outlen,
+                                       EC_KEY_get0_public_key(ecdh_b[j]),
+                                       ecdh_a[j], kdf);
+                               secret_size_b = ECDH_compute_key(secret_b, outlen,
+                                       EC_KEY_get0_public_key(ecdh_a[j]),
+                                       ecdh_b[j], kdf);
+                               if (secret_size_a != secret_size_b) 
+                                       ecdh_checks = 0;
+                               else
+                                       ecdh_checks = 1;
+
+                               for (secret_idx = 0; 
+                                   (secret_idx < secret_size_a)
+                                       && (ecdh_checks == 1);
+                                   secret_idx++)
+                                       {
+                                       if (secret_a[secret_idx] != secret_b[secret_idx])
+                                       ecdh_checks = 0;
+                                       }
+
+                               if (ecdh_checks == 0)
+                                       {
+                                       BIO_printf(bio_err,"ECDH computations don't match.\n");
+                                       ERR_print_errors(bio_err);
+                                       rsa_count=1;            
+                                       }
+
+                               pkey_print_message("","ecdh",
+                               ecdh_c[j][0], 
+                               test_curves_bits[j],
+                               ECDH_SECONDS);
+                               Time_F(START);
+                               for (count=0,run=1; COND(ecdh_c[j][0]); count++)
+                                       {
+                                       ECDH_compute_key(secret_a, outlen,
+                                       EC_KEY_get0_public_key(ecdh_b[j]),
+                                       ecdh_a[j], kdf);
+                                       }
+                               d=Time_F(STOP);
+                               BIO_printf(bio_err, mr ? "+R7:%ld:%d:%.2f\n" :"%ld %d-bit ECDH ops in %.2fs\n",
+                               count, test_curves_bits[j], d);
+                               ecdh_results[j][0]=d/(double)count;
+                               rsa_count=count;
+                               }
+                       }
+
+
+               if (rsa_count <= 1)
+                       {
+                       /* if longer than 10s, don't do any more */
+                       for (j++; j<EC_NUM; j++)
+                       ecdh_doit[j]=0;
+                       }
+               }
+       if (rnd_fake) RAND_cleanup();
+#endif
+#ifndef NO_FORK
 show_res:
+#endif
        if(!mr)
                {
                fprintf(stdout,"%s\n",SSLeay_version(SSLEAY_VERSION));
@@ -1453,7 +2401,10 @@ show_res:
                printf("%s ",RC4_options());
 #endif
 #ifndef OPENSSL_NO_DES
-               printf("%s ",des_options());
+               printf("%s ",DES_options());
+#endif
+#ifndef OPENSSL_NO_AES
+               printf("%s ",AES_options());
 #endif
 #ifndef OPENSSL_NO_IDEA
                printf("%s ",idea_options());
@@ -1462,32 +2413,6 @@ show_res:
                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)
-               printf("HZ=%g", HZ);
-# 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)
@@ -1535,7 +2460,7 @@ show_res:
                                k,rsa_bits[k],rsa_results[k][0],
                                rsa_results[k][1]);
                else
-                       fprintf(stdout,"rsa %4u bits %8.4fs %8.4fs %8.1f %8.1f\n",
+                       fprintf(stdout,"rsa %4u bits %8.6fs %8.6fs %8.1f %8.1f\n",
                                rsa_bits[k],rsa_results[k][0],rsa_results[k][1],
                                1.0/rsa_results[k][0],1.0/rsa_results[k][1]);
                }
@@ -1554,12 +2479,62 @@ show_res:
                        fprintf(stdout,"+F3:%u:%u:%f:%f\n",
                                k,dsa_bits[k],dsa_results[k][0],dsa_results[k][1]);
                else
-                       fprintf(stdout,"dsa %4u bits %8.4fs %8.4fs %8.1f %8.1f\n",
+                       fprintf(stdout,"dsa %4u bits %8.6fs %8.6fs %8.1f %8.1f\n",
                                dsa_bits[k],dsa_results[k][0],dsa_results[k][1],
                                1.0/dsa_results[k][0],1.0/dsa_results[k][1]);
                }
 #endif
+#ifndef OPENSSL_NO_ECDSA
+       j=1;
+       for (k=0; k<EC_NUM; k++)
+               {
+               if (!ecdsa_doit[k]) continue;
+               if (j && !mr)
+                       {
+                       printf("%30ssign    verify    sign/s verify/s\n"," ");
+                       j=0;
+                       }
+
+               if (mr)
+                       fprintf(stdout,"+F4:%u:%u:%f:%f\n", 
+                               k, test_curves_bits[k],
+                               ecdsa_results[k][0],ecdsa_results[k][1]);
+               else
+                       fprintf(stdout,
+                               "%4u bit ecdsa (%s) %8.4fs %8.4fs %8.1f %8.1f\n", 
+                               test_curves_bits[k],
+                               test_curves_names[k],
+                               ecdsa_results[k][0],ecdsa_results[k][1], 
+                               1.0/ecdsa_results[k][0],1.0/ecdsa_results[k][1]);
+               }
+#endif
+
+
+#ifndef OPENSSL_NO_ECDH
+       j=1;
+       for (k=0; k<EC_NUM; k++)
+               {
+               if (!ecdh_doit[k]) continue;
+               if (j && !mr)
+                       {
+                       printf("%30sop      op/s\n"," ");
+                       j=0;
+                       }
+               if (mr)
+                       fprintf(stdout,"+F5:%u:%u:%f:%f\n",
+                               k, test_curves_bits[k],
+                               ecdh_results[k][0], 1.0/ecdh_results[k][0]);
+
+               else
+                       fprintf(stdout,"%4u bit ecdh (%s) %8.4fs %8.1f\n",
+                               test_curves_bits[k],
+                               test_curves_names[k],
+                               ecdh_results[k][0], 1.0/ecdh_results[k][0]);
+               }
+#endif
+
        mret=0;
+
 end:
        ERR_print_errors(bio_err);
        if (buf != NULL) OPENSSL_free(buf);
@@ -1574,8 +2549,24 @@ end:
                if (dsa_key[i] != NULL)
                        DSA_free(dsa_key[i]);
 #endif
+
+#ifndef OPENSSL_NO_ECDSA
+       for (i=0; i<EC_NUM; i++)
+               if (ecdsa[i] != NULL)
+                       EC_KEY_free(ecdsa[i]);
+#endif
+#ifndef OPENSSL_NO_ECDH
+       for (i=0; i<EC_NUM; i++)
+       {
+               if (ecdh_a[i] != NULL)
+                       EC_KEY_free(ecdh_a[i]);
+               if (ecdh_b[i] != NULL)
+                       EC_KEY_free(ecdh_b[i]);
+       }
+#endif
+
        apps_shutdown();
-       EXIT(mret);
+       OPENSSL_EXIT(mret);
        }
 
 static void print_message(const char *s, long num, int length)
@@ -1595,14 +2586,14 @@ static void print_message(const char *s, long num, int length)
 #endif
        }
 
-static void pkey_print_message(char *str, char *str2, long num, int bits,
-            int tm)
+static void pkey_print_message(const char *str, const char *str2, long num,
+       int bits, int tm)
        {
 #ifdef SIGALRM
        BIO_printf(bio_err,mr ? "+DTP:%d:%s:%s:%d\n"
                           : "Doing %d bit %s %s's for %ds: ",bits,str,str2,tm);
        (void)BIO_flush(bio_err);
-       alarm(RSA_SECONDS);
+       alarm(tm);
 #else
        BIO_printf(bio_err,mr ? "+DNP:%ld:%d:%s:%s\n"
                           : "Doing %ld %d bit %s %s's: ",num,bits,str,str2);
@@ -1615,11 +2606,12 @@ static void pkey_print_message(char *str, char *str2, long num, int bits,
 
 static void print_result(int alg,int run_no,int count,double time_used)
        {
-       BIO_printf(bio_err,mr ? "+R:%ld:%s:%f\n"
-                  : "%ld %s's in %.2fs\n",count,names[alg],time_used);
+       BIO_printf(bio_err,mr ? "+R:%d:%s:%f\n"
+                  : "%d %s's in %.2fs\n",count,names[alg],time_used);
        results[alg][run_no]=((double)count)/time_used*lengths[run_no];
        }
 
+#ifndef NO_FORK
 static char *sstrsep(char **string, const char *delim)
     {
     char isdelim[256];
@@ -1628,7 +2620,7 @@ static char *sstrsep(char **string, const char *delim)
     if (**string == 0)
         return NULL;
 
-    memset(isdelim, 0, 256);
+    memset(isdelim, 0, sizeof isdelim);
     isdelim[0] = 1;
 
     while (*delim)
@@ -1651,7 +2643,6 @@ static char *sstrsep(char **string, const char *delim)
     return token;
     }
 
-#ifdef HAVE_FORK
 static int do_multi(int multi)
        {
        int n;
@@ -1662,7 +2653,13 @@ static int do_multi(int multi)
        fds=malloc(multi*sizeof *fds);
        for(n=0 ; n < multi ; ++n)
                {
-               pipe(fd);
+               if (pipe(fd) == -1)
+                       {
+                       fprintf(stderr, "pipe failure\n");
+                       exit(1);
+                       }
+               fflush(stdout);
+               fflush(stderr);
                if(fork())
                        {
                        close(fd[1]);
@@ -1672,10 +2669,15 @@ static int do_multi(int multi)
                        {
                        close(fd[0]);
                        close(1);
-                       dup(fd[1]);
+                       if (dup(fd[1]) == -1)
+                               {
+                               fprintf(stderr, "dup failed\n");
+                               exit(1);
+                               }
                        close(fd[1]);
                        mr=1;
                        usertime=0;
+                       free(fds);
                        return 0;
                        }
                printf("Forked child %d\n",n);
@@ -1754,6 +2756,7 @@ static int do_multi(int multi)
                                else
                                        rsa_results[k][1]=d;
                                }
+#ifndef OPENSSL_NO_DSA
                        else if(!strncmp(buf,"+F3:",4))
                                {
                                int k;
@@ -1775,13 +2778,61 @@ static int do_multi(int multi)
                                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);
+
+                               d=atof(sstrsep(&p,sep));
+                               if(n)
+                                       ecdsa_results[k][0]=1/(1/ecdsa_results[k][0]+1/d);
+                               else
+                                       ecdsa_results[k][0]=d;
+
+                               d=atof(sstrsep(&p,sep));
+                               if(n)
+                                       ecdsa_results[k][1]=1/(1/ecdsa_results[k][1]+1/d);
+                               else
+                                       ecdsa_results[k][1]=d;
+                               }
+#endif 
+
+#ifndef OPENSSL_NO_ECDH
+                       else if(!strncmp(buf,"+F5:",4))
+                               {
+                               int k;
+                               double d;
+                               
+                               p=buf+4;
+                               k=atoi(sstrsep(&p,sep));
+                               sstrsep(&p,sep);
+
+                               d=atof(sstrsep(&p,sep));
+                               if(n)
+                                       ecdh_results[k][0]=1/(1/ecdh_results[k][0]+1/d);
+                               else
+                                       ecdh_results[k][0]=d;
+
+                               }
+#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