diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-02-18 20:27:26 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-02-26 10:53:01 +1000 |
| commit | 32ab57cbb4877ce7e6b4eb3f9b3cfbb0ff7cd10b (patch) | |
| tree | 91e75951efa936b26e3a636b9a0daf90d60182b0 /crypto/ec/ecp_s390x_nistp.c | |
| parent | 5af02212a5331cc30389246bb94f97fbcdebc23a (diff) | |
Fix external symbols related to ec & sm2 keys
Partial fix for #12964
This adds ossl_ names for the following symbols:
ec_*, ecx_*, ecdh_*, ecdsa_*, sm2_*
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14231)
Diffstat (limited to 'crypto/ec/ecp_s390x_nistp.c')
| -rw-r--r-- | crypto/ec/ecp_s390x_nistp.c | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/crypto/ec/ecp_s390x_nistp.c b/crypto/ec/ecp_s390x_nistp.c index c4b490e3be..ddaee93975 100644 --- a/crypto/ec/ecp_s390x_nistp.c +++ b/crypto/ec/ecp_s390x_nistp.c @@ -115,7 +115,7 @@ static int ec_GFp_s390x_nistp_mul(const EC_GROUP *group, EC_POINT *r, ret: /* Otherwise use default. */ if (rc == -1) - rc = ec_wNAF_mul(group, r, scalar, num, points, scalars, ctx); + rc = ossl_ec_wNAF_mul(group, r, scalar, num, points, scalars, ctx); OPENSSL_cleanse(param + S390X_OFF_SCALAR(len), len); BN_CTX_end(ctx); BN_CTX_free(new_ctx); @@ -186,7 +186,7 @@ static ECDSA_SIG *ecdsa_s390x_nistp_sign_sig(const unsigned char *dgst, } } else { /* Reconstruct k = (k^-1)^-1. */ - if (ec_group_do_inverse_ord(group, k, kinv, NULL) == 0 + if (ossl_ec_group_do_inverse_ord(group, k, kinv, NULL) == 0 || BN_bn2binpad(k, param + S390X_OFF_RN(len), len) == -1) { ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB); goto ret; @@ -321,60 +321,60 @@ const EC_METHOD *EC_GFp_s390x_nistp##bits##_method(void) \ static const EC_METHOD EC_GFp_s390x_nistp##bits##_meth = { \ EC_FLAGS_DEFAULT_OCT, \ NID_X9_62_prime_field, \ - ec_GFp_simple_group_init, \ - ec_GFp_simple_group_finish, \ - ec_GFp_simple_group_clear_finish, \ - ec_GFp_simple_group_copy, \ - ec_GFp_simple_group_set_curve, \ - ec_GFp_simple_group_get_curve, \ - ec_GFp_simple_group_get_degree, \ - ec_group_simple_order_bits, \ - ec_GFp_simple_group_check_discriminant, \ - ec_GFp_simple_point_init, \ - ec_GFp_simple_point_finish, \ - ec_GFp_simple_point_clear_finish, \ - ec_GFp_simple_point_copy, \ - ec_GFp_simple_point_set_to_infinity, \ - ec_GFp_simple_point_set_affine_coordinates, \ - ec_GFp_simple_point_get_affine_coordinates, \ + ossl_ec_GFp_simple_group_init, \ + ossl_ec_GFp_simple_group_finish, \ + ossl_ec_GFp_simple_group_clear_finish, \ + ossl_ec_GFp_simple_group_copy, \ + ossl_ec_GFp_simple_group_set_curve, \ + ossl_ec_GFp_simple_group_get_curve, \ + ossl_ec_GFp_simple_group_get_degree, \ + ossl_ec_group_simple_order_bits, \ + ossl_ec_GFp_simple_group_check_discriminant, \ + ossl_ec_GFp_simple_point_init, \ + ossl_ec_GFp_simple_point_finish, \ + ossl_ec_GFp_simple_point_clear_finish, \ + ossl_ec_GFp_simple_point_copy, \ + ossl_ec_GFp_simple_point_set_to_infinity, \ + ossl_ec_GFp_simple_point_set_affine_coordinates, \ + ossl_ec_GFp_simple_point_get_affine_coordinates, \ NULL, /* point_set_compressed_coordinates */ \ NULL, /* point2oct */ \ NULL, /* oct2point */ \ - ec_GFp_simple_add, \ - ec_GFp_simple_dbl, \ - ec_GFp_simple_invert, \ - ec_GFp_simple_is_at_infinity, \ - ec_GFp_simple_is_on_curve, \ - ec_GFp_simple_cmp, \ - ec_GFp_simple_make_affine, \ - ec_GFp_simple_points_make_affine, \ + ossl_ec_GFp_simple_add, \ + ossl_ec_GFp_simple_dbl, \ + ossl_ec_GFp_simple_invert, \ + ossl_ec_GFp_simple_is_at_infinity, \ + ossl_ec_GFp_simple_is_on_curve, \ + ossl_ec_GFp_simple_cmp, \ + ossl_ec_GFp_simple_make_affine, \ + ossl_ec_GFp_simple_points_make_affine, \ ec_GFp_s390x_nistp##bits##_mul, \ NULL, /* precompute_mult */ \ NULL, /* have_precompute_mult */ \ - ec_GFp_simple_field_mul, \ - ec_GFp_simple_field_sqr, \ + ossl_ec_GFp_simple_field_mul, \ + ossl_ec_GFp_simple_field_sqr, \ NULL, /* field_div */ \ - ec_GFp_simple_field_inv, \ + ossl_ec_GFp_simple_field_inv, \ NULL, /* field_encode */ \ NULL, /* field_decode */ \ NULL, /* field_set_to_one */ \ - ec_key_simple_priv2oct, \ - ec_key_simple_oct2priv, \ + ossl_ec_key_simple_priv2oct, \ + ossl_ec_key_simple_oct2priv, \ NULL, /* set_private */ \ - ec_key_simple_generate_key, \ - ec_key_simple_check_key, \ - ec_key_simple_generate_public_key, \ + ossl_ec_key_simple_generate_key, \ + ossl_ec_key_simple_check_key, \ + ossl_ec_key_simple_generate_public_key, \ NULL, /* keycopy */ \ NULL, /* keyfinish */ \ - ecdh_simple_compute_key, \ - ecdsa_simple_sign_setup, \ + ossl_ecdh_simple_compute_key, \ + ossl_ecdsa_simple_sign_setup, \ ecdsa_s390x_nistp##bits##_sign_sig, \ ecdsa_s390x_nistp##bits##_verify_sig, \ NULL, /* field_inverse_mod_ord */ \ - ec_GFp_simple_blind_coordinates, \ - ec_GFp_simple_ladder_pre, \ - ec_GFp_simple_ladder_step, \ - ec_GFp_simple_ladder_post \ + ossl_ec_GFp_simple_blind_coordinates, \ + ossl_ec_GFp_simple_ladder_pre, \ + ossl_ec_GFp_simple_ladder_step, \ + ossl_ec_GFp_simple_ladder_post \ }; \ static const EC_METHOD *ret; \ \ |