VirgilSecurity · SergeySeroshtan · Dec 6, 2019 · Oct 3, 2019 · Oct 3, 2019 · Oct 4, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -14,14 +14,12 @@ addons:
  cloc
 
 install:
- - travis_retry wget https://cmake.org/files/v3.11/cmake-3.11.1-Linux-x86_64.sh
- - sudo bash cmake-3.11.1-Linux-x86_64.sh --skip-license --exclude-subdir --prefix=/usr/local
+ - travis_retry wget https://cmake.org/files/v3.12/cmake-3.12.4-Linux-x86_64.sh
+ - sudo bash cmake-3.12.4-Linux-x86_64.sh --skip-license --exclude-subdir --prefix=/usr/local
  - export PATH="/usr/local/bin:$PATH"
  - mkdir -p $HOME/protobuf && pushd $HOME/protobuf
  && wget 'https://github.com/google/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip' -O protoc-3.6.1-linux-x86_64.zip
  && unzip protoc-3.6.1-linux-x86_64.zip -d protoc-3.6.1-linux-x86_64
- && popd
- - pushd $HOME/protobuf
  && wget 'https://github.com/google/protobuf/releases/download/v3.6.1/protobuf-python-3.6.1.tar.gz' -O protobuf-python-3.6.1.tar.gz
  && tar xzf protobuf-python-3.6.1.tar.gz
  && cp protoc-3.6.1-linux-x86_64/bin/protoc protobuf-3.6.1/src/
@@ -36,7 +34,11 @@ before_script:
  - valgrind --version
 
 script:
- - cmake -H. -Bbuild -DENABLE_HEAVY_TESTS=OFF -DVIRGIL_C_MT_TESTING=OFF -DENABLE_BENCHMARKING=ON
+ - cmake -H. -Bbuild
+ -DENABLE_HEAVY_TESTS=OFF
+ -DVIRGIL_C_MT_TESTING=OFF
+ -DENABLE_BENCHMARKING=ON
+ -DVIRGIL_POST_QUANTUM=ON
  - cmake --build build -- -j8
  && pushd build
  && ctest -T memcheck --output-on-failure

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,7 +32,7 @@
 #
 # Lead Maintainer: Virgil Security Inc. <[email protected]>
 
