fix example, add encrypt/decrypt

Author: enum-class

CMakeLists.txt

@@ -16,7 +16,7 @@ endif()
 
 set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 set(CMAKE_EXPORT_COMPILE_COMMANDS On)
-#add_compile_options(-Wall -Wextra -pedantic -Werror)
+add_compile_options(-Wall -Wextra -pedantic -Werror)
 
 set(SOURCE_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/Aces.c
@@ -36,7 +36,7 @@ target_include_directories(CAces PUBLIC
 
 option(CACES_BENCHMARK "Enable benchmarking" OFF)
 option(CACES_TEST "Enable tests" OFF)
-option(CACES_EXAMPLES "Enable examples" OFF)
+option(CACES_EXAMPLE "Enable examples" OFF)
 
 if (CACES_BENCHMARK)
     add_subdirectory(benchmarks)
@@ -46,7 +46,7 @@ if (CACES_TEST)
     add_subdirectory(tests)
 endif()
 
-if (CACES_EXAMPLES)
+if (CACES_EXAMPLE)
     add_subdirectory(examples)
 endif()
 

examples/example1.c

@@ -1,73 +1,75 @@
 #include <Aces.h>
-#include <assert.h>
+
 #include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
 
 #define DIM 10
 
-int main()
-{
-    Aces aces;
-    
-    /** shared_info **/
-    // initialize U
-    Coeff u_mem[DIM];
-    set_polynomial(&aces.shared_info.pk.u, u_mem, DIM);
-
-    // initialize lambda
-    Coeff lambda_mem[DIM][DIM * DIM];
-    Matrix2D lambda_mat[DIM];
-    for (int i = 0; i < DIM; ++i) {
-        lambda_mat[i].dim = DIM;
-        lambda_mat[i].data = lambda_mem[i];
-    }
-    aces.shared_info.pk.lambda.size = DIM;
-    aces.shared_info.pk.lambda.data = lambda_mat;
-
-    /** private_key **/
-    // initialize x
-    Coeff x_mem[DIM][DIM];
-    Polynomial x_polies[DIM];
-    for (int i = 0; i < DIM; ++i) {
-        set_polynomial(&x_polies[i], x_mem[i], DIM);
-    }
-    aces.private_key.x.size = DIM;
-    aces.private_key.x.polies = x_polies;
-
-    // initialize f0
-    Coeff f0_mem[DIM][DIM];
-    Polynomial f0_polies[DIM];
-    for (int i = 0; i < DIM; ++i) {
-        set_polynomial(&f0_polies[i], f0_mem[i], DIM);
-    }
-    aces.private_key.f0.size = DIM;
-    aces.private_key.f0.polies = f0_polies;
-
-    // initialize f1
-    Coeff f1_mem[DIM];
-    set_polynomial(&aces.private_key.f1, f1_mem, DIM);
-
-    init_aces(2, 33, DIM, &aces);
-
-    uint64_t message = 3;
-    CipherMessage c_msg;
-
-    Coeff c1_mem[DIM][DIM];
-    Polynomial c1_polies[DIM];
-    for (int i = 0; i < DIM; ++i) {
-        set_polynomial(&c1_polies[i], c1_mem[i], DIM);
-    }
-    c_msg.c1.size = DIM;
-    c_msg.c1.polies = f0_polies;
-
-    Coeff c2_mem[DIM];
-    set_polynomial(&c_msg.c2, c2_mem, DIM);
-
-    aces_encrypt(&aces, &message, 1, &c_msg);
-
-    uint64_t recovered_message;
-    aces_decrypt(&aces, &c_msg, 1, &recovered_message);
-
-    printf("%lu == %lu\n",recovered_message, message);
-
-    return 0;
+int main() {
+  srand(time(NULL));
+  Aces aces;
+
+  /** shared_info **/
+  // initialize U
+  Coeff u_mem[DIM + 1];
+  set_polynomial(&aces.shared_info.pk.u, u_mem, DIM + 1);
+
+  // initialize lambda
+  uint64_t lambda_mem[DIM][DIM * DIM];
+  Matrix2D lambda_mat[DIM];
+  for (int i = 0; i < DIM; ++i) {
+    lambda_mat[i].dim = DIM;
+    lambda_mat[i].data = lambda_mem[i];
+  }
+  aces.shared_info.pk.lambda.size = DIM;
+  aces.shared_info.pk.lambda.data = lambda_mat;
+
+  /** private_key **/
+  // initialize x
+  Coeff x_mem[DIM][DIM];
+  Polynomial x_polies[DIM];
+  for (int i = 0; i < DIM; ++i) {
+    set_polynomial(&x_polies[i], x_mem[i], DIM);
+  }
+  aces.private_key.x.size = DIM;
+  aces.private_key.x.polies = x_polies;
+
+  // initialize f0
+  Coeff f0_mem[DIM][DIM];
+  Polynomial f0_polies[DIM];
+  for (int i = 0; i < DIM; ++i) {
+    set_polynomial(&f0_polies[i], f0_mem[i], DIM);
+  }
+  aces.private_key.f0.size = DIM;
+  aces.private_key.f0.polies = f0_polies;
+
+  // initialize f1
+  Coeff f1_mem[DIM];
+  set_polynomial(&aces.private_key.f1, f1_mem, DIM);
+
+  init_aces(2, 33, DIM, &aces);
+
+  uint64_t message = 1;
+  CipherMessage c_msg;
+
+  Coeff c1_mem[DIM][DIM];
+  Polynomial c1_polies[DIM];
+  for (int i = 0; i < DIM; ++i) {
+    set_polynomial(&c1_polies[i], c1_mem[i], DIM);
+  }
+  c_msg.c1.size = DIM;
+  c_msg.c1.polies = c1_polies;
+
+  Coeff c2_mem[DIM];
+  set_polynomial(&c_msg.c2, c2_mem, DIM);
+
+  aces_encrypt(&aces, &message, 1, &c_msg);
+
+  uint64_t recovered_message;
+  aces_decrypt(&aces, &c_msg, 1, &recovered_message);
+
+  printf("%lu == %lu\n", recovered_message, message % 2);
+
+  return 0;
 }

lib/Aces-internal.h

@@ -6,7 +6,9 @@ extern "C" {
 #endif
 
 #include "Channel.h"
+#include "Matrix.h"
 #include "Polynomial.h"
+
 #include <stdint.h>
 
 #define EPROB 0.5

lib/Aces.h

@@ -6,6 +6,7 @@ extern "C" {
 #endif
 
 #include "Channel.h"
+#include "Matrix.h"
 #include "Polynomial.h"
 
 /**

lib/Channel.h

@@ -1,9 +1,7 @@
 #ifndef CHANNEL_H
 #define CHANNEL_H
 
-#include "Common.h"
-#include "Matrix.h"
-#include "Polynomial.h"
+#include <stdint.h>
 
 typedef struct {
   uint64_t dim;

src/Aces-internal.c

@@ -1,6 +1,7 @@
 #include "Aces-internal.h"
 #include "Common.h"
-#include "Matrix.h"
+
+#include <string.h>
 
 int generate_error(uint64_t q, uint64_t dim, uint64_t message, Polynomial *rm) {
   (void)dim;
@@ -125,15 +126,24 @@ int generate_f1(const Channel *channel, const Parameters *param,
                 Polynomial *f1) {
   Polynomial tmp;
   Coeff mem[param->dim * 2];
-  set_polynomial(&tmp, mem, param->dim * 2);
 
-  set_zero(f1);
-  set_zero(&tmp);
+  Polynomial f_pre;
+  Coeff f_pre_mem[param->dim * 2];
+  set_polynomial(&f_pre, f_pre_mem, param->dim * 2);
+
+  set_zero(&f_pre);
 
   for (size_t i = 0; i < param->dim; ++i) {
+    set_polynomial(&tmp, mem, param->dim * 2);
     poly_mul(&f0->polies[i], &x->polies[i], &tmp, channel->q);
-    poly_add(f1, &tmp, f1, channel->q);
+    poly_add(&f_pre, &tmp, &f_pre, channel->q);
   }
-  poly_mod(f1, u, channel->q);
+  poly_mod(&f_pre, u, channel->q);
+
+  size_t diff = f1->size - f_pre.size;
+  f1->coeffs += diff;
+  f1->size -= diff;
+  memcpy(f1->coeffs, f_pre.coeffs, f_pre.size * sizeof(Coeff));
+
   return 0;
 }