root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

add ecdhx25519 option to speed 

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Emilia Käsper <emilia@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2016-02-12 14:11:47 +00:00
parent 4a5bbc4ef5
commit db50c1da19
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/speed.c
View File

@ -201,8 +201,8 @@ static int do_multi(int multi);
#define RSA_NUM 7
#define DSA_NUM 3
#define EC_NUM 16
#define MAX_ECDH_SIZE 256
#define EC_NUM 17
#define MAX_ECDH_SIZE 256
#define MISALIGN 64
static const char *names[ALGOR_NUM] = {
@ -509,6 +509,7 @@ static OPT_PAIR rsa_choices[] = {
#define R_EC_B283 13
#define R_EC_B409 14
#define R_EC_B571 15
#define R_EC_X25519 16
#ifndef OPENSSL_NO_EC
static OPT_PAIR ecdsa_choices[] = {
{"ecdsap160", R_EC_P160},
@ -546,6 +547,7 @@ static OPT_PAIR ecdh_choices[] = {
{"ecdhb283", R_EC_B283},
{"ecdhb409", R_EC_B409},
{"ecdhb571", R_EC_B571},
{"ecdhx25519", R_EC_X25519},
{NULL}
};
#endif
@ -705,7 +707,9 @@ int speed_main(int argc, char **argv)
NID_sect163k1, NID_sect233k1, NID_sect283k1,
NID_sect409k1, NID_sect571k1, NID_sect163r2,
NID_sect233r1, NID_sect283r1, NID_sect409r1,
NID_sect571r1
NID_sect571r1,
/* Other */
NID_X25519
};
static const char *test_curves_names[EC_NUM] = {
/* Prime Curves */
@ -715,7 +719,9 @@ int speed_main(int argc, char **argv)
"nistk163", "nistk233", "nistk283",
"nistk409", "nistk571", "nistb163",
"nistb233", "nistb283", "nistb409",
"nistb571"
"nistb571",
/* Other */
"X25519"
};
static int test_curves_bits[EC_NUM] = {
160, 192, 224,
@ -723,7 +729,7 @@ int speed_main(int argc, char **argv)
163, 233, 283,
409, 571, 163,
233, 283, 409,
571
571, 253 /* X25519 */
};
#endif
#ifndef OPENSSL_NO_EC