Merge pull request #28 from All-Your-Locks-Are-Belong-To-Us/feature/example-nrf

Author: frcroth

examples/measurements/CMakeLists.txt

@@ -1,11 +1,10 @@
 include(../../cmake/linker-map.cmake)
 
-set(measurement_dependencies gpio.c)
-
 function(add_measurement name)
-    add_executable(${name} "${name}.c" ${measurement_dependencies})
-    add_linker_map_for_target(${name})
-    target_link_libraries(${name} ${PRODUCT_NAME})
+  add_executable(${name} "common/${name}.c" common/gpio.c)
+  target_include_directories(${name} PRIVATE common/)
+  add_linker_map_for_target(${name})
+  target_link_libraries(${name} ${PRODUCT_NAME})
 endfunction()
 
 add_measurement("aes_gcm_measure")

examples/measurements/README.md

@@ -0,0 +1,17 @@
+# Measurements
+
+This folder contains several programs to measure the energy and time it takes for the different algorithms to complete.
+
+## Compiling for ATmega
+
+The measurement programs are compiled automatically, when compiling the `libmicrofido2`.
+
+## Compiling for nRF52
+
+The examples must be compiled explicitly for the nRF52.
+
+First, navigate to the [nrf52](./nrf52) folder.
+Then, make sure to select the algorithm you want to measure in the `CMakeLists.txt` by modifying the `set(MEASURE_ALGORITHM aes_gcm)`.
+Finally, the build procedure is similar to the one in the [nrf52 example](../nrf52/README.md).
+To initially build the program, execute: `sudo docker run --rm -v $PWD/../../../:/libmicrofido2 nrf52-sdk west -v build -b nrf52840dk_nrf52840 -d /libmicrofido2/examples/measurements/nrf52/build /libmicrofido2/examples/measurements/nrf52`.
+To build the program and flash it, execute: `docker run --rm -v $PWD/../../../:/libmicrofido2 --privileged --device=/dev/ttyACM? nrf52-sdk west flash -d /libmicrofido2/examples/measurements/nrf52/build`.

examples/measurements/aes_gcm_measure.c …es/measurements/common/aes_gcm_measure.cexamples/measurements/aes_gcm_measure.c renamed to examples/measurements/common/aes_gcm_measure.c examples/measurements/aes_gcm_measure.c renamed to examples/measurements/common/aes_gcm_measure.c

@@ -31,6 +31,31 @@ void delay(double ms) {
     }
 }
 
+#elif defined(__ZEPHYR__)
+
+#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/gpio.h>
+
+static struct device* dev;
+
+int setup_pin() {
+    dev = device_get_binding("GPIO_0");
+    gpio_pin_configure(dev, 27, GPIO_OUTPUT);
+}
+
+void pin_on() {
+    gpio_pin_set(dev, 27, 1);
+}
+
+void pin_off() {
+    gpio_pin_set(dev, 27, 0);
+}
+
+void delay(double ms) {
+    k_sleep(K_MSEC(ms));
+}
+
 #else
 // To make the examples compile, default to NOOP.
 #warning GPIO does not work on this system, defaulting to nop

examples/measurements/ed25519_measure.c …es/measurements/common/ed25519_measure.cexamples/measurements/ed25519_measure.c renamed to examples/measurements/common/ed25519_measure.c examples/measurements/ed25519_measure.c renamed to examples/measurements/common/ed25519_measure.c

@@ -0,0 +1,63 @@
+# Set this to one of the following: aes_gcm, ed25519, inflate, sha256, sha512
+set(measure_algorithm aes_gcm)
+
+#######################################
+# General
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(nrf52-libmicrofido C)
+
+target_sources(app PRIVATE "src/${measure_algorithm}_measure.c" src/gpio.c)
+target_include_directories(app PRIVATE src/)
+
+#######################################
+# libmicrofido2
+
+# Necessary for building libmicrofido2
+include(ExternalProject)
+
+# Extract the Zephyr compilation settings.
+zephyr_get_include_directories_for_lang_as_string(       C includes)
+zephyr_get_system_include_directories_for_lang_as_string(C system_includes)
+zephyr_get_compile_definitions_for_lang_as_string(       C definitions)
+zephyr_get_compile_options_for_lang_as_string(           C options)
+
+set(external_project_cflags
+"${includes} ${definitions} ${options} ${system_includes} --specs=nosys.specs"
+)
+
+# Directory settings.
+set(libmicrofido2_src_dir   ${CMAKE_CURRENT_SOURCE_DIR}/../../../)
+set(libmicrofido2_build_dir ${CMAKE_CURRENT_BINARY_DIR}/libmicrofido2)
+
+set(LIBMICROFIDO2_LIB_DIR     ${libmicrofido2_build_dir})
+set(LIBMICROFIDO2_INCLUDE_DIR ${libmicrofido2_src_dir}/include)
+
+ExternalProject_Add(
+libmicrofido2_project   # Name for custom target
+PREFIX                  ${libmicrofido2_build_dir} # Root directory for the lib.
+SOURCE_DIR              ${libmicrofido2_src_dir}
+BINARY_DIR              ${libmicrofido2_build_dir}
+CMAKE_ARGS              # Pass the necessary build flags.
+-DCMAKE_C_FLAGS=${external_project_cflags}
+-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+-DCMAKE_AR=${CMAKE_AR}
+-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+INSTALL_COMMAND         "" # No installation necessary, just build it.
+BUILD_BYPRODUCTS        ${LIBMICROFIDO2_LIB_DIR}/libmicrofido2.a
+)
+
+# Create a wrapper CMake library that our app can link with.
+add_library(libmicrofido2_lib STATIC IMPORTED GLOBAL)
+add_dependencies(
+libmicrofido2_lib
+libmicrofido2_project
+)
+set_target_properties(libmicrofido2_lib PROPERTIES IMPORTED_LOCATION             ${LIBMICROFIDO2_LIB_DIR}/libmicrofido2.a)
+file(MAKE_DIRECTORY ${LIBMICROFIDO2_INCLUDE_DIR}) # Hack to make the line below work on the first download.
+set_target_properties(libmicrofido2_lib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${LIBMICROFIDO2_INCLUDE_DIR} )
+target_include_directories(libmicrofido2_lib INTERFACE ${libmicrofido2_src_dir}/external/tinf/include)
+
+# Link with libmicrofido2
+target_link_libraries(app PUBLIC libmicrofido2_lib)