Commit ed86f884 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix no-ec, no-sm2 and no-sm3 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8372)
parent cc838ee2

apps/pkeyutl.c

+7 −4
Original line number Diff line number Diff line
@@ -526,14 +526,16 @@ static EVP_PKEY_CTX *init_ctx(const char *kdfalg, int *pkeysize, 
        }

        ctx = EVP_PKEY_CTX_new_id(kdfnid, impl);

    } else {

        EC_KEY *eckey = NULL;

        const EC_GROUP *group = NULL;

        int nid;



        if (pkey == NULL)

            goto end;



#ifndef OPENSSL_NO_EC

        /* SM2 needs a special treatment */

        if (EVP_PKEY_id(pkey) == EVP_PKEY_EC) {

            EC_KEY *eckey = NULL;

            const EC_GROUP *group = NULL;

            int nid;



            if ((eckey = EVP_PKEY_get0_EC_KEY(pkey)) == NULL

                    || (group = EC_KEY_get0_group(eckey)) == NULL

                    || (nid = EC_GROUP_get_curve_name(group)) == 0)
@@ -541,6 +543,7 @@ static EVP_PKEY_CTX *init_ctx(const char *kdfalg, int *pkeysize, 
            if (nid == NID_sm2)

                EVP_PKEY_set_alias_type(pkey, EVP_PKEY_SM2);

        }

#endif

        *pkeysize = EVP_PKEY_size(pkey);

        ctx = EVP_PKEY_CTX_new(pkey, impl);

        if (ppkey != NULL)

test/recipes/20-test_pkeyutl.t

+7 −2
Original line number Diff line number Diff line
@@ -37,7 +37,12 @@ sub verify 
                      '-digest', 'sm3', '-pkeyopt', 'sm2_id:someid'])));

}



SKIP: {

    skip "Skipping tests that require EC, SM2 or SM3", 2

        if disabled("ec") || disabled("sm2") || disabled("sm3");



    ok(sign, "Sign a piece of data using SM2");

    ok(verify, "Verify an SM2 signature against a piece of data");

}



unlink 'signature.sm2';