[IOT-1511] Update mbedTLS to use 2.4.0 release tagged version

[platform/upstream/iotivity.git] / extlibs / mbedtls / SConscript

diff --git a/extlibs/mbedtls/SConscript b/extlibs/mbedtls/SConscript
index 1b7c3a8..0f0e1d5 100644 (file)
--- a/extlibs/mbedtls/SConscript
+++ b/extlibs/mbedtls/SConscript
@@ -26,7 +26,10 @@ import sys
 target_os = env.get('TARGET_OS')
 root_dir = env.get('SRC_DIR')
 mbedtls_dir = os.path.join(root_dir, 'extlibs','mbedtls','mbedtls/')
-mbedtls_revision = 'ad249f509fd62a3bbea7ccd1fef605dbd482a7bd'
+# Right now this script assumes the revision is a tag, and not a branch or an arbitrary
+# commit. If this changes, update the check below, or else the script will always conclude
+# the repo is not up to date because a tag with that name doesn't exist.
+mbedtls_revision = 'mbedtls-2.4.0'
 
 if not os.path.exists(mbedtls_dir):
     print '''
@@ -36,6 +39,23 @@ if not os.path.exists(mbedtls_dir):
 ***********************************************************************************
  '''
     Exit(1)
+
+# Tizen uses its own process to prepare the mbedTLS repo in gbsbuild.sh. Make sure
+# 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':
+    if not os.path.exists(os.path.join(mbedtls_dir, '.git', 'refs', 'tags', mbedtls_revision)):
+        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)
+
 start_dir = os.getcwd()
 os.chdir(mbedtls_dir)
 # Apply ocf patch on git revision
@@ -57,7 +77,7 @@ mbedtls_env.AppendUnique(CFLAGS = ['-fPIC', '-Wall'])
 ######################################################################
 mbedtls_src = [
                 'mbedtls/library/debug.c',
-                'mbedtls/library/net.c',
+                'mbedtls/library/net_sockets.c',
                 'mbedtls/library/ssl_cache.c',
                 'mbedtls/library/ssl_ciphersuites.c',
                 'mbedtls/library/ssl_cli.c',