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/ec/eck_prn.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/ec/eck_prn.c')
| -rw-r--r-- | crypto/ec/eck_prn.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/crypto/ec/eck_prn.c b/crypto/ec/eck_prn.c index 2e501b2d05..cde3090dab 100644 --- a/crypto/ec/eck_prn.c +++ b/crypto/ec/eck_prn.c @@ -125,19 +125,10 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off) reason = ERR_R_MALLOC_FAILURE; goto err; } -#ifndef OPENSSL_NO_EC2M - if (is_char_two) { - if (!EC_GROUP_get_curve_GF2m(x, p, a, b, ctx)) { - reason = ERR_R_EC_LIB; - goto err; - } - } else /* prime field */ -#endif - { - if (!EC_GROUP_get_curve_GFp(x, p, a, b, ctx)) { - reason = ERR_R_EC_LIB; - goto err; - } + + if (!EC_GROUP_get_curve(x, p, a, b, ctx)) { + reason = ERR_R_EC_LIB; + goto err; } if ((point = EC_GROUP_get0_generator(x)) == NULL) { |