remove TLS-PSK Key file

Change-Id: Iec9322199dda8a15f860dbd454e8b9f75f2394f5

diff --git a/CMain/edge-orchestration.key b/CMain/edge-orchestration.key
deleted file mode 100644 (file)
index 862068a..0000000
--- a/CMain/edge-orchestration.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDdGhbP1k06VW7b
-QPYjkDaCr2Y6lT2cNE2PztJq6zM4SAjzBdbsgipqQWu0Ptxh0kJeWzmJmTZSBdol
-ctBP3hdVJpx7DK7J4cp82fG8zn8x9+qtywIOVLSho1FBcwnvVkKI8o0aa3+7rP1F
-h2aL2POKXdMyg92hxtWJXuUtDrLE+HxDPzpKdJfrkhjW7H6XIQ1I2JulLCtMfHRZ
-QgJ6byt+d4hK3lkAXAIVryRD3RkjTEexqmVGdJAo1PRVA32EqTfqpT8e8R2Y59k2
-3IvDcLR1PHM4LaB9Ly0/6/KshnTnvIakKgKmCBtHaWESkrmPUICgK4D5YOnfs1xx
-phh06JGNAgMBAAECggEAIXa0Yyp9L8oEaDzRxBosleT0JQO3em/UGWLlJ/eHHgqR
-CC8nE060GrbiFTq6YjfPgbZu4+uDdDCcjrRs4NmtUF7yqhEGV1nMKs9VrgzW5Xov
-U7R5EDAz0o8EWlKN+2Jj2ZRUVN5WS9Jn1uEiXSIt4hBHScr5fWW5pfvt1b72wabO
-Kfrq54dUMz/2AS3vQOvUi/NneihNE0mn3kMkEoHI2AiFALHuCiduRVOFKzZ+OUg6
-KF78Ucx1T3htuomkTcXnMtP3QY9yJk4PY4zrvFZVg9lREF/Aogo0YTGXaGyhHJjC
-yOyhdIsTv4zArLc4dwfWVD4xiG3IKkZmfRTbk/3HhQKBgQDxDxNFHemVzZgKj+ht
-VoobJsXbqlncXnwKIdtEdYbvJ2LbS2pS9KlOQi2Ic5mLvAcqw/4WJnZQ449Tsbp0
-6gLTagaE+T263sM+hYTr54TDxEStsLVccICOeBy1BDOTCDHM1tE/vm6usX+Mo0nx
-eXbLVH2nTze7cQRpfqXFikVdlwKBgQDqzlpW7Vs+Ik78ntHiJ4181iuKl5dn8wP4
-9+ksLmltQMW5lk8SZ/QKPb3ixP553yrNXpWAejoy4lOpmC2GdtJYnIPvZ1Clz7Ap
-Zqsv0Lf9ihqQf+L8b019bMgguaQDHAQLV0+qsPk+4yw7ELJjN5M24Xy3MYwKYCoD
-P4Qjtzd2ewKBgHbcgxjyjeoCzTRwDyBSqpiGvsr4rYR+xlTMquyPsvAbkKAnCI9M
-+mqPMRp2PcDr/vC0YYYUgwSRoGuZWCIr/Sa3we0xZKHPE6Cxf4A+0XUiQucOGe8x
-vgIB8c3D+5ZFVSD2z4jJ4pObDBSRs3Uw+kV6LNchtY5kRNOr0huceWWTAoGBANzn
-oLRxgEsXigo+/STwoztUXwh3j/k693zO9+8aBxPDQYJVuDSP2lecOL5VKTjNTX6D
-QtHprEFdDuragdIkjcbSEYo1P/mPSKPatKk6iy8cM9vIhWuK53Nd2XZ4UKagP+nP
-jeL/tq6EmYNENSAFFBooz+Wl1qOYT05Y/l9/qs1rAoGAATk7Nqo/T8sxLlN6/PGg
-qSo9lrpOLw2D/TSr0W30Ta63YHUpFqAtkBvEDJK2abRWqCIVTmpWirp/HSmtpg1a
-81Mn2OYeW385I4wbniYOvnpcpDdIax0DXhZ7bcwEtRZ/nh/Vwtg+a+XQg5Wjs4Tw
-+HiNS61fWuoQroxm9LJsrWM=
------END PRIVATE KEY-----

