Roughtime client

.gitmodules

@@ -1,6 +1,9 @@
 [submodule "third_party/googletest"]
 	path = third_party/googletest
 	url = https://github.com/google/googletest
+[submodule "third_party/roughtime"]
+	path = third_party/roughtime
+	url = https://user.git.corp.google.com/sungju/roughtime/
 [submodule "third_party/cryptoauthlib"]
 	path = third_party/cryptoauthlib
 	url = https://github.com/MicrochipTech/cryptoauthlib.git

Makefile

@@ -40,6 +40,7 @@ ifdef TRAVIS_OS_NAME
 IOTC_TRAVIS_BUILD=1
 endif
 
+
 include make/mt-config/mt-presets.mk
 
 include make/mt-config/mt-config.mk
@@ -136,7 +137,7 @@ clean_all: clean
 
 libiotc: $(XI)
 
-$(XI): $(IOTC_TLS_LIB_DEP) $(IOTC_CRYPTO_LIB_DEP) $(IOTC_PROTOFILES_C) $(IOTC_OBJS) $(IOTC_BUILD_PRECONDITIONS) | $(IOTC_BIN_DIRS)
+$(XI): $(IOTC_TLS_LIB_DEP) $(IOTC_CRYPTO_LIB_DEP) $(IOTC_ROUGHTIME_LIB_DEP) $(IOTC_PROTOFILES_C) $(IOTC_OBJS) $(IOTC_BUILD_PRECONDITIONS) | $(IOTC_BIN_DIRS)
 	$(info [$(AR)] $@ )
 	$(MD) $(AR) $(IOTC_ARFLAGS) $(IOTC_OBJS) $(IOTC_EXTRA_ARFLAGS)
 

examples/iotc_roughtime_client/Makefile

@@ -0,0 +1,9 @@
+IOTC_EXAMPLE_NAME := iotc_roughtime_client
+
+include ../common/rules.mk
+include ../common/targets.mk
+
+include $(IOTC_CLIENT_PATH)/make/mt-config/mt-roughtime.mk
+
+IOTC_FLAGS_LINKER += -lstdc++
+IOTC_FLAGS_LINKER += -L$(ROUGHTIME_DIR) -lroughtime

examples/iotc_roughtime_client/src/iotc_roughtime_client.c

@@ -0,0 +1,28 @@
+#include <iotc_roughtime_client.h>
+
+#include "string.h"
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdio.h>
+
+#include "../../common/src/example_utils.h"
+
+/* Application variables. */
+iotc_crypto_key_data_t iotc_connect_private_key_data;
+
+int main() {
+  const char* public_key = "gD63hSj3ScS+wuOeGrubXlq35N1c5Lby/S+T7MNTjxo=";
+  const char* server_address = "roughtime.cloudflare.com:2002";
+  iotc_roughtime_state_t state;
+  iotc_roughtime_timedata_t time_data;
+  if ((state = iotc_roughtime_getcurrenttime(public_key, server_address,
+                                             &time_data)) != IOTC_ROUGHTIME_OK) {
+    return state;
+  }
+
+  printf("Received reply in %" PRIu64 "ms.\n", time_data.reply_time);
+  printf("Current time is %" PRIu64 "ms from the epoch, ±%uμs \n",
+         time_data.timestamp, time_data.radius);
+
+  return state;
+}

include/iotc_roughtime_client.h

