From: kyungwook tak <k.tak@samsung.com>
Date: Fri, 5 Jun 2015 09:36:17 +0000 (+0900)
Subject: Fix build error on 64bit arch
X-Git-Tag: accepted/tizen/3.0.2015.q2/common/20150615.091829~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=944406421364c5712c79d4660d5f70e6dba7b07f;p=platform%2Fcore%2Fsecurity%2Fcert-svc.git

Fix build error on 64bit arch

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index acf4991..6747117 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,7 +69,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS("-DDPL_LOGS_ENABLED")
 IF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 ADD_DEFINITIONS("-DTIZEN_FEATURE_CERT_SVC_OCSP_CRL")
-ENDIF()
+ENDIF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 
 ADD_LIBRARY(${TARGET_CERT_SVC_LIB} SHARED ${CERT_SVC_SOURCES})
 
@@ -122,7 +122,7 @@ IF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 INSTALL(FILES ${PROJECT_SOURCE_DIR}/res/fota/FOTA_ROOT.cer
     DESTINATION ${TZ_SYS_SHARE}/cert-svc/certs/fota
 )
-ENDIF()
+ENDIF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/etc/empty
     DESTINATION ${TZ_SYS_SHARE}/cert-svc/certs/sim/operator
     FILES_MATCHING PATTERN THISPATTERNMUSTNOTMATCH
diff --git a/vcore/CMakeLists.txt b/vcore/CMakeLists.txt
index bc29121..16356c3 100644
--- a/vcore/CMakeLists.txt
+++ b/vcore/CMakeLists.txt
@@ -33,5 +33,5 @@ ADD_CUSTOM_TARGET(Sqlite3DbVCORE ALL DEPENDS .cert_svc_vcore.db .cert_svc_vcore.
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/cert_svc_vcore_db.sql
     DESTINATION ${TZ_SYS_SHARE}/cert-svc/
     )
-ENDIF()
+ENDIF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 ADD_SUBDIRECTORY(src)
diff --git a/vcore/src/CMakeLists.txt b/vcore/src/CMakeLists.txt
index 373966c..0772fc6 100644
--- a/vcore/src/CMakeLists.txt
+++ b/vcore/src/CMakeLists.txt
@@ -18,11 +18,11 @@ IF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 PKG_CHECK_MODULES(VCORE_DEPS
     dpl-db-efl
 	)
-ENDIF()
+ENDIF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 
 IF(TIZEN_FEAT_OSP_DISABLE EQUAL 1)
 ADD_DEFINITIONS("-DTIZEN_FEATURE_OSP_DISABLE")
-ENDIF()
+ENDIF(TIZEN_FEAT_OSP_DISABLE EQUAL 1)
 
 SET(LIBCRYPTSVC_DIR
     ${PROJECT_SOURCE_DIR}/vcore
@@ -105,18 +105,26 @@ SET(VCORE_SOURCES
     ${VCORE_SRC_DIR}/SoupMessageSendAsync.cpp
 	${VCORE_SRC_DIR}/OCSPUtil.c
     )
-ENDIF()
+ENDIF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 
+IF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 SET(VCORE_INCLUDES
     ${VCORE_DEPS_INCLUDE_DIRS}
     ${VCORE_SRC_DIR}
     ${VCORE_DIR}/src
-IF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
     ${VCORE_DIR}/src/orm
-ENDIF()
     ${VCORE_DIR}/src/legacy
     ${CMAKE_BINARY_DIR}/vcore/src
     )
+ELSE(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
+SET(VCORE_INCLUDES
+    ${VCORE_DEPS_INCLUDE_DIRS}
+    ${VCORE_SRC_DIR}
+    ${VCORE_DIR}/src
+    ${VCORE_DIR}/src/legacy
+    ${CMAKE_BINARY_DIR}/vcore/src
+    )
+ENDIF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 
 ADD_DEFINITIONS(${VCORE_DEPS_CFLAGS})
 ADD_DEFINITIONS(${VCORE_DEPS_CFLAGS_OTHER})
@@ -125,7 +133,7 @@ ADD_DEFINITIONS("-DDPL_LOGS_ENABLED")
 ADD_DEFINITIONS("-DCERT_SVC_LOG")
 IF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 ADD_DEFINITIONS("-DTIZENUCT_FEATURE_CERT_SVC_OCSP_CRL")
-ENDIF()
+ENDIF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 
 INCLUDE_DIRECTORIES(${VCORE_INCLUDES})
 
@@ -138,7 +146,7 @@ SET_TARGET_PROPERTIES(${TARGET_VCORE_LIB} PROPERTIES
     VERSION ${VERSION})
 IF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 ADD_DEPENDENCIES(${TARGET_VCORE_LIB} Sqlite3DbWTF)
-ENDIF()
+ENDIF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 
 IF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 TARGET_LINK_LIBRARIES(${TARGET_VCORE_LIB}
@@ -146,12 +154,12 @@ TARGET_LINK_LIBRARIES(${TARGET_VCORE_LIB}
     ${TARGET_CERT_SVC_LIB}
     dpl-db-efl
   )
-ELSE()
+ELSE(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 TARGET_LINK_LIBRARIES(${TARGET_VCORE_LIB}
     ${VCORE_DEPS_LIBRARIES}
     ${TARGET_CERT_SVC_LIB}
   )
-ENDIF ()
+ENDIF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 INSTALL(TARGETS ${TARGET_VCORE_LIB}
     DESTINATION ${LIB_INSTALL_DIR}
     )
@@ -186,7 +194,7 @@ INSTALL(FILES
     ${VCORE_SRC_DIR}/OCSPCertMgrUtil.h
 	DESTINATION ${INCLUDEDIR}/cert-svc/vcore
 	)
-ENDIF()
+ENDIF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 
 INSTALL(FILES
     ${VCORE_DIR}/src/cert-svc/ccert.h
@@ -204,6 +212,6 @@ INSTALL(FILES
 	${VCORE_DIR}/src/cert-svc/cocsp.h
 	DESTINATION ${INCLUDEDIR}/cert-svc/cert-svc
 	)
-ENDIF()
+ENDIF(TIZEN_FEAT_PROFILE_CERT_SVC_OCSP_CRL)
 
 #FILE(MAKE_DIRECTORY %{TZ_SYS_SHARE}/cert-svc/pkcs12)
diff --git a/vcore/src/vcore/Certificate.cpp b/vcore/src/vcore/Certificate.cpp
index 37399dd..3080ab9 100644
--- a/vcore/src/vcore/Certificate.cpp
+++ b/vcore/src/vcore/Certificate.cpp
@@ -138,7 +138,7 @@ bool Certificate::isSignedBy(const CertificatePtr &parent) const
 Certificate::Fingerprint Certificate::getFingerprint(
         Certificate::FingerprintType type) const
 {
-    size_t fingerprintlength = EVP_MAX_MD_SIZE;
+    unsigned int fingerprintlength = EVP_MAX_MD_SIZE;
     unsigned char fingerprint[EVP_MAX_MD_SIZE];
     Fingerprint raw;