diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-02-12 14:11:47 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-02-28 22:54:54 +0000 |
| commit | db50c1da199145e0427ec5d3e457d5c2249cc078 (patch) | |
| tree | d4b3e8f1e4b41c449ba65c1c934d873ac312cf5b /apps/speed.c | |
| parent | 4a5bbc4ef57e21ac7b2f000c2dcbe86e01b2a882 (diff) | |
| download | openssl-db50c1da199145e0427ec5d3e457d5c2249cc078.tar.gz | |
add ecdhx25519 option to speed
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Diffstat (limited to 'apps/speed.c')
| -rw-r--r-- | apps/speed.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/apps/speed.c b/apps/speed.c index 64faef5c6c..97d8e5617f 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -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 |