diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 11:04:21 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:37 +1000 |
commit | 054d43ff972068a0f2ec07319808ca32ad0afb5f (patch) | |
tree | 084414afcd5637f6d2adfb7b28e61e8843157ab6 /test | |
parent | 47864aeafd2ca0ea551f00df99c4c598b53c5912 (diff) |
Add ossl_ ecx symbols
Partial fix for #12964
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
Diffstat (limited to 'test')
-rw-r--r-- | test/curve448_internal_test.c | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/test/curve448_internal_test.c b/test/curve448_internal_test.c index b1df82e837..561ab71e8f 100644 --- a/test/curve448_internal_test.c +++ b/test/curve448_internal_test.c @@ -601,40 +601,42 @@ static int test_ed448(void) EVP_MD_CTX *hashctx = EVP_MD_CTX_new(); if (!TEST_ptr(hashctx) - || !TEST_true(ED448_sign(NULL, outsig, NULL, 0, pubkey1, privkey1, - NULL, 0, NULL)) + || !TEST_true(ossl_ed448_sign(NULL, outsig, NULL, 0, pubkey1, + privkey1, NULL, 0, NULL)) || !TEST_int_eq(memcmp(sig1, outsig, sizeof(sig1)), 0) - || !TEST_true(ED448_sign(NULL, outsig, msg2, sizeof(msg2), pubkey2, - privkey2, NULL, 0, NULL)) + || !TEST_true(ossl_ed448_sign(NULL, outsig, msg2, sizeof(msg2), + pubkey2, privkey2, NULL, 0, NULL)) || !TEST_int_eq(memcmp(sig2, outsig, sizeof(sig2)), 0) - || !TEST_true(ED448_sign(NULL, outsig, msg3, sizeof(msg3), pubkey3, - privkey3, context3, sizeof(context3), NULL)) + || !TEST_true(ossl_ed448_sign(NULL, outsig, msg3, sizeof(msg3), + pubkey3, privkey3, context3, + sizeof(context3), NULL)) || !TEST_int_eq(memcmp(sig3, outsig, sizeof(sig3)), 0) - || !TEST_true(ED448_sign(NULL, outsig, msg4, sizeof(msg4), pubkey4, - privkey4, NULL, 0, NULL)) + || !TEST_true(ossl_ed448_sign(NULL, outsig, msg4, sizeof(msg4), + pubkey4, privkey4, NULL, 0, NULL)) || !TEST_int_eq(memcmp(sig4, outsig, sizeof(sig4)), 0) - || !TEST_true(ED448_sign(NULL, outsig, msg5, sizeof(msg5), pubkey5, - privkey5, NULL, 0, NULL)) + || !TEST_true(ossl_ed448_sign(NULL, outsig, msg5, sizeof(msg5), + pubkey5, privkey5, NULL, 0, NULL)) || !TEST_int_eq(memcmp(sig5, outsig, sizeof(sig5)), 0) - || !TEST_true(ED448_sign(NULL, outsig, msg6, sizeof(msg6), pubkey6, - privkey6, NULL, 0, NULL)) + || !TEST_true(ossl_ed448_sign(NULL, outsig, msg6, sizeof(msg6), + pubkey6, privkey6, NULL, 0, NULL)) || !TEST_int_eq(memcmp(sig6, outsig, sizeof(sig6)), 0) - || !TEST_true(ED448_sign(NULL, outsig, msg7, sizeof(msg7), pubkey7, - privkey7, NULL, 0, NULL)) + || !TEST_true(ossl_ed448_sign(NULL, outsig, msg7, sizeof(msg7), + pubkey7, privkey7, NULL, 0, NULL)) || !TEST_int_eq(memcmp(sig7, outsig, sizeof(sig7)), 0) - || !TEST_true(ED448_sign(NULL, outsig, msg8, sizeof(msg8), pubkey8, - privkey8, NULL, 0, NULL)) + || !TEST_true(ossl_ed448_sign(NULL, outsig, msg8, sizeof(msg8), + pubkey8, privkey8, NULL, 0, NULL)) || !TEST_int_eq(memcmp(sig8, outsig, sizeof(sig8)), 0) - || !TEST_true(ED448_sign(NULL, outsig, msg9, sizeof(msg9), pubkey9, - privkey9, NULL, 0, NULL)) + || !TEST_true(ossl_ed448_sign(NULL, outsig, msg9, sizeof(msg9), + pubkey9, privkey9, NULL, 0, NULL)) || !TEST_int_eq(memcmp(sig9, outsig, sizeof(sig9)), 0) - || !TEST_true(ED448ph_sign(NULL, outsig, dohash(hashctx, phmsg1, - sizeof(phmsg1)), phpubkey1, phprivkey1, - NULL, 0, NULL)) + || !TEST_true(ossl_ed448ph_sign(NULL, outsig, dohash(hashctx, phmsg1, + sizeof(phmsg1)), phpubkey1, + phprivkey1, NULL, 0, NULL)) || !TEST_int_eq(memcmp(phsig1, outsig, sizeof(phsig1)), 0) - || !TEST_true(ED448ph_sign(NULL, outsig, dohash(hashctx, phmsg2, - sizeof(phmsg2)), phpubkey2, phprivkey2, - phcontext2, sizeof(phcontext2), NULL)) + || !TEST_true(ossl_ed448ph_sign(NULL, outsig, dohash(hashctx, phmsg2, + sizeof(phmsg2)), phpubkey2, + phprivkey2, phcontext2, + sizeof(phcontext2), NULL)) || !TEST_int_eq(memcmp(phsig2, outsig, sizeof(phsig2)), 0)) { EVP_MD_CTX_free(hashctx); return 0; @@ -652,9 +654,9 @@ static int test_x448(void) /* Curve448 tests */ - if (!TEST_true(X448(out, in_scalar1, in_u1)) + if (!TEST_true(ossl_x448(out, in_scalar1, in_u1)) || !TEST_int_eq(memcmp(out, out_u1, sizeof(out)), 0) - || !TEST_true(X448(out, in_scalar2, in_u2)) + || !TEST_true(ossl_x448(out, in_scalar2, in_u2)) || !TEST_int_eq(memcmp(out, out_u2, sizeof(out)), 0)) return 0; @@ -666,7 +668,7 @@ static int test_x448(void) fflush(stdout); } - if (!TEST_true(X448(out, k, u))) + if (!TEST_true(ossl_x448(out, k, u))) return 0; if (i == 1 || i == 1000 || i == 1000000) { |