From a15ef46ea62b0c377ac99846a04ba70296c96874 Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@hasufell.de>
Date: Mon, 19 May 2014 22:26:10 +0200
Subject: [PATCH] ENC: fixup after merge

---
 src/Makefile      |  4 ++--
 src/pqc_encrypt.c | 28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 8bea853..bd89c5d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -37,8 +37,8 @@ endif
 LIBS += -L.
 
 # objects
-PQC_OBJS = rand.o poly.o mem.o ntru_decrypt.o
-PQC_HEADERS = err.h rand.h poly.h context.h ntru_decrypt.h
+PQC_OBJS = rand.o poly.o mem.o ntru_decrypt.o pqc_encrypt.o
+PQC_HEADERS = err.h rand.h poly.h context.h ntru_decrypt.h pqc_encrypt.h
 # CUNIT_OBJS = cunit.o
 
 # includes
diff --git a/src/pqc_encrypt.c b/src/pqc_encrypt.c
index fd92ee2..05c1a82 100644
--- a/src/pqc_encrypt.c
+++ b/src/pqc_encrypt.c
@@ -19,46 +19,46 @@
  * MA  02110-1301  USA
  */
 
-#include "pcq_encrypt.h"
+#include "pqc_encrypt.h"
 
 /*
  * encrypt the msg, using the math:
  * e = (h ∗ r) + m (mod q)
- * 
+ *
  * e = the encrypted poly
  * h = the public key
  * r = the random poly
  * m = the message poly
  * q = large mod
- * 
+ *
  * @param ctx ntru_context* the ntru context
  * @param rnd pb_poly*   	the random poly
  * @param msg pb_poly* 		the message to encrypt
  * @param pubKey pb_poly* 	the public key
  * @param out pb_poly* 		the output poly
  */
-void pb_encrypt(ntru_context *ctx, 
+void pb_encrypt(ntru_context *ctx,
 		pb_poly *rnd,
 		pb_poly *msg,
 		pb_poly *pubKey,
-		pb_poly *out) 
+		pb_poly *out)
 {
 		mp_int *tmpOut;
 		mp_int *tmpMsg;
-		mp_int mp_mod;
-		
-		init_integer(&mp_mod);
-		MP_SET_INT(&mp_mod,(unsigned long)ctx->q);
-		
+		mp_int mp_int_mod;
+
+		init_integer(&mp_int_mod);
+		MP_SET_INT(&mp_int_mod,(unsigned long)ctx->q);
+
 		pb_starmultiply(pubKey, rnd, out, ctx, ctx->q);
-		
+
 		tmpOut = out->terms;
 		tmpMsg = msg->terms;
-		
+
 		for(unsigned int i = 0; i <= ctx->N-1; i++) {
 			mp_add(tmpOut,tmpMsg,tmpOut);
-			mp_mod(tmpOut,mp_mod,tmpOut);
-			
+			mp_mod(tmpOut,&mp_int_mod,tmpOut);
+
 			tmpOut++;
 			tmpMsg++;
 		}