Commit 4a5bbc4e authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

skip inappropriate X25519 tests 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarEmilia Käsper <emilia@openssl.org>
parent 755031d9

test/ecdhtest.c

+7 −0
Original line number Diff line number Diff line
@@ -493,6 +493,13 @@ int main(int argc, char *argv[]) 
    /* NAMED CURVES TESTS */

    for (n = 0; n < crv_len; n++) {

        nid = curves[n].nid;

        /*

         * Skipped for X25519 because affine coordinate operations are not

         * supported for this curve.

         * Higher level ECDH tests are performed in evptests.txt instead.

         */

        if (nid == NID_X25519)

            continue;

        if (!test_ecdh_curve(nid, ctx, out)) goto err;

    }

test/ecdsatest.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ int test_builtin(BIO *out) 
        unsigned char dirt, offset;



        nid = curves[n].nid;

        if (nid == NID_ipsec4)

        if (nid == NID_ipsec4 || nid == NID_X25519)

            continue;

        /* create new ecdsa key (== EC_KEY) */

        if ((eckey = EC_KEY_new()) == NULL)

test/ectest.c

+6 −0
Original line number Diff line number Diff line
@@ -1417,6 +1417,12 @@ static void internal_curve_test(void) 
    for (n = 0; n < crv_len; n++) {

        EC_GROUP *group = NULL;

        int nid = curves[n].nid;

        /*

         * Skip for X25519 because low level operations such as EC_POINT_mul()

         * are not supported for this curve

         */

        if (nid == NID_X25519)

            continue;

        fprintf(stdout, "%s:\n", OBJ_nid2sn(nid));

        fflush(stdout);

        if ((group = EC_GROUP_new_by_curve_name(nid)) == NULL) {