projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update snapshot(2018-01-04)
[platform/upstream/iotivity.git]
/
extlibs
/
mbedtls
/
SConscript
diff --git
a/extlibs/mbedtls/SConscript
b/extlibs/mbedtls/SConscript
index
cfcec9d
..
c385f30
100644
(file)
--- a/
extlibs/mbedtls/SConscript
+++ b/
extlibs/mbedtls/SConscript
@@
-65,7
+65,7
@@
os.chdir(mbedtls_dir)
# Apply ocf patch on git revision
if os.path.exists('.git/HEAD'):
# 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
os.system(cmd)
else:
print 'mbedtls: Assume ocf.patch (TLS_ECDH_ANON_WITH_AES_128_CBC_SHA256) was applied in %s' % mbedtls_dir