@@ -0,0 +1,56 @@
+#include <iotc_time.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @typedef iotc_bsp_io_net_state_e
+ * @brief Returns result of process receiving time from roughtime server.
+ */
+typedef enum iotc_roughtime_state_e {
+  IOTC_ROUGHTIME_OK = 0,
+  IOTC_ROUGHTIME_RECEIVE_TIME_ERROR = 1,
+  IOTC_ROUGHTIME_NETWORK_ERROR = 2,
+  IOTC_ROUGHTIME_TIMEOUT_ERROR = 3,
+  IOTC_ROUGHTIME_ERROR = 4,
+} iotc_roughtime_state_t;
+
+/**
+ * @typedef iotc_roughtime_timedata_s
+ * @brief Ties time data received from roughtime server.
+ */
+typedef struct iotc_roughtime_timedata_s {
+  /**
+   * reply_time - time spent on receiving current time from the server
+   * timestamp - current time received from the server
+   * radius - certainty of timestamp
+   */
+  uint64_t reply_time;
+  uint64_t timestamp;
+  uint32_t radius;
+} iotc_roughtime_timedata_t;
+
+/**
+ * @function
+ * @brief Gets current time from roughtime server
+ *
+ * @param [out] time_data the struct which contains time data got from roughtime
+ * server.
+ * @param [in] name the name of server from which get current time.
+ * @param [in] public_key the public key for server
+ * @param [in] server_address the address of server from which get current time.
+ * @return
+ * - iotc_roughtime_state t - the state of error caused while creating socket
+ * and receiving time from roughtime server.
+ */
+iotc_roughtime_state_t
+iotc_roughtime_getcurrenttime(const char* public_key,
+                              const char* server_address,
+                              iotc_roughtime_timedata_t* time_data);
+
+#ifdef __cplusplus
+}
+#endif

make/mt-config/mt-config.mk

@@ -24,6 +24,8 @@ ifneq (,$(findstring tls_bsp,$(CONFIG)))
 	include make/mt-config/mt-crypto.mk
 endif
 
+include make/mt-config/mt-roughtime.mk
+include make/mt-config/tests/mt-gtest.mk # For IOTC_GTEST_SOURCES
 
 IOTC_UNIT_TEST_TARGET ?= native
 
