Commit 689c6f25 authored by Nils Larsch's avatar Nils Larsch
Browse files

add new curves to the loop (with some cleanup from me) 

Submitted by: Jean-Luc Duval
Reviewed by:  Nils Larsch
parent f4bfd357

apps/speed.c

+27 −26
Original line number Diff line number Diff line
@@ -262,7 +262,8 @@ 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

static int do_multi(int multi);
@@ -638,7 +639,7 @@ int MAIN(int argc, char **argv) 
	NID_sect409r1,

	NID_sect571r1

	}; 

	static char * test_curves_names[EC_NUM] = 

	static const char * test_curves_names[EC_NUM] = 

	{

	/* Prime Curves */

	"secp160r1",
@@ -1258,10 +1259,10 @@ 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);

		for (i=count; i; i--)

		for (it=count; it; it--)

			DES_ecb_encrypt(buf_as_des_cblock,buf_as_des_cblock,

				&sch,DES_ENCRYPT);

		d=Time_F(STOP);
@@ -1361,7 +1362,7 @@ int MAIN(int argc, char **argv) 
#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_P224; i<=R_EC_P521; i++)

	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;
@@ -1415,7 +1416,7 @@ int MAIN(int argc, char **argv) 
#ifndef OPENSSL_NO_ECDH

	ecdh_c[R_EC_P160][0]=count/1000;

	ecdh_c[R_EC_P160][1]=count/1000;

	for (i=R_EC_P224; i<=R_EC_P521; i++)

	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;
@@ -2486,8 +2487,8 @@ 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"