Fix error in SKMM-dummy with SKMM replacement and fix some indents

Change-Id: I563f57689c68a93458daec75f6de27ef830fefe0
Signed-off-by: kyungwook tak <k.tak@samsung.com>

diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec
index b92356d..c879264 100644 (file)
--- a/packaging/key-manager.spec
+++ b/packaging/key-manager.spec
@@ -92,6 +92,10 @@ ln -s ../central-key-manager-api-storage.socket %{buildroot}/usr/lib/systemd/sys
 rm -rf %{buildroot}
 
 %post
+%if "%{sec_product_feature_security_mdfpp_enable}" == "1"
+rm %{_libdir}/libkey-manager-key-provider.so.1.0.0
+ln -s %{_libdir}/libskmm.so %{_libdir}/libkey-manager-key-provider.so.1.0.0
+%endif
 systemctl daemon-reload
 if [ $1 = 1 ]; then
     # installation
@@ -131,7 +135,6 @@ fi
 %attr(755,root,root) /usr/bin/key-manager
 %{_libdir}/libkey-manager-commons.so.*
 %{_libdir}/libkey-manager-key-provider.so.*
-%{_libdir}/libkey-manager-key-provider.so
 %attr(-,root,root) /usr/lib/systemd/system/multi-user.target.wants/central-key-manager.service
 %attr(-,root,root) /usr/lib/systemd/system/central-key-manager.service
 %attr(-,root,root) /usr/lib/systemd/system/central-key-manager.target
@@ -143,6 +146,10 @@ fi
 %attr(-,root,root) /usr/lib/systemd/system/central-key-manager-api-storage.socket
 %{_datadir}/license/%{name}
 
+%files -n key-manager-devel
+%defattr(-,root,root,-)
+%{_libdir}/libkey-manager-key-provider.so
+
 %files -n libkey-manager-client
 %manifest %{_datadir}/libkey-manager-client.manifest
 %defattr(-,root,root,-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d6d1386..6a624ad 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -50,7 +50,7 @@ ADD_EXECUTABLE(${TARGET_KEY_MANAGER} ${KEY_MANAGER_SOURCES})
 TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER}
     ${KEY_MANAGER_DEP_LIBRARIES}
     ${TARGET_KEY_MANAGER_COMMON}
-       ${TARGET_KEY_MANAGER_KEY_PROVIDER}
+    ${TARGET_KEY_MANAGER_KEY_PROVIDER}
     )
 
 

diff --git a/src/manager/CMakeLists.txt b/src/manager/CMakeLists.txt
index 3d83a19..d9f7ef1 100644 (file)
--- a/src/manager/CMakeLists.txt
+++ b/src/manager/CMakeLists.txt
@@ -7,10 +7,10 @@ PKG_CHECK_MODULES(COMMON_DEP
     libcrypto
     )
 PKG_CHECK_MODULES(KEY_PROVIDER_DEP
-       dlog
-       openssl
-       REQUIRED
-       )
+    dlog
+    openssl
+    REQUIRED
+    )
 
 SET(COMMON_PATH ${PROJECT_SOURCE_DIR}/src/manager)
 
@@ -73,15 +73,15 @@ SET(KEY_PROVIDER_SOURCES
 
 ADD_LIBRARY(${TARGET_KEY_MANAGER_KEY_PROVIDER} SHARED ${KEY_PROVIDER_SOURCES})
 SET_TARGET_PROPERTIES(
-       ${TARGET_KEY_MANAGER_KEY_PROVIDER}
-       PROPERTIES
-               COMPILE_FLAGS "-fPIC -c"
-               SOVERSION 1.0.0
-               VERSION 1.0.0
-       )
+    ${TARGET_KEY_MANAGER_KEY_PROVIDER}
+    PROPERTIES
+        COMPILE_FLAGS "-fPIC -c"
+        SOVERSION 1.0.0
+        VERSION 1.0.0
+    )
 TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER_KEY_PROVIDER}
-       ${KEY_PROVIDER_DEP_LIBRARIES}
-       )
+    ${KEY_PROVIDER_DEP_LIBRARIES}
+    )
 
 ##########################################################################