diff --git a/Makefile b/Makefile
index e9a8d15..be78355 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@ PKG_NAME                        := edge-orchestration
 OBJ_SRC_DIR                    := interfaces/capi
 SERVICE_FILE           := $(PKG_NAME).service
 MANIFEST_FILE          := $(PKG_NAME).manifest
-CERT_KEY_FILE          := $(PKG_NAME).key
 DBUS_SERVICE_FILE      := org.tizen.orchestration.service
 DBUS_CONF_FILE         := org.tizen.orchestration.conf
 
@@ -61,7 +60,6 @@ install:
        install -d $(DESTDIR)/usr/share/dbus-1/system-services
        install -d $(DESTDIR)/etc/dbus-1/system.d
        install -m 755 $(CMAIN_BIN_DIR)/$(CMAIN_BIN_FILE)       $(DESTDIR)/usr/bin/$(CMAIN_BIN_FILE)
-       install -m 644 $(CMAIN_DIR)/$(CERT_KEY_FILE)            $(DESTDIR)/var/$(PKG_NAME)/data/cert/$(CERT_KEY_FILE)
        install -m 755 $(LIBPKG_SAMPLE_DIR)/edge_exec_browser.sh        $(DESTDIR)/usr/bin/edge_exec_browser.sh
        install -m 755 $(LIBPKG_SAMPLE_DIR)/output/edge_native          $(DESTDIR)/usr/bin/edge_native
        install -m 755 $(LIBPKG_SAMPLE_DIR)/output/edge_container       $(DESTDIR)/usr/bin/edge_container
@@ -92,7 +90,6 @@ test:
 clean:
        -rm -f $(CMAIN_LIB_DIR)/$(LIBRARY_FILE)
        -rm -f $(CMAIN_INC_DIR)/$(HEADER_FILE)
-       -rm -f $(CMAIN_DIR)/$(CERT_KEY_FILE)
        -rm -rf $(CMAIN_TEST_DIR)/out
 
 ## show help

diff --git a/build.sh b/build.sh
index 039eed3..f2bbc70 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -13,8 +13,6 @@ LIBRARY_FILE="liborchestration.a"
 INTERFACE_OUT_DIR="$BASE_DIR/$SUBMODULE/src/interfaces/capi/output"
 INTERFACE_OUT_INC_DIR="$INTERFACE_OUT_DIR/inc/linux_arm"
 INTERFACE_OUT_LIB_DIR="$INTERFACE_OUT_DIR/lib/linux_arm"
-CERTKEY_FILE="edge-orchestration.key"
-CERTKEY_PATH="$BASE_DIR/$SUBMODULE/doc/sampleTLSKey"
 
 # CMain target
 CMAIN_DIR="$BASE_DIR/CMain"
@@ -37,7 +35,6 @@ function build_c_interface() {
     echo "=================================================================="
     submodule_build $1
     copy_library
-    copy_certKey
 }
 
 function submodule_init() {
@@ -89,14 +86,6 @@ function copy_library() {
     tree $CMAIN_DIR
 }
 
-function copy_certKey() {
-    echo ""
-    echo "----------------------------------------------------------"
-    echo " Copy orchestration Certification Key to CMain folder"
-    echo "----------------------------------------------------------"
-    cp $CERTKEY_PATH/$CERTKEY_FILE $CMAIN_DIR
-}
-
 function build_clean() {
     echo ""
     echo "-----------------------------------"

diff --git a/packaging/edge-orchestration.spec b/packaging/edge-orchestration.spec
index 8eadc78..3680380 100644 (file)
--- a/packaging/edge-orchestration.spec
+++ b/packaging/edge-orchestration.spec
@@ -110,7 +110,6 @@ systemctl restart %{name}
 %attr(755,system_fw,system_fw)%dir /var/%{name}/data/cert
 %attr(755,system_fw,system_fw)%dir /var/%{name}/user
 %attr(755,system_fw,system_fw)%dir /var/%{name}/device
-%attr(640,system_fw,system_fw)/var/%{name}/data/cert/edge-orchestration.key
 
 %files -n libedge-orchestration
 %manifest lib%{name}.manifest