Fix build error with scons-4.4.0 version which is based on python3

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

diff --git a/extlibs/mbedtls/SConscript b/extlibs/mbedtls/SConscript
index 152c4ba..82be141 100644 (file)
--- a/extlibs/mbedtls/SConscript
+++ b/extlibs/mbedtls/SConscript
@@ -32,15 +32,15 @@ start_dir = os.getcwd()
 # 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'
+mbedtls_revision = 'mbedtls-2.16.2'
 
 if not os.path.exists(mbedtls_dir):
-    print '''
+    print('''
 *********************************** Error: ****************************************
 * Please download mbedtls using the following command:                            *
 *     $ git clone https://github.com/ARMmbed/mbedtls.git extlibs/mbedtls/mbedtls -b %s
 ***********************************************************************************
- ''' % mbedtls_revision
+ ''' % mbedtls_revision)
     Exit(1)
 #cd extlib/mbedtls/mbedtls
 os.chdir(mbedtls_dir)
@@ -68,7 +68,7 @@ if os.path.exists('.git/HEAD'):
     cmd = 'git checkout development && git reset --hard ' + mbedtls_revision + ' && git apply --whitespace=fix ../ocf.patch'
     os.system(cmd)
 else:
-    print 'mbedtls: Assume ocf.patch (TLS_ECDH_ANON_WITH_AES_128_CBC_SHA256) was applied in %s' % mbedtls_dir
+    print('mbedtls: Assume ocf.patch (TLS_ECDH_ANON_WITH_AES_128_CBC_SHA256) was applied in %s' % mbedtls_dir)
 os.chdir(start_dir)
 
 
@@ -78,7 +78,7 @@ mbedtls_env.AppendUnique(CPPPATH = [mbedtls_dir+'include/'])
 mbedtls_env.AppendUnique(CFLAGS = ['-fPIC', '-Wall'])
 
 asan_build = env.get('WITH_ASAN')
-print 'Asan build: {}'.format(asan_build)
+print('Asan build: {}'.format(asan_build))
 if asan_build:
     mbedtls_env.AppendUnique(CFLAGS = ['-UMBEDTLS_HAVE_ASM'])
 
@@ -143,6 +143,7 @@ mbedcrypto_src = [
                     'mbedtls/library/platform.c',
                     'mbedtls/library/ripemd160.c',
                     'mbedtls/library/rsa.c',
+                    'mbedtls/library/rsa_internal.c',
                     'mbedtls/library/sha1.c',
                     'mbedtls/library/sha256.c',
                     'mbedtls/library/sha512.c',
@@ -150,7 +151,11 @@ mbedcrypto_src = [
                     'mbedtls/library/timing.c',
                     'mbedtls/library/version.c',
                     'mbedtls/library/version_features.c',
-                    'mbedtls/library/xtea.c'
+                    'mbedtls/library/xtea.c',
+                    'mbedtls/library/platform_util.c',
+                    'mbedtls/library/chachapoly.c',
+                    'mbedtls/library/poly1305.c',
+                    'mbedtls/library/chacha20.c'
         ]
 
 mbeX509_src = [