@@ -229,14 +231,19 @@ IOTC_SOURCES += $(foreach layerdir,$(IOTC_SRCDIRS),\
 IOTC_SOURCES_CXX := $(wildcard ./src/*.cc)
 IOTC_SOURCES_CXX += $(foreach layerdir,$(IOTC_SRCDIRS),\
 	$(wildcard $(layerdir)/*.cc))
-IOTC_SOURCES_CXX := $(filter-out %_test.cc, $(IOTC_SOURCES_CXX)) # Filter out tests
-
+IOTC_SOURCES_CXX := $(filter-out $(IOTC_GTEST_SOURCES), $(IOTC_SOURCES_CXX)) # Filter out tests
 
 ifeq ($(IOTC_DEBUG_OUTPUT),0)
 IOTC_SOURCES := $(filter-out $(LIBIOTC_SOURCE_DIR)/iotc_debug.c, $(IOTC_SOURCES) )
 IOTC_SOURCES := $(filter-out $(LIBIOTC)/third_party/mqtt-protocol-c/iotc_debug_data_desc_dump.c, $(IOTC_SOURCES) )
 endif
 
+# conditionaly include Roughtime client sources
+ifndef IOTC_ENABLE_ROUGHTIME
+IOTC_SOURCES_CXX := $(filter-out $(LIBIOTC_SOURCE_DIR)/iotc_roughtime_client.cc, $(IOTC_SOURCES_CXX) )
+endif
+
+
 ifdef MAKEFILE_DEBUG
 $(info --mt-config-- Using [$(IOTC_BSP_PLATFORM)] BSP configuration)
 $(info --mt-config-- event_loop=$(IOTC_EVENT_LOOP))

make/mt-config/mt-roughtime.mk

@@ -0,0 +1,50 @@
+# Copyright 2018-2019 Google LLC
+#
+# This is part of the Google Cloud IoT Device SDK for Embedded C,
+# it is licensed under the BSD 3-Clause license; you may not use this file
+# except in compliance with the License.
+#
+# You may obtain a copy of the License at:
+#  https://opensource.org/licenses/BSD-3-Clause
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Build configuration for Roughtime client support
+
+ifdef IOTC_ENABLE_ROUGHTIME
+
+ifneq ($(IOTC_BSP_TLS), wolfssl)
+$(error Roughtime feature needs wolfssl as crypto BSP; was IOTC_BSP_TLS="$(IOTC_BSP_TLS)")
+endif
+
+LIBIOTC ?= $(CURDIR)/../..
+
+ROUGHTIME_DIR := $(LIBIOTC)/third_party/roughtime
+ROUGHTIME_FAKE_INCLUDE_DIR := $(ROUGHTIME_DIR)/roughtime
+ROUGHTIME_LIBRARY := $(ROUGHTIME_DIR)/libroughtime.a
+
+ROUGHTIME_SOURCES := $(ROUGHTIME_DIR)/client.cc \
+                     $(ROUGHTIME_DIR)/protocol.cc
+
+ROUGHTIME_OBJS := $(filter-out $(ROUGHTIME_SOURCES), $(ROUGHTIME_SOURCES:.cc=.o))
+IOTC_INCLUDE_FLAGS += -I$(ROUGHTIME_DIR)
+
+$(ROUGHTIME_DIR)/%.o: $(ROUGHTIME_DIR)/%.cc
+	$(info [$(CXX)] $@)
+	$(MD) $(CXX) $(IOTC_INCLUDE_FLAGS) $(IOTC_COMMON_COMPILER_FLAGS) $(IOTC_CXX_FLAGS) \
+		-c $< $(IOTC_COMPILER_OUTPUT)
+
+$(ROUGHTIME_LIBRARY): $(ROUGHTIME_OBJS)
+	$(info [$(AR)] $@ )
+	$(MD) $(AR) -rs -c $@ $^
+
+IOTC_ROUGHTIME_LIB_DEP ?= $(ROUGHTIME_LIBRARY)
+
+IOTC_LIB_FLAGS += -L$(ROUGHTIME_DIR)
+IOTC_LIB_FLAGS += -lroughtime
+
+endif # IOTC_ENABLE_ROUGHTIME

make/mt-config/mt-tls-wolfssl.mk

@@ -28,6 +28,7 @@ IOTC_CONFIG_FLAGS += -DHAVE_ECC
 IOTC_CONFIG_FLAGS += -DTFM_TIMING_RESISTANT -DECC_TIMING_RESISTANT -DWC_RSA_BLINDING
 IOTC_CONFIG_FLAGS += -DUSE_FAST_MATH
 IOTC_CONFIG_FLAGS += -DWOLFSSL_X86_64_BUILD
+#TODO(frec): define the SHA512 and ed5139 stuff here ?
 
 # libiotc OCSP stapling feature switch
 IOTC_CONFIG_FLAGS += -DIOTC_TLS_OCSP_STAPLING

make/mt-config/tests/mt-gtest.mk

@@ -57,7 +57,11 @@ GTEST_OBJS := $(GTEST_OBJDIR)/gtest-all.o \
 # Set up iotc googletest tests.
 IOTC_GTEST_SUITE ?= iotc_gtests
 IOTC_GTEST_OBJDIR := $(IOTC_TEST_OBJDIR)/gtests
-IOTC_GTEST_SOURCES = $(shell find $(LIBIOTC)/src -name "*.cc")
+
+# Test cases: files ending in _test.cc or _test_something.cc
+IOTC_GTEST_SOURCES := $(shell find $(LIBIOTC)/src -name "*_test.cc")
+# Test utils: .cc files in src/tests/
+IOTC_GTEST_SOURCES += $(shell find $(LIBIOTC)/src/tests -name "*.cc")
 
 IOTC_GTEST_OBJS := $(filter-out $(IOTC_GTEST_SOURCES), $(IOTC_GTEST_SOURCES:.cc=.o))
 IOTC_GTEST_OBJS := $(subst $(LIBIOTC_SRC), $(IOTC_GTEST_OBJDIR)/, $(IOTC_GTEST_OBJS))

res/tls/wolfssl.conf

@@ -1 +1 @@
-CFLAGS= --enable-sni --enable-debug=no --enable-static=yes --enable-shared=no --disable-examples --disable-filesystem --enable-ocspstapling --disable-oldtls --enable-ecc --enable-harden
+CFLAGS= --enable-sni --enable-debug=no --enable-static=yes --enable-shared=no --disable-examples --disable-filesystem --enable-ocspstapling --disable-oldtls --enable-ecc --enable-ed25519 --enable-sha512 --enable-harden