From 1e6d7d1116f327dbda470b86f2fe2232d74800a4 Mon Sep 17 00:00:00 2001
From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net>
Date: Sun, 10 May 2020 19:29:00 +0700
Subject: [PATCH] [*] Renames und fixes
---
dap-sdk/core/libdap.pri | 4 ++-
dap-sdk/core/src/unix/linux/linux.pri | 1 +
dap-sdk/crypto/include/dap_enc_newhope.h | 31 +++++++++++++---
dap-sdk/crypto/src/dap_enc_newhope.c | 36 +++++++++++++++----
dap-sdk/crypto/src/newhope/api.h | 4 ---
dap-sdk/crypto/src/newhope/newhope.pri | 3 ++
dap-sdk/crypto/src/newhope/newhope_api.h | 3 ++
.../newhope/{cpakem.c => newhope_cpakem.c} | 6 ++--
.../newhope/{cpakem.h => newhope_cpakem.h} | 7 ++--
.../newhope/{cpapke.c => newhope_cpapke.c} | 4 +--
.../newhope/{cpapke.h => newhope_cpapke.h} | 4 +--
.../src/newhope/{ntt.c => newhope_ntt.c} | 6 ++--
.../src/newhope/{ntt.h => newhope_ntt.h} | 4 +--
.../newhope/{params.h => newhope_params.h} | 5 +--
.../src/newhope/{poly.c => newhope_poly.c} | 6 ++--
.../src/newhope/{poly.h => newhope_poly.h} | 2 +-
.../newhope/{precomp.c => newhope_precomp.c} | 4 +--
.../newhope/{reduce.c => newhope_reduce.c} | 4 +--
.../newhope/{reduce.h => newhope_reduce.h} | 0
19 files changed, 87 insertions(+), 47 deletions(-)
delete mode 100644 dap-sdk/crypto/src/newhope/api.h
create mode 100755 dap-sdk/crypto/src/newhope/newhope.pri
create mode 100644 dap-sdk/crypto/src/newhope/newhope_api.h
rename dap-sdk/crypto/src/newhope/{cpakem.c => newhope_cpakem.c} (97%)
rename dap-sdk/crypto/src/newhope/{cpakem.h => newhope_cpakem.h} (92%)
rename dap-sdk/crypto/src/newhope/{cpapke.c => newhope_cpapke.c} (99%)
rename dap-sdk/crypto/src/newhope/{cpapke.h => newhope_cpapke.h} (89%)
rename dap-sdk/crypto/src/newhope/{ntt.c => newhope_ntt.c} (99%)
rename dap-sdk/crypto/src/newhope/{ntt.h => newhope_ntt.h} (87%)
rename dap-sdk/crypto/src/newhope/{params.h => newhope_params.h} (96%)
rename dap-sdk/crypto/src/newhope/{poly.c => newhope_poly.c} (99%)
rename dap-sdk/crypto/src/newhope/{poly.h => newhope_poly.h} (97%)
rename dap-sdk/crypto/src/newhope/{precomp.c => newhope_precomp.c} (99%)
rename dap-sdk/crypto/src/newhope/{reduce.c => newhope_reduce.c} (93%)
rename dap-sdk/crypto/src/newhope/{reduce.h => newhope_reduce.h} (100%)
diff --git a/dap-sdk/core/libdap.pri b/dap-sdk/core/libdap.pri
index 118eb93d34..bf87862a3c 100755
--- a/dap-sdk/core/libdap.pri
+++ b/dap-sdk/core/libdap.pri
@@ -2,19 +2,21 @@ QMAKE_CFLAGS_DEBUG = -std=gnu11
QMAKE_CFLAGS_RELEASE = -std=gnu11
unix {
include(src/unix/unix.pri)
+ DEFINES += DAP_OS_UNIX
LIBS += -lrt
}
darwin {
include(src/darwin/darwin.pri)
+ DEFINES += DAP_OS_DARWIN
LIBS -= -lrt
}
win32 {
include(src/win32/win32.pri)
LIBS += -lpsapi
+ DEFINES += DAP_OS_WINDOWS
}
-DEFINES += DAP_LOG_MT
HEADERS += $$PWD/include/dap_common.h \
$$PWD/include/dap_config.h \
$$PWD/include/dap_math_ops.h \
diff --git a/dap-sdk/core/src/unix/linux/linux.pri b/dap-sdk/core/src/unix/linux/linux.pri
index 05fc40b8a0..e783722b47 100755
--- a/dap-sdk/core/src/unix/linux/linux.pri
+++ b/dap-sdk/core/src/unix/linux/linux.pri
@@ -3,3 +3,4 @@ HEADERS += $$PWD/dap_network_monitor.h \
SOURCES += $$PWD/dap_network_monitor.c \
INCLUDEPATH += $$PWD
+DEFINES += DAP_OS_LINUX
diff --git a/dap-sdk/crypto/include/dap_enc_newhope.h b/dap-sdk/crypto/include/dap_enc_newhope.h
index e54e22bb65..fa30a3021b 100644
--- a/dap-sdk/crypto/include/dap_enc_newhope.h
+++ b/dap-sdk/crypto/include/dap_enc_newhope.h
@@ -1,7 +1,29 @@
-#ifndef _DAP_ENC_NEWHOPE_H_
-#define _DAP_ENC_NEWHOPE_H_
-
-#include "newhope/cpakem.h"
+/*
+ * Authors:
+ * Dmitriy A. Gearasimov <naeper@demlabs.net>
+ * Demlabs Limited https://demlabs.net
+ * Sources community https://gitlab.demlabs.net/cellframe/cellframe-sdk/dap-sdk
+ * Copyright (c) 2017-2020
+ * All rights reserved.
+
+ This file is part of DAP SDK the open source project
+
+ DAP SDK is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ DAP is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with any DAP based project. If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "newhope/newhope_cpakem.h"
#include "dap_enc_key.h"
@@ -61,4 +83,3 @@ void dap_enc_newhope_kem_key_delete(struct dap_enc_key * key);
//newhope_private_key_t* dap_enc_newhope_read_private_key(const uint8_t *a_buf, size_t a_buflen);
//newhope_public_key_t* dap_enc_newhope_read_public_key(const uint8_t *a_buf, size_t a_buflen);
-#endif
diff --git a/dap-sdk/crypto/src/dap_enc_newhope.c b/dap-sdk/crypto/src/dap_enc_newhope.c
index 03630c263f..417eabf9f7 100644
--- a/dap-sdk/crypto/src/dap_enc_newhope.c
+++ b/dap-sdk/crypto/src/dap_enc_newhope.c
@@ -1,12 +1,34 @@
-#include <assert.h>
-#include <inttypes.h>
-#include <string.h>
+/*
+ * Authors:
+ * Dmitriy A. Gearasimov <naeper@demlabs.net>
+ * Demlabs Limited https://demlabs.net
+ * Sources community https://gitlab.demlabs.net/cellframe/cellframe-sdk/dap-sdk
+ * Copyright (c) 2017-2020
+ * All rights reserved.
+
+ This file is part of DAP SDK the open source project
+
+ DAP SDK is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ DAP is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with any DAP based project. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdio.h>
#include "dap_enc_newhope.h"
#include "dap_common.h"
#include "rand/dap_rand.h"
-#include "newhope/cpapke.h"
-#include "newhope/params.h"
+#include "newhope/newhope_cpapke.h"
+#include "newhope/newhope_params.h"
#define LOG_TAG "dap_enc_newhope_pke"
@@ -36,7 +58,9 @@ void dap_enc_newhope_kem_key_new_generate(struct dap_enc_key * a_key, const void
size_t kex_size, const void * seed, size_t seed_size,
size_t key_size)
{
-
+ UNUSED(kex_buf);
+ UNUSED(key_size);
+ UNUSED(seed);
DAP_NEWHOPE_SIGN_SECURITY newhope_type = NEWHOPE_1024;
dap_enc_newhope_pke_set_type(newhope_type);
diff --git a/dap-sdk/crypto/src/newhope/api.h b/dap-sdk/crypto/src/newhope/api.h
deleted file mode 100644
index bcc9e32db3..0000000000
--- a/dap-sdk/crypto/src/newhope/api.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef CHOICE_API_H
-#define CHOICE_API_H
-#include"cpakem.h"
-#endif // CHOICE_API_H
diff --git a/dap-sdk/crypto/src/newhope/newhope.pri b/dap-sdk/crypto/src/newhope/newhope.pri
new file mode 100755
index 0000000000..7f618fd998
--- /dev/null
+++ b/dap-sdk/crypto/src/newhope/newhope.pri
@@ -0,0 +1,3 @@
+INCLUDEPATH += $$PW
+HEADERS += $$PWD/newhope_api.h $$PWD/newhope_cpakem.h $$PWD/newhope_cpapke.h $$PWD/newhope_ntt.h $$PWD/newhope_params.h $$PWD/newhope_poly.h $$PWD/newhope_reduce.h
+SOURCES += $$PWD/newhope_cpakem.c $$PWD/newhope_cpapke.c $$PWD/newhope_ntt.c $$PWD/newhope_poly.c $$PWD/newhope_precomp.c $$PWD/newhope_reduce.c
diff --git a/dap-sdk/crypto/src/newhope/newhope_api.h b/dap-sdk/crypto/src/newhope/newhope_api.h
new file mode 100644
index 0000000000..6d49e650b6
--- /dev/null
+++ b/dap-sdk/crypto/src/newhope/newhope_api.h
@@ -0,0 +1,3 @@
+#pragma once
+#include "newhope_cpakem.h"
+
diff --git a/dap-sdk/crypto/src/newhope/cpakem.c b/dap-sdk/crypto/src/newhope/newhope_cpakem.c
similarity index 97%
rename from dap-sdk/crypto/src/newhope/cpakem.c
rename to dap-sdk/crypto/src/newhope/newhope_cpakem.c
index dd490654c3..934e9a10c7 100644
--- a/dap-sdk/crypto/src/newhope/cpakem.c
+++ b/dap-sdk/crypto/src/newhope/newhope_cpakem.c
@@ -1,7 +1,7 @@
#include <string.h>
-#include "api.h"
-#include "cpapke.h"
-#include "params.h"
+#include "newhope_api.h"
+#include "newhope_cpapke.h"
+#include "newhope_params.h"
#include "rand/dap_rand.h"
#include "sha3/fips202.h"
diff --git a/dap-sdk/crypto/src/newhope/cpakem.h b/dap-sdk/crypto/src/newhope/newhope_cpakem.h
similarity index 92%
rename from dap-sdk/crypto/src/newhope/cpakem.h
rename to dap-sdk/crypto/src/newhope/newhope_cpakem.h
index b5bfd2b510..0f5dfdd15a 100644
--- a/dap-sdk/crypto/src/newhope/cpakem.h
+++ b/dap-sdk/crypto/src/newhope/newhope_cpakem.h
@@ -1,7 +1,5 @@
-#ifndef API_H
-#define API_H
-
-#include "params.h"
+#pragma once
+#include "newhope_params.h"
#define CRYPTO_SECRETKEYBYTES NEWHOPE_CPAKEM_SECRETKEYBYTES
#define CRYPTO_PUBLICKEYBYTES NEWHOPE_CPAKEM_PUBLICKEYBYTES
@@ -22,4 +20,3 @@ int crypto_kem_enc(unsigned char *ct, unsigned char *ss, const unsigned char *pk
int crypto_kem_dec(unsigned char *ss, const unsigned char *ct, const unsigned char *sk);
-#endif
diff --git a/dap-sdk/crypto/src/newhope/cpapke.c b/dap-sdk/crypto/src/newhope/newhope_cpapke.c
similarity index 99%
rename from dap-sdk/crypto/src/newhope/cpapke.c
rename to dap-sdk/crypto/src/newhope/newhope_cpapke.c
index 7d804243e4..59b9f7315b 100644
--- a/dap-sdk/crypto/src/newhope/cpapke.c
+++ b/dap-sdk/crypto/src/newhope/newhope_cpapke.c
@@ -1,6 +1,6 @@
#include <stdio.h>
-#include "api.h"
-#include "poly.h"
+#include "newhope_api.h"
+#include "newhope_poly.h"
#include "rand/dap_rand.h"
#include "sha3/fips202.h"
diff --git a/dap-sdk/crypto/src/newhope/cpapke.h b/dap-sdk/crypto/src/newhope/newhope_cpapke.h
similarity index 89%
rename from dap-sdk/crypto/src/newhope/cpapke.h
rename to dap-sdk/crypto/src/newhope/newhope_cpapke.h
index 23a0fe271e..4f43a8e438 100644
--- a/dap-sdk/crypto/src/newhope/cpapke.h
+++ b/dap-sdk/crypto/src/newhope/newhope_cpapke.h
@@ -1,5 +1,4 @@
-#ifndef INDCPA_H
-#define INDCPA_H
+#pragma once
void cpapke_keypair(unsigned char *pk,
unsigned char *sk);
@@ -13,4 +12,3 @@ void cpapke_dec(unsigned char *m,
const unsigned char *c,
const unsigned char *sk);
-#endif
diff --git a/dap-sdk/crypto/src/newhope/ntt.c b/dap-sdk/crypto/src/newhope/newhope_ntt.c
similarity index 99%
rename from dap-sdk/crypto/src/newhope/ntt.c
rename to dap-sdk/crypto/src/newhope/newhope_ntt.c
index 8094553a47..5241b74b71 100644
--- a/dap-sdk/crypto/src/newhope/ntt.c
+++ b/dap-sdk/crypto/src/newhope/newhope_ntt.c
@@ -1,7 +1,7 @@
#include "inttypes.h"
-#include "ntt.h"
-#include "params.h"
-#include "reduce.h"
+#include "newhope_ntt.h"
+#include "newhope_params.h"
+#include "newhope_reduce.h"
#if (NEWHOPE_N == 512)
/************************************************************
diff --git a/dap-sdk/crypto/src/newhope/ntt.h b/dap-sdk/crypto/src/newhope/newhope_ntt.h
similarity index 87%
rename from dap-sdk/crypto/src/newhope/ntt.h
rename to dap-sdk/crypto/src/newhope/newhope_ntt.h
index f301dfcb5d..d90a539132 100644
--- a/dap-sdk/crypto/src/newhope/ntt.h
+++ b/dap-sdk/crypto/src/newhope/newhope_ntt.h
@@ -1,5 +1,4 @@
-#ifndef ntt_newhope_H
-#define ntt_newhope_H
+#pragma once
#include "inttypes.h"
@@ -11,4 +10,3 @@ void bitrev_vector_newhope(uint16_t* poly_newhope);
void mul_coefficients_newhope(uint16_t* poly_newhope, const uint16_t* factors);
void ntt_newhope(uint16_t* poly_newhope, const uint16_t* omegas);
-#endif
diff --git a/dap-sdk/crypto/src/newhope/params.h b/dap-sdk/crypto/src/newhope/newhope_params.h
similarity index 96%
rename from dap-sdk/crypto/src/newhope/params.h
rename to dap-sdk/crypto/src/newhope/newhope_params.h
index b148d6fba1..3ea9647ba3 100644
--- a/dap-sdk/crypto/src/newhope/params.h
+++ b/dap-sdk/crypto/src/newhope/newhope_params.h
@@ -1,5 +1,4 @@
-#ifndef PARAMS_H
-#define PARAMS_H
+#pragma once
#ifndef NEWHOPE_N
#define NEWHOPE_N 1024
@@ -24,5 +23,3 @@
#define NEWHOPE_CCAKEM_PUBLICKEYBYTES NEWHOPE_CPAPKE_PUBLICKEYBYTES
#define NEWHOPE_CCAKEM_SECRETKEYBYTES (NEWHOPE_CPAPKE_SECRETKEYBYTES + NEWHOPE_CPAPKE_PUBLICKEYBYTES + 2*NEWHOPE_SYMBYTES)
#define NEWHOPE_CCAKEM_CIPHERTEXTBYTES (NEWHOPE_CPAPKE_CIPHERTEXTBYTES + NEWHOPE_SYMBYTES) /* Second part is for Targhi-Unruh */
-
-#endif
diff --git a/dap-sdk/crypto/src/newhope/poly.c b/dap-sdk/crypto/src/newhope/newhope_poly.c
similarity index 99%
rename from dap-sdk/crypto/src/newhope/poly.c
rename to dap-sdk/crypto/src/newhope/newhope_poly.c
index 9736201889..8e5e04e815 100644
--- a/dap-sdk/crypto/src/newhope/poly.c
+++ b/dap-sdk/crypto/src/newhope/newhope_poly.c
@@ -1,6 +1,6 @@
-#include "poly.h"
-#include "ntt.h"
-#include "reduce.h"
+#include "newhope_poly.h"
+#include "newhope_ntt.h"
+#include "newhope_reduce.h"
#include "sha3/fips202.h"
/*************************************************
diff --git a/dap-sdk/crypto/src/newhope/poly.h b/dap-sdk/crypto/src/newhope/newhope_poly.h
similarity index 97%
rename from dap-sdk/crypto/src/newhope/poly.h
rename to dap-sdk/crypto/src/newhope/newhope_poly.h
index 17f62e99a2..112475eae5 100644
--- a/dap-sdk/crypto/src/newhope/poly.h
+++ b/dap-sdk/crypto/src/newhope/newhope_poly.h
@@ -2,7 +2,7 @@
#define poly_newhope_H
#include <stdint.h>
-#include "params.h"
+#include "newhope_params.h"
/*
* Elements of R_q = Z_q[X]/(X^n + 1). Represents polynomial
diff --git a/dap-sdk/crypto/src/newhope/precomp.c b/dap-sdk/crypto/src/newhope/newhope_precomp.c
similarity index 99%
rename from dap-sdk/crypto/src/newhope/precomp.c
rename to dap-sdk/crypto/src/newhope/newhope_precomp.c
index 22fd7a0568..fd85ecbabd 100644
--- a/dap-sdk/crypto/src/newhope/precomp.c
+++ b/dap-sdk/crypto/src/newhope/newhope_precomp.c
@@ -1,6 +1,6 @@
#include "inttypes.h"
-#include "ntt.h"
-#include "params.h"
+#include "newhope_ntt.h"
+#include "newhope_params.h"
/* Precomputed ntt_newhope contants generated by Pari/GP script as follows:
*
diff --git a/dap-sdk/crypto/src/newhope/reduce.c b/dap-sdk/crypto/src/newhope/newhope_reduce.c
similarity index 93%
rename from dap-sdk/crypto/src/newhope/reduce.c
rename to dap-sdk/crypto/src/newhope/newhope_reduce.c
index e3fb9c5088..ce48183e04 100644
--- a/dap-sdk/crypto/src/newhope/reduce.c
+++ b/dap-sdk/crypto/src/newhope/newhope_reduce.c
@@ -1,5 +1,5 @@
-#include "reduce.h"
-#include "params.h"
+#include "newhope_reduce.h"
+#include "newhope_params.h"
static const uint32_t qinv = 12287; // -inverse_mod(p,2^18)
static const uint32_t rlog = 18;
diff --git a/dap-sdk/crypto/src/newhope/reduce.h b/dap-sdk/crypto/src/newhope/newhope_reduce.h
similarity index 100%
rename from dap-sdk/crypto/src/newhope/reduce.h
rename to dap-sdk/crypto/src/newhope/newhope_reduce.h
--
GitLab