iotivity: add some default security configuration

This is just a dummy configuration.

Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>

diff --git a/net/iotivity/Makefile b/net/iotivity/Makefile
index f495eb6aaef970571cc32623bb9c889a25902313..b92760d2974e89c1f7f6acc63b5376800adcf156 100644 (file)
--- a/net/iotivity/Makefile
+++ b/net/iotivity/Makefile
@@ -33,7 +33,8 @@ PKG_CONFIG_DEPENDS := \
        CONFIG_PACKAGE_iotivity-resource-container-sample \
        CONFIG_PACKAGE_iotivity-resource-container-hue \
        CONFIG_PACKAGE_iotivity-example-garage \
-       CONFIG_PACKAGE_iotivity_DEBUG
+       CONFIG_PACKAGE_iotivity_DEBUG \
+       CONFIG_PACKAGE_iotivity_SECURE
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/scons.mk
@@ -60,6 +61,12 @@ define Package/iotivity/config
                help
                  Build IoTivity with debuging support.
 
+       config PACKAGE_iotivity_SECURE
+               bool "IoTivity with security support"
+               default y
+               help
+                 Activate security support.
+
   endif
 endef
 
@@ -194,7 +201,6 @@ SCONS_OPTIONS += \
        TARGET_ARCH=$(ARCH) \
        STAGING_DIR=$(STAGING_DIR) \
        LOGGING=true \
-       SECURED=1 \
        $(if $(CONFIG_PACKAGE_iotivity),liboctbstack) \
        $(if $(CONFIG_PACKAGE_iotivity-cpp),liboc) \
        $(if $(CONFIG_PACKAGE_iotivity-things-manager-lib),libTGMSDK) \
@@ -213,6 +219,12 @@ else
   APP_OPTIM:=release
 endif
 
+ifeq ($(CONFIG_PACKAGE_iotivity_SECURE),y)
+  SCONS_OPTIONS += SECURED=1
+else
+  SCONS_OPTIONS += SECURED=0
+endif
+
 ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
   SCONS_OPTIONS += VERBOSE=true
 endif
@@ -238,6 +250,10 @@ endef
 define Package/iotivity/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/liboctbstack.so $(1)/usr/lib/
+ifeq ($(CONFIG_PACKAGE_iotivity_SECURE),y)
+       $(INSTALL_DIR) $(1)/etc/iotivity/
+       $(INSTALL_DATA) ./files/etc/iotivity/oic_svr_db.cbor $(1)/etc/iotivity/
+endif
 endef
 
 define Package/iotivity-cpp/install

diff --git a/net/iotivity/files/etc/iotivity/ReadMe.txt b/net/iotivity/files/etc/iotivity/ReadMe.txt
new file mode 100644 (file)
index 0000000..ae47a5f
--- /dev/null
+++ b/net/iotivity/files/etc/iotivity/ReadMe.txt
@@ -0,0 +1,2 @@
+The file oic_svr_db.cbor in generated from the oic_svr_db.json with the
+resource/csdk/security/tool/json2cbor.c tool.

diff --git a/net/iotivity/files/etc/iotivity/oic_svr_db.cbor b/net/iotivity/files/etc/iotivity/oic_svr_db.cbor
new file mode 100644 (file)
index 0000000..91849e2
Binary files /dev/null and b/net/iotivity/files/etc/iotivity/oic_svr_db.cbor differ

diff --git a/net/iotivity/files/etc/iotivity/oic_svr_db.json b/net/iotivity/files/etc/iotivity/oic_svr_db.json
new file mode 100644 (file)
index 0000000..5842a14
--- /dev/null
+++ b/net/iotivity/files/etc/iotivity/oic_svr_db.json
@@ -0,0 +1,138 @@
+{
+    "acl": {
+        "aclist": {
+            "aces": [
+                {
+                    "subjectuuid": "*",
+                    "resources": [
+                        {
+                            "href": "/oic/res",
+                            "rel": "",
+                            "rt": "",
+                            "if": ""
+                        },
+                        {
+                            "href": "/oic/d",
+                            "rel": "",
+                            "rt": "",
+                            "if": ""
+                        },
+                        {
+                            "href": "/oic/p",
+                            "rel": "",
+                            "rt": "",
+                            "if": ""
+                        },
+                        {
+                            "href": "/oic/res/d",
+                            "rel": "",
+                            "rt": "",
+                            "if": ""
+                        },
+                        {
+                            "href": "/oic/res/types/d",
+                            "rel": "",
+                            "rt": "",
+                            "if": ""
+                        },
+                        {
+                            "href": "/oic/ad",
+                            "rel": "",
+                            "rt": "",
+                            "if": ""
+                        },
+                        {
+                            "href": "/oic/sec/acl",
+                            "rel": "",
+                            "rt": "",
+                            "if": ""
+                        },
+                        {
+                            "href": "/oic/sec/amacl",
+                            "rel": "",
+                            "rt": "",
+                            "if": ""
+                        },
+                        {
+                            "href": "/oic/sec/doxm",
+                            "rel": "",
+                            "rt": "",
+                            "if": ""
+                        },
+                        {
+                            "href": "/oic/sec/pstat",
+                            "rel": "",
+                            "rt": "",
+                            "if": ""
+                        }
+                    ],
+                    "permission": 2
+                },
+                {
+                    "subjectuuid": "32323232-3232-3232-3232-323232323232",
+                    "resources": [
+                        {
+                            "href": "/oic/sec/acl",
+                            "rel": "",
+                            "rt": "",
+                            "if": ""
+                        } ,
+                        {
+                            "href": "/oic/sec/cred",
+                            "rel": "",
+                            "rt": "",
+                            "if": ""
+                        }
+                    ],
+                    "permission": 31
+                },
+                {
+                    "subjectuuid": "*",
+                    "resources": [
+                        {
+                            "href": "*",
+                            "rel": "",
+                            "rt": "",
+                            "if": ""
+                        }
+                    ],
+                    "permission": 6
+                }
+            ]
+        },
+        "rowneruuid" : "31313131-3131-3131-3131-313131313131"
+    },
+    "pstat": {
+        "isop": true,
+        "deviceuuid": "31313131-3131-3131-3131-313131313131",
+        "rowneruuid": "31313131-3131-3131-3131-313131313131",
+        "cm": 0,
+        "tm": 0,
+        "om": 3,
+        "sm": 3
+        },
+    "doxm": {
+        "oxms": [0],
+        "oxmsel": 0,
+        "sct": 1,
+        "owned": true,
+        "deviceuuid": "31313131-3131-3131-3131-313131313131",
+        "devowneruuid": "32323232-3232-3232-3232-323232323232",
+        "rowneruuid": "31313131-3131-3131-3131-313131313131",
+        "dpc": false
+    },
+    "cred": {
+        "creds": [
+            {
+                "credid": 1,
+                "subjectuuid": "32323232-3232-3232-3232-323232323232",
+                "credtype": 1,
+                "privatedata": {
+                    "data": "AAAAAAAAAAAAAAAA",
+                    "encoding": "oic.sec.encoding.raw"
+                }
+            }
+        ],
+        "rowneruuid": "32323232-3232-3232-3232-323232323232"
+    }
+}