summaryrefslogtreecommitdiffstats
path: root/crypto/ec/eck_prn.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-06-06 11:49:36 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-06-06 11:49:36 +0000
commitf610a516a0e1236e21b385c4719c97403fde4a98 (patch)
treef009d59dfc838d98a359c0fad453dee1acfc2583 /crypto/ec/eck_prn.c
parent2e51a4caa3bff0ff59f87f7423ba0551593ef48e (diff)
Backport from HEAD:
New option to disable characteristic two fields in EC code. Make no-ec2m work on Win32 build.
Diffstat (limited to 'crypto/ec/eck_prn.c')
-rw-r--r--crypto/ec/eck_prn.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/ec/eck_prn.c b/crypto/ec/eck_prn.c
index 7d3e175ae7..06de8f3959 100644
--- a/crypto/ec/eck_prn.c
+++ b/crypto/ec/eck_prn.c
@@ -207,7 +207,7 @@ 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))
@@ -217,6 +217,7 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
}
}
else /* prime field */
+#endif
{
if (!EC_GROUP_get_curve_GFp(x, p, a, b, ctx))
{