summaryrefslogtreecommitdiffstats
path: root/ssl/ssltest.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 /ssl/ssltest.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 'ssl/ssltest.c')
-rw-r--r--ssl/ssltest.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 582b9ca165..70950e1b49 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -943,7 +943,11 @@ bad:
}
}
else
+#ifdef OPENSSL_NO_EC2M
+ nid = NID_X9_62_prime256v1;
+#else
nid = NID_sect163r2;
+#endif
ecdh = EC_KEY_new_by_curve_name(nid);
if (ecdh == NULL)