projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Barreto and Rijmen's Whirlpool hash function.
[u/mdw/catacomb]
/
dh-check.c
diff --git
a/dh-check.c
b/dh-check.c
index
8956bd1
..
13320a6
100644
(file)
--- a/
dh-check.c
+++ b/
dh-check.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: dh-check.c,v 1.
1 2001/02/03 16:08:24
mdw Exp $
+ * $Id: dh-check.c,v 1.
3 2004/04/08 01:36:15
mdw Exp $
*
* Checks Diffie-Hellman group parameters
*
*
* Checks Diffie-Hellman group parameters
*
@@
-27,14
+27,6
@@
* MA 02111-1307, USA.
*/
* MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: dh-check.c,v $
- * Revision 1.1 2001/02/03 16:08:24 mdw
- * Add consistency checking for public keys.
- *
- */
-
/*----- Header files ------------------------------------------------------*/
#include <mLib/dstr.h>
/*----- Header files ------------------------------------------------------*/
#include <mLib/dstr.h>
@@
-66,6
+58,7
@@
int dh_checkparam(keycheck *kc, const dh_param *dp, mp **v, size_t n)
mpmont mm;
mp *pm1 = MP_NEW;
mp *q = MP_NEW;
mpmont mm;
mp *pm1 = MP_NEW;
mp *q = MP_NEW;
+ mp *x;
mpmul mu;
size_t i;
mpmul mu;
size_t i;
@@
-96,7
+89,9
@@
int dh_checkparam(keycheck *kc, const dh_param *dp, mp **v, size_t n)
goto fail;
q = mp_odd(q, dp->q, &i);
mpmont_create(&mm, dp->p);
goto fail;
q = mp_odd(q, dp->q, &i);
mpmont_create(&mm, dp->p);
- q = mpmont_expr(&mm, q, dp->g, q);
+ x = mpmont_mul(&mm, MP_NEW, dp->g, mm.r2);
+ q = mpmont_expr(&mm, q, x, q);
+ mp_drop(x);
do {
if (mp_eq(q, mm.r) != !i) {
if (keycheck_report(kc, KCSEV_ERR, "order of g != q")) {
do {
if (mp_eq(q, mm.r) != !i) {
if (keycheck_report(kc, KCSEV_ERR, "order of g != q")) {