Merged schematized trust

Author: zjkmxy

CMakeInputs/encode.cmake

@@ -1,4 +1,5 @@
 set(DIR_ENCODE "${DIR_NDN_LITE}/encode")
+set(DIR_TRUST_SCHEMA "${DIR_ENCODE}/trust-schema")
 target_sources(ndn-lite PUBLIC
   ${DIR_ENCODE}/data.h
   ${DIR_ENCODE}/decoder.h
@@ -13,6 +14,11 @@ target_sources(ndn-lite PUBLIC
   ${DIR_ENCODE}/signed-interest.h
   ${DIR_ENCODE}/tlv.h
   ${DIR_ENCODE}/new-interest.h
+  ${DIR_ENCODE}/ndn-rule-storage.h
+  ${DIR_TRUST_SCHEMA}/ndn-trust-schema-common.h
+  ${DIR_TRUST_SCHEMA}/ndn-trust-schema-pattern-component.h
+  ${DIR_TRUST_SCHEMA}/ndn-trust-schema-pattern.h
+  ${DIR_TRUST_SCHEMA}/ndn-trust-schema-rule.h
 )
 target_sources(ndn-lite PRIVATE
   ${DIR_ENCODE}/data.c
@@ -24,5 +30,10 @@ target_sources(ndn-lite PRIVATE
   ${DIR_ENCODE}/signature.c
   ${DIR_ENCODE}/signed-interest.c
   ${DIR_ENCODE}/new-interest.c
+  ${DIR_ENCODE}/ndn-rule-storage.c
+  ${DIR_TRUST_SCHEMA}/ndn-trust-schema-pattern-component.c
+  ${DIR_TRUST_SCHEMA}/ndn-trust-schema-pattern.c
+  ${DIR_TRUST_SCHEMA}/ndn-trust-schema-rule.c
 )
+unset(DIR_TRUST_SCHEMA)
 unset(DIR_ENCODE)

CMakeInputs/security.cmake

@@ -11,6 +11,7 @@ target_sources(ndn-lite PUBLIC
   ${DIR_SECURITY}/ndn-lite-sec-config.h
   ${DIR_SECURITY}/ndn-lite-sec-utils.h
   ${DIR_SECURITY}/ndn-lite-sha.h
+  ${DIR_SECURITY}/ndn-trust-schema.h
 )
 target_sources(ndn-lite PRIVATE
   ${DIR_SECURITY}/ndn-lite-aes.c
@@ -20,6 +21,7 @@ target_sources(ndn-lite PRIVATE
   ${DIR_SECURITY}/ndn-lite-sec-config.c
   ${DIR_SECURITY}/ndn-lite-sec-utils.c
   ${DIR_SECURITY}/ndn-lite-sha.c
+  ${DIR_SECURITY}/ndn-trust-schema.c
   ${DIR_DEFAULT_BACKEND}/ndn-lite-default-aes-impl.h
   ${DIR_DEFAULT_BACKEND}/ndn-lite-default-aes-impl.c
   ${DIR_DEFAULT_BACKEND}/ndn-lite-default-ecc-impl.h

CMakeInputs/unittest.cmake

@@ -68,9 +68,9 @@ target_sources(unittest PRIVATE
   "${DIR_UNITTESTS}/sign-verify/ecdsa-sign-verify-tests/test-secp256k1-def.c"
 )
 
-#target_sources(unittest PRIVATE
-#  "${DIR_UNITTESTS}/schematized-trust/trust-schema-tests.h"
-#  "${DIR_UNITTESTS}/schematized-trust/trust-schema-tests.c"
-#  "${DIR_UNITTESTS}/schematized-trust/trust-schema-tests-def.h"
-#  "${DIR_UNITTESTS}/schematized-trust/trust-schema-tests-def.c"
-#)
+target_sources(unittest PRIVATE
+  "${DIR_UNITTESTS}/schematized-trust/trust-schema-tests.h"
+  "${DIR_UNITTESTS}/schematized-trust/trust-schema-tests.c"
+  "${DIR_UNITTESTS}/schematized-trust/trust-schema-tests-def.h"
+  "${DIR_UNITTESTS}/schematized-trust/trust-schema-tests-def.c"
+)

CMakeInputs/util.cmake

@@ -4,9 +4,11 @@ target_sources(ndn-lite PUBLIC
   ${DIR_UTIL}/msg-queue.h
   ${DIR_UTIL}/uniform-time.h
   ${DIR_UTIL}/bit-operations.h
+  ${DIR_UTIL}/re.h
 )
 target_sources(ndn-lite PRIVATE
   ${DIR_UTIL}/memory-pool.c
   ${DIR_UTIL}/msg-queue.c
+  ${DIR_UTIL}/re.c
 )
 unset(DIR_UTIL)