X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=extlibs%2Fmbedtls%2FSConscript;h=c385f30e322c54323a6bc948402b19f203826b9d;hb=e536bc9edf0ad1fea100e07755462dc0914304eb;hp=3301e2ad746881c437e868b60043a0b436654927;hpb=ccc75bc0ee5483f2346b92d66fc7c802f951280a;p=platform%2Fupstream%2Fiotivity.git

diff --git a/extlibs/mbedtls/SConscript b/extlibs/mbedtls/SConscript
index 3301e2a..c385f30 100644
--- a/extlibs/mbedtls/SConscript
+++ b/extlibs/mbedtls/SConscript
@@ -26,6 +26,7 @@ import subprocess
 
 target_os = env.get('TARGET_OS')
 root_dir = env.get('SRC_DIR')
+static_lib = env.get('WITH_MBEDTLS_STATIC_LIB');
 mbedtls_dir = os.path.join(root_dir, 'extlibs','mbedtls','mbedtls/')
 start_dir = os.getcwd()
 # Right now this script assumes the revision is a tag, and not a branch or an arbitrary
@@ -48,24 +49,23 @@ os.chdir(mbedtls_dir)
 # the mbedtls_revision tag selected is the same as in extlibs/mbedtls/prep.sh.
 # This code also assumes mbedtls_revision is a tag; if it changes to
 # a branch or an arbitrary commit, disable this check below.
-if target_os != 'tizen':
-    out = subprocess.check_output('git tag -l ' + mbedtls_revision, shell = True)
-    if mbedtls_revision not in out:
-        print out
-        print '''
-*********************************** Error: ****************************************
-* Your mbedTLS repo is not up to date with the latest version we require. Please  *
-* update with the following commands:                                             *
-*     $ cd extlibs/mbedtls/mbedtls                                                *
-*     $ git fetch                                                                 *
-***********************************************************************************
- '''
-        Exit(1)
-
+# if target_os != 'tizen':
+#     out = subprocess.check_output('git tag -l ' + mbedtls_revision, shell = True)
+#     if mbedtls_revision not in out:
+#         print out
+#         print '''
+# *********************************** Error: ****************************************
+# * Your mbedTLS repo is not up to date with the latest version we require. Please  *
+# * update with the following commands:                                             *
+# *     $ cd extlibs/mbedtls/mbedtls                                                *
+# *     $ git fetch                                                                 *
+# ***********************************************************************************
+#  '''
+#         Exit(1)
 
 # Apply ocf patch on git revision
 if os.path.exists('.git/HEAD'):
-    cmd = 'git checkout development && git reset --hard ' + mbedtls_revision + ' && git apply --whitespace=fix ../ocf.patch'
+    cmd = 'git checkout development && git reset --hard ' + mbedtls_revision + ' && git apply --whitespace=fix ../ocf.patch' + ' && git apply --whitespace=fix ../CVE-2017-14032.patch'
     os.system(cmd)
 else:
     print 'mbedtls: Assume ocf.patch (TLS_ECDH_ANON_WITH_AES_128_CBC_SHA256) was applied in %s' % mbedtls_dir
@@ -169,7 +169,21 @@ mbex509_env.AppendUnique(LIBS = ['mbedcrypto'])
 static_libmbedx509 = mbex509_env.StaticLibrary('mbedx509', mbeX509_src)
 mbex509_env.InstallTarget(static_libmbedx509, 'mbedx509')
 
-
-mbedtls_env.AppendUnique(LIBS = ['mbedx509', 'mbedcrypto'])
-static_libmbedtls = mbedtls_env.StaticLibrary('mbedtls', mbedtls_src)
-mbedtls_env.InstallTarget(static_libmbedtls, 'mbedtls')
+if static_lib == '1':
+	mbedtls_env.AppendUnique(LIBS = ['mbedx509', 'mbedcrypto'])
+	static_libmbedtls = mbedtls_env.StaticLibrary('mbedtls', mbedtls_src)
+	mbedtls_env.InstallTarget(static_libmbedtls, 'mbedtls')
+else:
+	if target_os in ['windows', 'msys_nt', 'ios']:
+		mbedtls_env.AppendUnique(LIBS = ['mbedx509', 'mbedcrypto'])
+		static_libmbedtls = mbedtls_env.StaticLibrary('mbedtls', mbedtls_src)
+		mbedtls_env.InstallTarget(static_libmbedtls, 'mbedtls')
+	else:
+		mbedtls_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
+		mbedtls_env.AppendUnique(LIBS = ['mbedx509', 'mbedcrypto'])
+		static_libmbedtls = mbedtls_env.StaticLibrary('mbedtls', mbedtls_src)
+		shared_libmbedtls = mbedtls_env.SharedLibrary('mbedtls', mbedtls_src)
+		mbedtls_env.InstallTarget([static_libmbedtls, shared_libmbedtls], 'mbedtls')
+		mbedtls_env.UserInstallTargetLib([static_libmbedtls, shared_libmbedtls], 'mbedtls')
+	if target_os in ['android']:
+		mbedtls_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libmbedtls.so'])