Cherry picked from tizen_3.0

Fix compile flags according to feature
Fix bug on controlling bundle about user certificate

Change-Id: Ib06fb393edca552288e24513ff1afec8aceb6be3
Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>
(cherry picked from commit 0b8ac6fbf6ea101c95bafacd9ac11388f9f2edb8)
(cherry picked from commit 9552bd58e36d0348293025cb8f24194c2f4a3708)

diff --git a/packaging/cert-svc.spec b/packaging/cert-svc.spec
index 43a5342..2bd225c 100644 (file)
--- a/packaging/cert-svc.spec
+++ b/packaging/cert-svc.spec
@@ -86,13 +86,17 @@ Certification service (tests)
 %setup -q
 
 %build
+%if 0%{?sec_build_binary_debug_enable}
 export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
 export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
+%endif
 
+%if 0%{?tizen_build_devel_mode}
 export CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE"
 export CXXFLAGS="$CXXFLAGS -DTIZEN_ENGINEER_MODE"
 export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE"
+%endif
 
 %ifarch %{ix86}
 export CFLAGS="$CFLAGS -DTIZEN_EMULATOR_MODE"

diff --git a/src/server/src/cert-server-logic.c b/src/server/src/cert-server-logic.c
index 74faa0d..5374585 100644 (file)
--- a/src/server/src/cert-server-logic.c
+++ b/src/server/src/cert-server-logic.c
@@ -396,6 +396,7 @@ int update_ca_certificate_file(char *cert)
                        return result;
                }
 
+               SLOGD("Successfully update bundle file.");
                return CERTSVC_SUCCESS;
        }
 

diff --git a/src/server/src/cert-server-main.c b/src/server/src/cert-server-main.c
index a06515a..d8bdd56 100644 (file)
--- a/src/server/src/cert-server-main.c
+++ b/src/server/src/cert-server-main.c
@@ -263,9 +263,9 @@ void CertSvcServerComm(void)
                                                                   recv_data.dataBlock,
                                                                   recv_data.certType);
 
-                       if (send_data.result == CERTSVC_SUCCESS && (recv_data.certType == PEM_CRT ||
-                                       recv_data.certType == P12_TRUSTED))
-                               send_data.result = update_ca_certificate_file(recv_data.dataBlock);
+                       if (send_data.result == CERTSVC_SUCCESS)
+                               if (recv_data.certType == PEM_CRT || recv_data.certType == P12_TRUSTED)
+                                       send_data.result = update_ca_certificate_file(recv_data.dataBlock);
 
                        result = send(client_sockfd, (char *)&send_data,
                                                  sizeof(send_data), MSG_NOSIGNAL);

diff --git a/src/vcore/pkcs12.cpp b/src/vcore/pkcs12.cpp
index d24a240..e80c334 100644 (file)
--- a/src/vcore/pkcs12.cpp
+++ b/src/vcore/pkcs12.cpp
@@ -637,10 +637,10 @@ int insertToStore(CertStoreType storeTypes,
                for (size_t i = 0; i < ncerts; i++) {
                        if (i == ncerts - 1)
                                result = installChainCert(storeType, certChainBuffer[i], certChainName[i], endCertName,
-                                                                                 P12_INTERMEDIATE);
+                                                                                 P12_TRUSTED);
                        else
                                result = installChainCert(storeType, certChainBuffer[i], certChainName[i], endCertName,
-                                                                                 P12_TRUSTED);
+                                                                                 P12_INTERMEDIATE);
 
                        if (result != CERTSVC_SUCCESS) {
                                LogError("Failed to install the ca certificates. result : " << result);