diff options
| author | Matt Caswell <matt@openssl.org> | 2018-07-30 16:40:18 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-07-31 09:08:38 +0100 |
| commit | 9cc570d4c419e2ca97e2173dc14c484195502dd4 (patch) | |
| tree | c5ca35dd93fa1305ce979ff094e1755fb5b03c13 /crypto/sm2/sm2_za.c | |
| parent | de34e45a64f0865264b826255adbe7aee7470780 (diff) | |
Use the new non-curve type specific EC functions internally
Fixes #6646
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6815)
Diffstat (limited to 'crypto/sm2/sm2_za.c')
| -rw-r--r-- | crypto/sm2/sm2_za.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/sm2/sm2_za.c b/crypto/sm2/sm2_za.c index 8f45082db4..320bee1e18 100644 --- a/crypto/sm2/sm2_za.c +++ b/crypto/sm2/sm2_za.c @@ -87,7 +87,7 @@ int sm2_compute_userid_digest(uint8_t *out, goto done; } - if (!EC_GROUP_get_curve_GFp(group, p, a, b, ctx)) { + if (!EC_GROUP_get_curve(group, p, a, b, ctx)) { SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, ERR_R_EC_LIB); goto done; } @@ -103,16 +103,16 @@ int sm2_compute_userid_digest(uint8_t *out, || !EVP_DigestUpdate(hash, buf, p_bytes) || BN_bn2binpad(b, buf, p_bytes) < 0 || !EVP_DigestUpdate(hash, buf, p_bytes) - || !EC_POINT_get_affine_coordinates_GFp(group, + || !EC_POINT_get_affine_coordinates(group, EC_GROUP_get0_generator(group), xG, yG, ctx) || BN_bn2binpad(xG, buf, p_bytes) < 0 || !EVP_DigestUpdate(hash, buf, p_bytes) || BN_bn2binpad(yG, buf, p_bytes) < 0 || !EVP_DigestUpdate(hash, buf, p_bytes) - || !EC_POINT_get_affine_coordinates_GFp(group, - EC_KEY_get0_public_key(key), - xA, yA, ctx) + || !EC_POINT_get_affine_coordinates(group, + EC_KEY_get0_public_key(key), + xA, yA, ctx) || BN_bn2binpad(xA, buf, p_bytes) < 0 || !EVP_DigestUpdate(hash, buf, p_bytes) || BN_bn2binpad(yA, buf, p_bytes) < 0 |