提交 0244234d 编写于 作者: S Steven Noonan 提交者: Rich Salz

speed: add ecdhx448 to ecdh choices

CLA: trivial
Signed-off-by: NSteven Noonan <steven@uplinklabs.net>
Reviewed-by: NMatt Caswell <matt@openssl.org>
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5551)
上级 d47eaaf4
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
#define RSA_NUM 7 #define RSA_NUM 7
#define DSA_NUM 3 #define DSA_NUM 3
#define EC_NUM 17 #define EC_NUM 18
#define MAX_ECDH_SIZE 256 #define MAX_ECDH_SIZE 256
#define MISALIGN 64 #define MISALIGN 64
...@@ -533,6 +533,7 @@ static OPT_PAIR rsa_choices[] = { ...@@ -533,6 +533,7 @@ static OPT_PAIR rsa_choices[] = {
#define R_EC_B409 14 #define R_EC_B409 14
#define R_EC_B571 15 #define R_EC_B571 15
#define R_EC_X25519 16 #define R_EC_X25519 16
#define R_EC_X448 17
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC
static OPT_PAIR ecdsa_choices[] = { static OPT_PAIR ecdsa_choices[] = {
{"ecdsap160", R_EC_P160}, {"ecdsap160", R_EC_P160},
...@@ -572,6 +573,7 @@ static OPT_PAIR ecdh_choices[] = { ...@@ -572,6 +573,7 @@ static OPT_PAIR ecdh_choices[] = {
{"ecdhb409", R_EC_B409}, {"ecdhb409", R_EC_B409},
{"ecdhb571", R_EC_B571}, {"ecdhb571", R_EC_B571},
{"ecdhx25519", R_EC_X25519}, {"ecdhx25519", R_EC_X25519},
{"ecdhx448", R_EC_X448},
{NULL} {NULL}
}; };
#endif #endif
...@@ -1377,7 +1379,7 @@ int speed_main(int argc, char **argv) ...@@ -1377,7 +1379,7 @@ int speed_main(int argc, char **argv)
NID_sect233r1, NID_sect283r1, NID_sect409r1, NID_sect233r1, NID_sect283r1, NID_sect409r1,
NID_sect571r1, NID_sect571r1,
/* Other */ /* Other */
NID_X25519 NID_X25519, NID_X448
}; };
static const char *test_curves_names[EC_NUM] = { static const char *test_curves_names[EC_NUM] = {
/* Prime Curves */ /* Prime Curves */
...@@ -1389,7 +1391,7 @@ int speed_main(int argc, char **argv) ...@@ -1389,7 +1391,7 @@ int speed_main(int argc, char **argv)
"nistb233", "nistb283", "nistb409", "nistb233", "nistb283", "nistb409",
"nistb571", "nistb571",
/* Other */ /* Other */
"X25519" "X25519", "X448"
}; };
static const int test_curves_bits[EC_NUM] = { static const int test_curves_bits[EC_NUM] = {
160, 192, 224, 160, 192, 224,
...@@ -1397,7 +1399,7 @@ int speed_main(int argc, char **argv) ...@@ -1397,7 +1399,7 @@ int speed_main(int argc, char **argv)
163, 233, 283, 163, 233, 283,
409, 571, 163, 409, 571, 163,
233, 283, 409, 233, 283, 409,
571, 253 /* X25519 */ 571, 253, 448
}; };
int ecdsa_doit[EC_NUM] = { 0 }; int ecdsa_doit[EC_NUM] = { 0 };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册