~ change framework name ABYN -> MOTION

.gitignore

@@ -14,8 +14,8 @@ README.html
 .idea*
 *_generated.h
 
-src/abyncore/communication/fbs_headers/*
-src/abyncore/utility/config.h
+src/motioncore/communication/fbs_headers/*
+src/motioncore/utility/config.h
 
 # build directory
 build*/

.travis.yml

@@ -22,9 +22,9 @@ before_install:
 script:
   - mkdir build_debug
   - cd build_debug
-  - CC=/usr/bin/gcc-8 CXX=/usr/bin/g++-8 cmake -DCMAKE_BUILD_TYPE=Debug -DABYN_BUILD_TESTS=On -j 2 ..
+  - CC=/usr/bin/gcc-8 CXX=/usr/bin/g++-8 cmake -DCMAKE_BUILD_TYPE=Debug -DMOTION_BUILD_TESTS=On -j 2 ..
   - make -j 2
-  - ./bin/abyntest
+  - ./bin/motiontest
 
 notifications:
   - email: false

CMakeLists.txt

@@ -1,18 +1,18 @@
 cmake_minimum_required(VERSION 3.12)
 cmake_policy(SET CMP0075 NEW)
-project(ABYN LANGUAGES CXX)
-set(ABYN_VERSION 0.01)
+project(MOTION LANGUAGES CXX)
+set(MOTION_VERSION 0.01)
 
 
 if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
     message(FATAL_ERROR "ENCRYPTO_utils require at least g++-8")
 endif ()
 
-option(ABYN_BUILD_EXE "Build executables" OFF)
-option(ABYN_BUILD_TESTS "Build tests" OFF)
-option(ABYN_BUILD_DOC "Build documentation" OFF)
-set(ABYN_USE_AVX OFF CACHE STRING "Use AVX/AVX2/AVX512 instructions")
-set_property(CACHE ABYN_USE_AVX PROPERTY STRINGS OFF AVX AVX2 AVX512)
+option(MOTION_BUILD_EXE "Build executables" OFF)
+option(MOTION_BUILD_TESTS "Build tests" OFF)
+option(MOTION_BUILD_DOC "Build documentation" OFF)
+set(MOTION_USE_AVX OFF CACHE STRING "Use AVX/AVX2/AVX512 instructions")
+set_property(CACHE MOTION_USE_AVX PROPERTY STRINGS OFF AVX AVX2 AVX512)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 find_package(GMP REQUIRED)
@@ -29,9 +29,9 @@ find_package(Boost 1.66.0
         REQUIRED)
 set(Boost_USE_STATIC_LIBS ON)
 
