From 4e6bb38260dd18ba3866f16a29c16ec4c1a0baa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Pr=C3=BC=C3=9Fner?= Date: Sat, 3 May 2014 17:18:23 +0200 Subject: [PATCH] numerous fixes --- src/Makefile | 4 ++-- src/ntru_decrypt.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Makefile b/src/Makefile index 30f657e..8bea853 100644 --- a/src/Makefile +++ b/src/Makefile @@ -37,8 +37,8 @@ endif LIBS += -L. # objects -PQC_OBJS = rand.o poly.o mem.o -PQC_HEADERS = err.h rand.h poly.h context.h +PQC_OBJS = rand.o poly.o mem.o ntru_decrypt.o +PQC_HEADERS = err.h rand.h poly.h context.h ntru_decrypt.h # CUNIT_OBJS = cunit.o # includes diff --git a/src/ntru_decrypt.c b/src/ntru_decrypt.c index e50daa5..abd55df 100644 --- a/src/ntru_decrypt.c +++ b/src/ntru_decrypt.c @@ -20,8 +20,6 @@ */ #include "ntru_decrypt.h" -#include "poly.h" -#include "context.h" /* * Legend @@ -42,11 +40,13 @@ pb_poly* ntru_decrypt(pb_poly *encr_msg, pb_poly *private_key, pb_poly *Fp, ntru unsigned int q = context->q; unsigned int p = context->p; unsigned int N = context->N; + unsigned int i; // StarMultiply(f, e, a, N, q) pb_poly *a = build_polynom(NULL, N, context); pb_starmultiply(private_key, encr_msg, a, context, q); - + printf("%s\n", "Nach dem StarMultiply: "); + draw_polynom(a); mp_int mp_q; mp_int mp_qdiv2; mp_int zero; @@ -56,10 +56,10 @@ pb_poly* ntru_decrypt(pb_poly *encr_msg, pb_poly *private_key, pb_poly *Fp, ntru init_integer(&zero); MP_SET_INT(&mp_q, q); - mp_div_2(&mp_q, mp_qdiv2); + mp_div_2(&mp_q, &mp_qdiv2); mp_zero(&zero); - for(int i = 0, i < N, i++){ + for(i = 0; i < N; i++){ if(mp_cmp(&(a->terms[i]),&zero) == MP_LT) { // Make all coefficients positive //a->terms[i] = a->terms[i] + q; mp_add((&a->terms[i]),&mp_q,(&a->terms[i])); @@ -73,7 +73,7 @@ pb_poly* ntru_decrypt(pb_poly *encr_msg, pb_poly *private_key, pb_poly *Fp, ntru pb_poly *d = build_polynom(NULL, N, context); // StarMultiply(a, Fp , d, N, p) - pb_starmultiply(a, Fp, d, N, p); + pb_starmultiply(a, Fp, d, context, p); // {Decode returns the decrypted message, d, through the argument list.} return d;