replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / resource / csdk / security / SConscript

diff --git a/resource/csdk/security/SConscript b/resource/csdk/security/SConscript
index ca5714a..964cdd1 100644 (file)
--- a/resource/csdk/security/SConscript
+++ b/resource/csdk/security/SConscript
@@ -49,7 +49,6 @@ else:
 
 libocsrm_env.PrependUnique(CPPPATH = [
                '../../../extlibs/cjson/',
-               '../../../extlibs/tinydtls/',
                '../logger/include',
                '../../c_common/ocrandom/include',
                '../stack/include',
@@ -57,7 +56,6 @@ libocsrm_env.PrependUnique(CPPPATH = [
                '../../oc_logger/include',
                '../connectivity/external/inc',
                '../connectivity/common/inc',
-               '../connectivity/inc/pkix',
                '../connectivity/inc',
                '../connectivity/api',
                '../security/include',
@@ -89,8 +87,8 @@ if target_os in ['darwin', 'ios']:
 if env.get('LOGGING'):
        libocsrm_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
-if env.get('DTLS_WITH_X509') == '1':
-       libocsrm_env.AppendUnique(CPPDEFINES = ['__WITH_X509__'])
+if env.get('MULTIPLE_OWNER') == '1':
+       libocsrm_env.AppendUnique(CPPDEFINES=['MULTIPLE_OWNER'])
 
 ######################################################################
 # Source files and Targets
@@ -106,7 +104,6 @@ libocsrm_src = [
        OCSRM_SRC + 'pstatresource.c',
        OCSRM_SRC + 'doxmresource.c',
        OCSRM_SRC + 'credresource.c',
-       OCSRM_SRC + 'svcresource.c',
        OCSRM_SRC + 'pconfresource.c',
        OCSRM_SRC + 'dpairingresource.c',
        OCSRM_SRC + 'policyengine.c',
@@ -120,12 +117,13 @@ libocsrm_src = [
 
 if libocsrm_env.get('SECURED') == '1':
        libocsrm_src = libocsrm_src + [OCSRM_SRC + 'oxmpincommon.c', OCSRM_SRC + 'pbkdf2.c']
+       libocsrm_src = libocsrm_src + [OCSRM_SRC + 'crlresource.c', OCSRM_SRC + 'pkix_interface.c']
+       libocsrm_src = libocsrm_src + [OCSRM_SRC + 'oxmverifycommon.c']
+       libocsrm_src = libocsrm_src + [OCSRM_SRC + 'psiutils.c'] # TODO : need for secure psi
 
 if target_os in ['windows', 'msys_nt']:
        libocsrm_src  = libocsrm_src + [OCSRM_SRC + 'strptime.c']
 
-if (env.get('DTLS_WITH_X509') == '1' or env.get('WITH_TCP') == True) and env.get('SECURED') == '1':
-       libocsrm_src  = libocsrm_src + [OCSRM_SRC + 'crlresource.c', OCSRM_SRC + 'pkix_interface.c']
 
 libocsrm_src.extend(env['cbor_files'])
 
@@ -143,7 +141,7 @@ libocsrm = libocsrm_env.StaticLibrary('ocsrm', libocsrm_src)
 
 libocsrm_env.InstallTarget(libocsrm, 'ocsrm')
 
-if target_os in ['linux', 'android', 'tizen', 'msys_nt', 'windows'] and libocsrm_env.get('SECURED') == '1':
+if target_os in ['linux', 'android', 'tizen', 'msys_nt', 'windows', 'ios'] and libocsrm_env.get('SECURED') == '1':
        SConscript('provisioning/SConscript')
 
 if target_os in ['linux'] and libocsrm_env.get('SECURED') == '1':