-set(ABYN_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-set(ABYN_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
-set(ABYN_EXTERN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/extern")
+set(MOTION_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+set(MOTION_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
+set(MOTION_EXTERN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/extern")
 
 
 if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
@@ -46,14 +46,14 @@ if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 endif ()
 
 if ("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
-    set(ABYN_DEBUG "true")
+    set(MOTION_DEBUG "true")
 else ()
-    set(ABYN_DEBUG "false")
+    set(MOTION_DEBUG "false")
 endif ()
 
 configure_file(
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/abyncore/utility/config.h.in
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/abyncore/utility/config.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/motioncore/utility/config.h.in
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/motioncore/utility/config.h
         ESCAPE_QUOTES
 )
 
@@ -100,16 +100,16 @@ elseif (NOT Flatbuffers_FOUND AND NOT TARGET flatbuffers::flatbuffers)
     set(FLATBUFFERS_BUILD_FLATHASH OFF CACHE BOOL "Disable building flathash" FORCE)
     set(FLATBUFFERS_BUILD_TESTS OFF CACHE BOOL "Disable building flatbuffers tests" FORCE)
     set(FBS_DIR_FULL_PREFIX "${PROJECT_SOURCE_DIR}/fbs")
-    set(FBS_INCLUDE_PREFIX "${CMAKE_SOURCE_DIR}/src/abyncore/communication/fbs_headers")
+    set(FBS_INCLUDE_PREFIX "${CMAKE_SOURCE_DIR}/src/motioncore/communication/fbs_headers")
     add_subdirectory(${PROJECT_SOURCE_DIR}/extern/flatbuffers
             ${CMAKE_CURRENT_BINARY_DIR}/flatbuffers-build)
     set(FLATBUFFERS_FLATC_EXECUTABLE "${PROJECT_BINARY_DIR}/bin/flatc")
 endif ()
 add_subdirectory(fbs)
 
-add_subdirectory(src/abyncore)
+add_subdirectory(src/motioncore)
 
-if (ABYN_BUILD_TESTS)
+if (MOTION_BUILD_TESTS)
     if (NOT EXISTS "${PROJECT_SOURCE_DIR}/extern/googletest/CMakeLists.txt")
         find_package(Git REQUIRED)
         message("initialize Git submodule: extern/googletest")
@@ -120,12 +120,12 @@ if (ABYN_BUILD_TESTS)
     set(BUILD_GMOCK OFF CACHE BOOL "Disable building gmock" FORCE)
     add_subdirectory(extern/googletest)
     add_subdirectory(src/test)
-endif (ABYN_BUILD_TESTS)
+endif (MOTION_BUILD_TESTS)
 
-if (ABYN_BUILD_EXE)
+if (MOTION_BUILD_EXE)
     add_subdirectory(src/examples)
-endif (ABYN_BUILD_EXE)
+endif (MOTION_BUILD_EXE)
 
-if (ABYN_BUILD_DOC)
+if (MOTION_BUILD_DOC)
     add_subdirectory(docs)
-endif (ABYN_BUILD_DOC)
+endif (MOTION_BUILD_DOC)

README.md

@@ -1,4 +1,4 @@
-# ABY-N [![Build Status](https://travis-ci.com/Oleksandr-Tkachenko/ABYN.svg?token=vWcBQYzxXnAWavBdMFeK&branch=master)](https://travis-ci.com/Oleksandr-Tkachenko/ABYN)
+# MOTION [![Build Status](https://travis-ci.com/Oleksandr-Tkachenko/MOTION.svg?token=vWcBQYzxXnAWavBdMFeK&branch=master)](https://travis-ci.com/Oleksandr-Tkachenko/MOTION)
 
 ### A Framework for Efficient Mixed-Protocol Secure Multi-Party Computation and Trustworthy Outsourcing
 
@@ -8,8 +8,8 @@ This code is provided as a experimental implementation for testing purposes and
 
 ---
 
-* A **Linux distribution** of your choice (ABY-N was developed and tested with recent versions of [Ubuntu](http://www.ubuntu.com/), [Manjaro](https://manjaro.org/) and [Arch Linux](https://www.archlinux.org/)).
-* **Required packages for ABY-N:**
+* A **Linux distribution** of your choice (MOTION was developed and tested with recent versions of [Ubuntu](http://www.ubuntu.com/), [Manjaro](https://manjaro.org/) and [Arch Linux](https://www.archlinux.org/)).
+* **Required packages for MOTION:**
   * `g++` (version >=8)
     or another compiler and standard library implementing C++17 including the filesystem library
   * `make`
@@ -18,16 +18,16 @@ This code is provided as a experimental implementation for testing purposes and
   * **TODO** complete this list
 
 
-#### Building ABY-N
+#### Building MOTION
 
 ##### Short Version
 
-1. Clone the ABY-N git repository by running:
+1. Clone the MOTION git repository by running:
     ```
     git clone https://github.com/encryptogroup/ABY.git
     ```
 
-2. Enter the Framework directory: `cd ABYN/`
+2. Enter the Framework directory: `cd MOTION/`
 
 3. Create and enter the build directory: `mkdir build && cd build`
 
@@ -46,7 +46,7 @@ This code is provided as a experimental implementation for testing purposes and
 
 ###### External Dependencies
 
-ABY-N depends on the following libraries:
+MOTION depends on the following libraries:
 * [boost](https://www.boost.org/)
 * [flatbuffers](https://github.com/google/flatbuffers)
 * [fmt](https://github.com/fmtlib/fmt)
@@ -67,16 +67,16 @@ system for these libraries. (**TODO**: is this still the case?)
     cmake .. -DCMAKE_PREFIX_PATH=~/some/path/
     ```
 * Otherwise, CMake updates and initializes the Git submodules in `extern/` (if
-  not already done), and the missing dependencies are built together with ABY-N.
+  not already done), and the missing dependencies are built together with MOTION.
   If you want to do this without a network connection, consider to clone the
   repository recursively.
 
 ###### Test Executables and Example Applications
 
-ABY-N executables and test cases are not built by default.
-This can be enabled with the `ABYN_BUILD_EXE` or `ABYN_BUILD_TESTS` option, respectively, e.g.:
+MOTION executables and test cases are not built by default.
+This can be enabled with the `MOTION_BUILD_EXE` or `MOTION_BUILD_TESTS` option, respectively, e.g.:
 ```
-cmake .. -DABYN_BUILD_EXE=On
+cmake .. -DMOTION_BUILD_EXE=On
 ```
 
 ###### Build Options
@@ -103,16 +103,16 @@ To clean only parts of the build, either invoke `make clean` in the specific
 subdirectory or use `make -C`:
 
 * `make clean` - clean everything
-* `make -C src/abycore clean` - clean only the ABY-N library
+* `make -C src/abycore clean` - clean only the MOTION library
 * `make -C src/examples clean` - clean only the examples
 * `make -C src/test clean` - clean only the test application
 * `make -C extern clean` - clean only the built dependencies
 
 
 ###### Installation
 
-In case you plan to use ABY-N for your own application, you might want to install
-the ABY-N library to some place, for example system-wide (e.g. at `/usr/local`)
+In case you plan to use MOTION for your own application, you might want to install
+the MOTION library to some place, for example system-wide (e.g. at `/usr/local`)
 or somewhere in your workspace (e.g. `/path/to/aby`).
 There are two relevant options:
 
@@ -125,7 +125,7 @@ There are two relevant options:
   is used by the Makefile to install to a nonstandard location.
 
 Example:
-If you want to install ABY-N to `~/path/to/aby/prefix/{include,lib}` you can use:
+If you want to install MOTION to `~/path/to/aby/prefix/{include,lib}` you can use:
 ```
 cmake .. -DCMAKE_INSTALL_PREFIX=""
 make
@@ -140,12 +140,12 @@ make install
 
 
 #### Developer Guide and Documentation
-**TODO:** We provide an extensive developer guide with many examples and explanations of how to use ABY-N.
+**TODO:** We provide an extensive developer guide with many examples and explanations of how to use MOTION.
 
-**TODO:** Also, see the online doxygen documentation of ABY-N for further information and comments on the code.
+**TODO:** Also, see the online doxygen documentation of MOTION for further information and comments on the code.
 
 
-### ABY-N Applications
+### MOTION Applications
 
 ---
 

cmake/ABYNConfig.cmake.in → cmake/MOTIONConfig.cmake.in

@@ -1,6 +1,6 @@
-get_filename_component(ABYN_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(MOTION_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 
-list(APPEND CMAKE_MODULE_PATH "${ABYN_CMAKE_DIR}")
+list(APPEND CMAKE_MODULE_PATH "${MOTION_CMAKE_DIR}")
 
 include(CMakeFindDependencyMacro)
 
@@ -12,6 +12,6 @@ find_dependency(Threads)
 find_dependency(flatbuffers)
 find_dependency(fmt)
 
-if(NOT TARGET ABYN::abyn)
-    include("${ABY_CMAKE_DIR}/ABYNTargets.cmake")
+if(NOT TARGET MOTION::motion)
+    include("${ABY_CMAKE_DIR}/MOTIONTargets.cmake")
 endif()

docs/CMakeLists.txt

@@ -11,7 +11,7 @@ if (DOXYGEN_FOUND)
 
     message("Building docs")
 
-    add_custom_target(abyn_doc
+    add_custom_target(motion_doc
             ALL
             COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}

docs/Doxyfile.in

@@ -1,14 +1,14 @@
 PROJECT_NAME            = @PROJECT_NAME@
-PROJECT_NUMBER          = @ABYN_VERSION@
+PROJECT_NUMBER          = @MOTION_VERSION@
 PROJECT_BRIEF           = "Framework for mixed-protocol multi-party computation"
 OUTPUT_LANGUAGE         = English
 
 OUTPUT_DIRECTORY        = @CMAKE_CURRENT_BINARY_DIR@/
-INPUT                   = @ABYN_SOURCE_DIR@/
+INPUT                   = @MOTION_SOURCE_DIR@/
 INCLUDE_PATH            = @GXX_INCLUDES@ \
-                          @ABYN_SOURCE_DIR@/abyncore/ \
-                          @ABYN_EXTERN_DIR@/flatbuffers/include/ \
-                          @ABYN_EXTERN_DIR@/fmt/include/
+                          @MOTION_SOURCE_DIR@/motioncore/ \
+                          @MOTION_EXTERN_DIR@/flatbuffers/include/ \
+                          @MOTION_EXTERN_DIR@/fmt/include/
 RECURSIVE               = YES
 MACRO_EXPANSION         = YES
 ENABLE_PREPROCESSING    = YES

fbs/base_ot.fbs

@@ -1,4 +1,4 @@
-namespace ABYN.Communication;
+namespace MOTION.Communication;
 
 table BaseROTMessage {
   base_ot_id:uint64;

fbs/bmr_message.fbs

@@ -1,4 +1,4 @@
-namespace ABYN.Communication;
+namespace MOTION.Communication;
 
 table BMRMessage {
   gate_id:uint64;       // gate id

fbs/hello_message.fbs

@@ -1,4 +1,4 @@
-namespace ABYN.Communication;
+namespace MOTION.Communication;
 
 table HelloMessage {
   source_id:uint16;
@@ -7,7 +7,7 @@ table HelloMessage {
   input_sharing_seed:[ubyte]; //32-byte seed
   fixed_key_aes_seed:[ubyte]; //16-byte key
   online_after_setup:bool = false;
-  ABYN_version:float;
+  MOTION_version:float;
 }
 // MT/OT generation parameters?
 // other parameters?

fbs/message.fbs

@@ -1,4 +1,4 @@
-namespace ABYN.Communication;
+namespace MOTION.Communication;
 
 enum MessageType : ubyte {
   HelloMessage = 0,

fbs/ot_extension.fbs

@@ -1,4 +1,4 @@
-namespace ABYN.Communication;
+namespace MOTION.Communication;
 
 table OTExtensionMessage {
   i:uint64;       // u_i with i \in {0, ..., \kappa - 1} or y_i with i \in {0, ..., m - 1}

fbs/output_message.fbs

@@ -1,4 +1,4 @@
-namespace ABYN.Communication;
+namespace MOTION.Communication;
 
 table OutputWire {
   payload:[ubyte];      // uint8 output buffer

src/examples/example_dummy/CMakeLists.txt

@@ -1,7 +1,7 @@
 add_executable(example_dummy example_dummy.cpp)
 
 target_link_libraries(example_dummy
-        ABYN::abyn
+        MOTION::motion
         )
 
 target_compile_features(example_dummy PRIVATE cxx_std_17)