projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add utility for computing conversion factors for ONBs. Fix up elliptic curve
[u/mdw/catacomb]
/
ec-info.c
diff --git
a/ec-info.c
b/ec-info.c
index
4f852c2
..
bf9607c
100644
(file)
--- a/
ec-info.c
+++ b/
ec-info.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id
: ec-info.c,v 1.7 2004/04/17 09:58:37 mdw Exp
$
+ * $Id$
*
* Elliptic curve information management
*
*
* Elliptic curve information management
*
@@
-34,6
+34,7
@@
#include "gf.h"
#include "pgen.h"
#include "mprand.h"
#include "gf.h"
#include "pgen.h"
#include "mprand.h"
+#include "mpint.h"
#include "rabin.h"
/*----- Main code ---------------------------------------------------------*/
#include "rabin.h"
/*----- Main code ---------------------------------------------------------*/
@@
-325,7
+326,7
@@
void ec_freeinfo(ec_info *ei)
static int primeeltp(mp *x, field *f)
{
static int primeeltp(mp *x, field *f)
{
- return (!MP_
ISNEG
(x) && MP_CMP(x, <, f->m));
+ return (!MP_
NEGP
(x) && MP_CMP(x, <, f->m));
}
static const char *primecheck(const ec_info *ei, grand *gr)
}
static const char *primecheck(const ec_info *ei, grand *gr)
@@
-435,6
+436,13
@@
static const char *bincheck(const ec_info *ei, grand *gr)
ec p;
int rc;
ec p;
int rc;
+ /* --- Check that %$m$% is prime --- */
+
+ x = mp_fromuint(MP_NEW, f->nbits);
+ rc = pfilt_smallfactor(x);
+ mp_drop(x);
+ if (rc != PGEN_DONE) return ("degree not prime");
+
/* --- Check that %$p$% is irreducible --- */
if (!gf_irreduciblep(f->m)) return ("p not irreducible");
/* --- Check that %$p$% is irreducible --- */
if (!gf_irreduciblep(f->m)) return ("p not irreducible");
@@
-551,20
+559,23
@@
int main(int argc, char *argv[])
}
}
} else {
}
}
} else {
- fputs("checking standard curves
:
", stdout);
+ fputs("checking standard curves
...\n
", stdout);
for (ee = ectab; ee->name; ee++) {
ec_info ei;
for (ee = ectab; ee->name; ee++) {
ec_info ei;
+ printf(" %s: ", ee->name);
+ fflush(stdout);
getinfo(&ei, ee->data);
e = ec_checkinfo(&ei, gr);
ec_freeinfo(&ei);
if (e) {
getinfo(&ei, ee->data);
e = ec_checkinfo(&ei, gr);
ec_freeinfo(&ei);
if (e) {
-
fprintf(stderr, "\n*** curve %s fails: %s\n", ee->name
, e);
+
printf("fails: %s\n"
, e);
ok = 0;
ok = 0;
- }
-
putchar('.'
);
+ }
else
+
fputs("ok\n", stdout
);
fflush(stdout);
}
fflush(stdout);
}
- fputs(ok ? " ok\n" : " failed\n", stdout);
+ if (ok)
+ fputs("all ok\n", stdout);
}
gr->ops->destroy(gr);
return (!ok);
}
gr->ops->destroy(gr);
return (!ok);