From 1c3572c20b88f77b366a1206bb9dc245df9c5855 Mon Sep 17 00:00:00 2001
From: "John M. Schanck" <jschanck@uwaterloo.ca>
Date: Tue, 3 Nov 2020 08:11:42 -0500
Subject: [PATCH] saber: remove unnecessary mod q ops

---
 saber/patches/AVX_Implementation_KEM_SABER_indcpa.c       | 4 +---
 saber/patches/Reference_Implementation_KEM_SABER_indcpa.c | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/saber/patches/AVX_Implementation_KEM_SABER_indcpa.c b/saber/patches/AVX_Implementation_KEM_SABER_indcpa.c
index 07b7ddd..913437b 100644
--- a/saber/patches/AVX_Implementation_KEM_SABER_indcpa.c
+++ b/saber/patches/AVX_Implementation_KEM_SABER_indcpa.c
@@ -1,6 +1,6 @@
 --- upstream/AVX_Implementation_KEM/SABER_indcpa.c
 +++ upstream-patched/AVX_Implementation_KEM/SABER_indcpa.c
-@@ -1,581 +1,130 @@
+@@ -1,581 +1,128 @@
 -#include <stdint.h>
 -#include <stdio.h>
  #include <string.h>
@@ -256,7 +256,6 @@
 +		for(j=0;j<SABER_N;j++) {
 +			res[i].coeffs[j] += h1;
 +			res[i].coeffs[j] >>= SABER_EQ-SABER_EP;
-+			res[i].coeffs[j] &= SABER_Q-1;
  		}
  	}
  
@@ -422,7 +421,6 @@
 +		for(j=0;j<SABER_N;j++){
 +			res[i].coeffs[j] += h1;
 +			res[i].coeffs[j] >>= SABER_EQ-SABER_EP;
-+			res[i].coeffs[j] &= SABER_Q-1;
  		}
  	}
 -
diff --git a/saber/patches/Reference_Implementation_KEM_SABER_indcpa.c b/saber/patches/Reference_Implementation_KEM_SABER_indcpa.c
index ba59b63..8e8e433 100644
--- a/saber/patches/Reference_Implementation_KEM_SABER_indcpa.c
+++ b/saber/patches/Reference_Implementation_KEM_SABER_indcpa.c
@@ -8,7 +8,7 @@
  #include "rng.h"
  #include "fips202.h"
  #include "SABER_params.h"
-@@ -13,90 +12,107 @@
+@@ -13,90 +12,105 @@
  
  void indcpa_kem_keypair(uint8_t pk[SABER_INDCPA_PUBLICKEYBYTES], uint8_t sk[SABER_INDCPA_SECRETKEYBYTES])
  {
@@ -53,7 +53,6 @@
 +		for(j=0;j<SABER_N;j++) {
 +			res[i].coeffs[j] += h1;
 +			res[i].coeffs[j] >>= SABER_EQ-SABER_EP;
-+			res[i].coeffs[j] &= SABER_Q-1;
  		}
  	}
  
@@ -103,7 +102,6 @@
 +		for(j=0;j<SABER_N;j++){
 +			res[i].coeffs[j] += h1;
 +			res[i].coeffs[j] >>= SABER_EQ-SABER_EP;
-+			res[i].coeffs[j] &= SABER_Q-1;
  		}
  	}
 +	POLVECp2BS(ciphertext, res);