-cmake_minimum_required(VERSION 3.11 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
 
 project(virgil_crypto VERSION 0.12.0 LANGUAGES C)
 
@@ -96,6 +96,11 @@ option(VIRGIL_LIB_ED25519 "Build 'ed25519' library" ON)
 option(VIRGIL_LIB_RATCHET "Build 'ratchet' library" ON)
 option(VIRGIL_LIB_PHE "Build 'phe' library" ON)
 
+#
+# Features
+#
+option(VIRGIL_POST_QUANTUM "Enable post-quantum cryptography [experemental]." OFF)
+
 #
 # Wrappers
 #
@@ -105,6 +110,7 @@ option(VIRGIL_WRAP_PHP "Build 'PHP' wrapper" OFF)
 option(VIRGIL_WRAP_JAVA "Build 'Java' wrapper" OFF)
 option(VIRGIL_WRAP_WASM "Build 'WebAssembly' wrapper" OFF)
 
+
 # ---------------------------------------------------------------------------
 # Platfrom specific.
 # ---------------------------------------------------------------------------
@@ -179,6 +185,14 @@ endif()
 #
 add_subdirectory("thirdparty/nanopb")
 
+#
+# Post-quantum
+#
+if(VIRGIL_POST_QUANTUM)
+ add_subdirectory("thirdparty/keccak")
+ add_subdirectory("thirdparty/round5")
+ add_subdirectory("thirdparty/falcon")
+endif()
 
 # ---------------------------------------------------------------------------
 # Library core libraries

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -128,6 +128,8 @@ def build_LangC_Unix(slave) {
  -DCPACK_OUTPUT_FILE_PREFIX=c \
  -DENABLE_CLANGFORMAT=OFF \
  -DED25519_AMD64_RADIX_64_24K=ON -DED25519_REF10=OFF \
+ -DVIRGIL_C_MT_TESTING=ON \
+ -DVIRGIL_POST_QUANTUM=ON \
  -Bbuild -H.
  cmake --build build -- -j10
  cd build
@@ -157,6 +159,7 @@ def build_LangC_Windows(slave) {
  -DCPACK_OUTPUT_FILE_PREFIX=c ^
  -DENABLE_CLANGFORMAT=OFF ^
  -DVIRGIL_C_MT_TESTING=ON ^
+ -DVIRGIL_POST_QUANTUM=ON ^
  -Bbuild -H.
  cmake --build build
  cd build
@@ -188,6 +191,7 @@ def build_LangPHP_Linux(slave) {
  -DCPACK_OUTPUT_FILE_PREFIX=php \
  -DENABLE_CLANGFORMAT=OFF \
  -DED25519_AMD64_RADIX_64_24K=ON -DED25519_REF10=OFF \
+ -DVIRGIL_POST_QUANTUM=ON \
  -Bbuild -H.
  cmake --build build -- -j10
  cd build
@@ -208,6 +212,7 @@ def build_LangPHP_Linux(slave) {
  -DVIRGIL_PACKAGE_LANGUAGE_VERSION=7.3 \
  -DCPACK_OUTPUT_FILE_PREFIX=php \
  -DENABLE_CLANGFORMAT=OFF \
+ -DVIRGIL_POST_QUANTUM=ON \
  -Bbuild -H.
  cmake --build build -- -j10
  cd build
@@ -238,6 +243,7 @@ def build_LangPHP_MacOS(slave) {
  -DCPACK_OUTPUT_FILE_PREFIX=php \
  -DENABLE_CLANGFORMAT=OFF \
  -DED25519_AMD64_RADIX_64_24K=ON -DED25519_REF10=OFF \
+ -DVIRGIL_POST_QUANTUM=ON \
  -Bbuild -H.
  cmake --build build -- -j10
  cd build
@@ -258,6 +264,7 @@ def build_LangPHP_MacOS(slave) {
  -DVIRGIL_PACKAGE_LANGUAGE_VERSION=7.3 \
  -DCPACK_OUTPUT_FILE_PREFIX=php \
  -DENABLE_CLANGFORMAT=OFF \
+ -DVIRGIL_POST_QUANTUM=ON \
  -Bbuild -H.
  cmake --build build -- -j10
  cd build
@@ -290,6 +297,7 @@ def build_LangPHP_Windows(slave) {
  -DVIRGIL_PACKAGE_LANGUAGE_VERSION=7.2 ^
  -DCPACK_OUTPUT_FILE_PREFIX=php ^
  -DENABLE_CLANGFORMAT=OFF ^
+ -DVIRGIL_POST_QUANTUM=ON ^
  -Bbuild -H.
  cmake --build build
  cd build
@@ -316,6 +324,7 @@ def build_LangPHP_Windows(slave) {
  -DVIRGIL_PACKAGE_LANGUAGE_VERSION=7.3 ^
  -DCPACK_OUTPUT_FILE_PREFIX=php ^
  -DENABLE_CLANGFORMAT=OFF ^
+ -DVIRGIL_POST_QUANTUM=ON ^
  -Bbuild -H.
  cmake --build build
  cd build
@@ -345,6 +354,7 @@ def build_LangJava_Linux(slave) {
  -DCMAKE_INSTALL_PREFIX="wrappers/java/binaries/linux" \
  -DENABLE_CLANGFORMAT=OFF \
  -DED25519_AMD64_RADIX_64_24K=ON -DED25519_REF10=OFF \
+ -DVIRGIL_POST_QUANTUM=ON \
  -Bbuild -H.
 
  cmake --build build --target install -- -j10
@@ -369,6 +379,7 @@ def build_LangJava_MacOS(slave) {
  -DCMAKE_INSTALL_PREFIX="wrappers/java/binaries/macos" \
  -DENABLE_CLANGFORMAT=OFF \
  -DED25519_AMD64_RADIX_64_24K=ON -DED25519_REF10=OFF \
+ -DVIRGIL_POST_QUANTUM=ON \
  -Bbuild -H.
 
  cmake --build build --target install -- -j10
@@ -396,6 +407,7 @@ def build_LangJava_Windows(slave) {
  -DCMAKE_BUILD_TYPE=Release ^
  -DCMAKE_INSTALL_PREFIX="wrappers\\java\\binaries\\windows" ^
  -DENABLE_CLANGFORMAT=OFF ^
+ -DVIRGIL_POST_QUANTUM=ON ^
  -Bbuild -H.
  cmake --build build --target install
 
@@ -421,6 +433,7 @@ def build_LangJava_Android_x86(slave) {
  -DCMAKE_INSTALL_PREFIX="wrappers/java/binaries/android" \
  -DCMAKE_INSTALL_LIBDIR="lib/x86" \
  -DENABLE_CLANGFORMAT=OFF \
+ -DVIRGIL_POST_QUANTUM=ON \
  -Bbuild -H.
 
  cmake --build build --target install -- -j10
@@ -445,6 +458,7 @@ def build_LangJava_Android_x86_64(slave) {
  -DCMAKE_INSTALL_PREFIX="wrappers/java/binaries/android" \
  -DCMAKE_INSTALL_LIBDIR="lib/x86_64" \
  -DENABLE_CLANGFORMAT=OFF \
+ -DVIRGIL_POST_QUANTUM=ON \
  -Bbuild -H.
 
  cmake --build build --target install -- -j10
@@ -469,6 +483,7 @@ def build_LangJava_Android_armeabi_v7a(slave) {
  -DCMAKE_INSTALL_PREFIX="wrappers/java/binaries/android" \
  -DCMAKE_INSTALL_LIBDIR="lib/armeabi-v7a" \
  -DENABLE_CLANGFORMAT=OFF \
+ -DVIRGIL_POST_QUANTUM=ON \
  -Bbuild -H.
 
  cmake --build build --target install -- -j10
@@ -493,6 +508,7 @@ def build_LangJava_Android_arm64_v8a(slave) {
  -DCMAKE_INSTALL_PREFIX="wrappers/java/binaries/android" \
  -DCMAKE_INSTALL_LIBDIR="lib/arm64-v8a" \
  -DENABLE_CLANGFORMAT=OFF \
+ -DVIRGIL_POST_QUANTUM=ON \
  -Bbuild -H.
 
  cmake --build build --target install -- -j10
@@ -518,6 +534,7 @@ def build_LangPython_Linux(slave) {
  -DCMAKE_INSTALL_PREFIX="wrappers/python/virgil_crypto_lib" \
  -DCMAKE_INSTALL_LIBDIR=_libs \
  -DENABLE_CLANGFORMAT=OFF \
+ -DVIRGIL_POST_QUANTUM=ON \
  -Bbuild -H.
  cmake --build build --target install -- -j8
 
@@ -541,6 +558,7 @@ def build_LangPython_MacOS(slave) {
  -DCMAKE_INSTALL_PREFIX="wrappers/python/virgil_crypto_lib" \
  -DCMAKE_INSTALL_LIBDIR=_libs \
  -DENABLE_CLANGFORMAT=OFF \
+ -DVIRGIL_POST_QUANTUM=ON \
  -Bbuild -H.
  cmake --build build --target install -- -j8
 
@@ -569,6 +587,7 @@ def build_LangPython_Windows(slave) {
  -DCMAKE_INSTALL_LIBDIR=_libs ^
  -DCMAKE_INSTALL_BINDIR=_libs ^
  -DENABLE_CLANGFORMAT=OFF ^
+ -DVIRGIL_POST_QUANTUM=ON ^
  -Bbuild -H.
  cmake --build build --target install
 
@@ -592,6 +611,7 @@ def build_LangPython_Windows(slave) {
  -DCMAKE_INSTALL_LIBDIR=_libs ^
  -DCMAKE_INSTALL_BINDIR=_libs ^
  -DENABLE_CLANGFORMAT=OFF ^
+ -DVIRGIL_POST_QUANTUM=ON ^
  -Bbuild -H.
  cmake --build build --target install
 

diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ Implementation of the [Double Ratchet Algorithm](https://en.wikipedia.org/wiki/D
  - `clang` (version >= 3.6), or
  - `msvc` (version >= 14.0)
 * Build tools:
- - `cmake` (version >= 3.11)
+ - `cmake` (version >= 3.12)
  - `python` (version >= 2.7)
  - `python-protobuf`
 

diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
@@ -32,7 +32,7 @@
 #
 # Lead Maintainer: Virgil Security Inc. <[email protected]>
 
-cmake_minimum_required(VERSION 3.11 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
 
 project(virgil_crypto_c_benchmarks VERSION ${virgil_crypto_VERSION} LANGUAGES CXX)
 

diff --git a/benchmarks/foundation/CMakeLists.txt b/benchmarks/foundation/CMakeLists.txt
@@ -32,7 +32,7 @@
 #
 # Lead Maintainer: Virgil Security Inc. <[email protected]>
 
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.12)
 project(virgil_crypto_c_foundation_benchmarks VERSION ${virgil_crypto_c_benchmarks_VERSION} LANGUAGES CXX)
 
 add_subdirectory(data)

diff --git a/benchmarks/foundation/data/CMakeLists.txt b/benchmarks/foundation/data/CMakeLists.txt
@@ -32,7 +32,7 @@
 #
 # Lead Maintainer: Virgil Security Inc. <[email protected]>
 
-cmake_minimum_required(VERSION 3.11 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
 
 project(benchmark_data_foundation VERSION ${virgil_crypto_c_foundation_benchmarks_VERSION} LANGUAGES C)
 

diff --git a/cmake/find_host_utils.cmake b/cmake/find_host_utils.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2017 Virgil Security Inc.
+# Copyright (C) 2015-2019 Virgil Security, Inc.
 #
 # All rights reserved.
 #

diff --git a/codegen/c_features.gsl b/codegen/c_features.gsl
@@ -93,6 +93,7 @@ function _F21_create_require (require, destination)
 
  else
  .feature = _F21_derive_require_name (my.require)
+ .is_optional = my.require.is_optional ?
  endfor
  endnew
 endfunction

diff --git a/codegen/class.gsl b/codegen/class.gsl
@@ -297,23 +297,30 @@ endfunction
 function class_create_feature (class, project, destination)
  check_arguments (my, "class, project, destination", my)
 
- new feature to my.destination
- . = "Enable class '$(my.class.name)'."
- .name = my.class.name
- .project = my.project.name
+ my.class_feature = my.class->feature(feature.name = my.class.name) ?
+ if !defined(my.class_feature)
+ new feature to my.destination
+ .name = my.class.name
+ my.class_feature = feature
+ endnew
+ else
+ my.class_feature = item_copy_to(my.class_feature, my.destination)
+ endif
+ my.class_feature. ?= "Enable class '$(my.class.name)'."
+ my.class_feature.project = my.project.name
 
-  for my.class.require where defined (0.feature)
-  copy require to feature
-  endfor
+ for my.class.require where defined (0.feature)
+ copy require to my.class_feature
+ endfor
 
-  for my.class.require where has_one_of_attribute (require, "class, interface, impl")
-  new require to feature
-  .feature = -1.class ? -1.interface ? -1.impl
-  .scope = -1.scope ?
-  .project = -1.project ?
- endnew
- endfor
- endnew
+ for my.class.require where has_one_of_attribute (require, "class, interface, impl")
+ new require to my.class_feature
+ .feature = -1.class ? -1.interface ? -1.impl
+ .scope = -1.scope ?
+ .project = -1.project ?
+ .is_optional = -1.is_optional ?
+ endnew
+ endfor
 endfunction
 
 # ---------------------------------------------------------------------------

diff --git a/codegen/cmake_files_codegen.gsl b/codegen/cmake_files_codegen.gsl
@@ -259,7 +259,7 @@ function cmake_generate_features (source, license)
 
 
  for c_features.c_feature where count (c_feature.c_require)
- for c_feature.c_require
+ for c_feature.c_require where is_false(c_require.is_optional)
  newline ()
 
  for c_require.c_alternative

diff --git a/codegen/features.gsl b/codegen/features.gsl
@@ -90,15 +90,6 @@ function _D25_resolve_attr_default (item, parent)
  check_arguments (my, "item", my)
 
  my.item.default ?= "on"
-
- my.valid_defaults = "on, off"
-
- if ! string_in (my.item.default, my.valid_defaults)
- my.component_dump = component_dump (my.item)
-
- echo_fatal ("Invalid item attribute 'default' '$(my.component_dump:)'. " + \
- "Expected {$(my.valid_defaults)}", my)
- endif
 endfunction
 
 # ---------------------------------------------------------------------------
@@ -214,10 +205,15 @@ function features_list_update_from_library (features_list, library)
  .path = my.library.path
  .library = my.library.name
 
- new feature to features
- . = "Enable build of the '$(my.library.name:)' library"
- .name = "library"
- endnew
+ my.library_feature = my.library->feature(feature.name = "library") ?
+ if !defined(my.library_feature)
+ new feature to features
+ .name = "library"
+ my.library_feature = feature
+ endnew
+ endif
+ my.library_feature. ?= "Enable build of the '$(my.library.name:)' library"
+
 
  for my.library.feature
  copy feature to features
@@ -250,10 +246,15 @@ function features_list_update_from_project (features_list, project)
  .project = my.project.name
  .cmake_target = my.project.cmake_target
 
- new feature to features
- . = "Enable build of the '$(my.project.name:)' library"
- .name = "library"
- endnew
+
+ my.library_feature = my.project->feature(feature.name = "library") ?
+ if !defined(my.library_feature)
+ new feature to features
+ .name = "library"
+ my.library_feature = feature
+ endnew
+ endif
+ my.library_feature. ?= "Enable build of the '$(my.project.name:)' library"
 
  for my.project.feature
  copy feature to features