ENC: fixup after merge

This commit is contained in:
hasufell 2014-05-19 22:26:10 +02:00
parent cd1611c018
commit a15ef46ea6
No known key found for this signature in database
GPG Key ID: 220CD1C5BDEED020
2 changed files with 16 additions and 16 deletions

View File

@ -37,8 +37,8 @@ endif
LIBS += -L. LIBS += -L.
# objects # objects
PQC_OBJS = rand.o poly.o mem.o ntru_decrypt.o 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_HEADERS = err.h rand.h poly.h context.h ntru_decrypt.h pqc_encrypt.h
# CUNIT_OBJS = cunit.o # CUNIT_OBJS = cunit.o
# includes # includes

View File

@ -19,7 +19,7 @@
* MA 02110-1301 USA * MA 02110-1301 USA
*/ */
#include "pcq_encrypt.h" #include "pqc_encrypt.h"
/* /*
* encrypt the msg, using the math: * encrypt the msg, using the math:
@ -45,10 +45,10 @@ void pb_encrypt(ntru_context *ctx,
{ {
mp_int *tmpOut; mp_int *tmpOut;
mp_int *tmpMsg; mp_int *tmpMsg;
mp_int mp_mod; mp_int mp_int_mod;
init_integer(&mp_mod); init_integer(&mp_int_mod);
MP_SET_INT(&mp_mod,(unsigned long)ctx->q); MP_SET_INT(&mp_int_mod,(unsigned long)ctx->q);
pb_starmultiply(pubKey, rnd, out, ctx, ctx->q); pb_starmultiply(pubKey, rnd, out, ctx, ctx->q);
@ -57,7 +57,7 @@ void pb_encrypt(ntru_context *ctx,
for(unsigned int i = 0; i <= ctx->N-1; i++) { for(unsigned int i = 0; i <= ctx->N-1; i++) {
mp_add(tmpOut,tmpMsg,tmpOut); mp_add(tmpOut,tmpMsg,tmpOut);
mp_mod(tmpOut,mp_mod,tmpOut); mp_mod(tmpOut,&mp_int_mod,tmpOut);
tmpOut++; tmpOut++;
tmpMsg++; tmpMsg++;