Commit d61f489b authored by Vitezslav Cizek's avatar Vitezslav Cizek Committed by Matt Caswell
Browse files

apps/speed.c: skip binary curves when compiling with OPENSSL_NO_EC2M 



openssl speed doesn't take into account that the library could be
compiled without the support for the binary curves and happily uses
them, which results in EC_GROUP_new_by_curve_name() errors.

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8422)
parent d7b2124a

apps/speed.c

+6 −0
Original line number Diff line number Diff line
@@ -524,6 +524,7 @@ static OPT_PAIR ecdsa_choices[] = { 
    {"ecdsap256", R_EC_P256},

    {"ecdsap384", R_EC_P384},

    {"ecdsap521", R_EC_P521},

#ifndef OPENSSL_NO_EC2M

    {"ecdsak163", R_EC_K163},

    {"ecdsak233", R_EC_K233},

    {"ecdsak283", R_EC_K283},
@@ -534,6 +535,7 @@ static OPT_PAIR ecdsa_choices[] = { 
    {"ecdsab283", R_EC_B283},

    {"ecdsab409", R_EC_B409},

    {"ecdsab571", R_EC_B571},

#endif

    {"ecdsabrp256r1", R_EC_BRP256R1},

    {"ecdsabrp256t1", R_EC_BRP256T1},

    {"ecdsabrp384r1", R_EC_BRP384R1},
@@ -552,6 +554,7 @@ static const OPT_PAIR ecdh_choices[] = { 
    {"ecdhp256", R_EC_P256},

    {"ecdhp384", R_EC_P384},

    {"ecdhp521", R_EC_P521},

#ifndef OPENSSL_NO_EC2M

    {"ecdhk163", R_EC_K163},

    {"ecdhk233", R_EC_K233},

    {"ecdhk283", R_EC_K283},
@@ -562,6 +565,7 @@ static const OPT_PAIR ecdh_choices[] = { 
    {"ecdhb283", R_EC_B283},

    {"ecdhb409", R_EC_B409},

    {"ecdhb571", R_EC_B571},

#endif

    {"ecdhbrp256r1", R_EC_BRP256R1},

    {"ecdhbrp256t1", R_EC_BRP256T1},

    {"ecdhbrp384r1", R_EC_BRP384R1},
@@ -1524,6 +1528,7 @@ int speed_main(int argc, char **argv) 
        {"nistp256", NID_X9_62_prime256v1, 256},

        {"nistp384", NID_secp384r1, 384},

        {"nistp521", NID_secp521r1, 521},

#ifndef OPENSSL_NO_EC2M

        /* Binary Curves */

        {"nistk163", NID_sect163k1, 163},

        {"nistk233", NID_sect233k1, 233},
@@ -1535,6 +1540,7 @@ int speed_main(int argc, char **argv) 
        {"nistb283", NID_sect283r1, 283},

        {"nistb409", NID_sect409r1, 409},

        {"nistb571", NID_sect571r1, 571},

#endif

        {"brainpoolP256r1", NID_brainpoolP256r1, 256},

        {"brainpoolP256t1", NID_brainpoolP256t1, 256},

        {"brainpoolP384r1", NID_brainpoolP384r1, 384},