aboutsummaryrefslogtreecommitdiff
path: root/test/src
diff options
context:
space:
mode:
Diffstat (limited to 'test/src')
-rw-r--r--test/src/cm/test_cm.c (renamed from test/src/cm/test_custom.c)29
1 files changed, 17 insertions, 12 deletions
diff --git a/test/src/cm/test_custom.c b/test/src/cm/test_cm.c
index df1ada8..d3f8257 100644
--- a/test/src/cm/test_custom.c
+++ b/test/src/cm/test_cm.c
@@ -1,47 +1,52 @@
/*
* ecgen, tool for generating Elliptic curve domain parameters
- * Copyright (C) 2017 J08nY
+ * Copyright (C) 2017-2018 J08nY
*/
#include <criterion/criterion.h>
-#include "cm/custom.h"
+#include "cm/cm_any.h"
+#include "cm/cm_prime.h"
#include "obj/curve.h"
#include "test/default.h"
#include "test/input.h"
#include "test/output.h"
#include "util/random.h"
-void custom_setup() {
+void cm_setup() {
default_setup();
input_setup();
output_setup();
random_init();
}
-void custom_teardown() {
+void cm_teardown() {
default_teardown();
input_teardown();
output_teardown();
}
-TestSuite(custom, .init = custom_setup, .fini = custom_teardown);
+TestSuite(cm, .init = cm_setup, .fini = cm_teardown);
-Test(custom, test_curve_one) {
+Test(cm, test_curve_prime) {
cfg->bits = 128;
cfg->cm_order = "263473633827487324648193013259296339349";
GEN order = strtoi(cfg->cm_order);
- curve_t *curve = custom_curve();
+ curve_t *curve = cm_prime_curve(order);
cr_assert_not_null(curve, );
cr_assert(equalii(curve->order, order), );
cr_assert(equalii(ellcard(curve->curve, NULL), order), );
curve_free(&curve);
}
-Test(custom, test_curve_other) {
- cfg->bits = 32;
- cfg->cm_order = "2147483723";
+Test(cm, test_curve_composite) {
+ cfg->bits = 64;
+ cfg->cm_order = "13282407956253574712";
+ GEN order = strtoi(cfg->cm_order);
- curve_t *curve = custom_curve();
- cr_assert_null(curve, );
+ curve_t *curve = cm_any_curve(order);
+ cr_assert_not_null(curve, );
+ cr_assert(equalii(curve->order, order), );
+ cr_assert(equalii(ellcard(curve->curve, NULL), order), );
+ curve_free(&curve);
} \ No newline at end of file