078-use-system-mbedtls.patch 1.1 KB

12345678910111213141516171819202122
  1. Make it possible to use system mbedtls version
  2. --- a/resource/csdk/connectivity/src/SConscript
  3. +++ b/resource/csdk/connectivity/src/SConscript
  4. @@ -73,16 +73,7 @@ if env.get('SECURED') == '1':
  5. env.AppendUnique(CPPPATH = [src_dir + '/resource/csdk/security/include'])
  6. env.AppendUnique(CPPDEFINES = ['__WITH_DTLS__'])
  7. env.AppendUnique(CPPPATH = [os.path.join(root_dir, 'external/inc')])
  8. - tls_path = 'extlibs/mbedtls';
  9. - tls_headers_path = 'mbedtls/include';
  10. - if ca_os == 'tizen' and os.path.exists(root_dir + '/' + tls_path):
  11. - env.SConscript(os.path.join(root_dir, tls_path + '/SConscript'))
  12. - env.AppendUnique(CPPPATH = [os.path.join(root_dir, tls_path + '/' + tls_headers_path)])
  13. - else:
  14. - if ca_os != 'android':
  15. - env.SConscript('#' + tls_path + '/SConscript')
  16. - env.AppendUnique(CPPPATH = ['#' + tls_path + '/' + tls_headers_path])
  17. - env.AppendUnique(CA_SRC = [os.path.join(ca_path, 'adapter_util/ca_adapter_net_ssl.c')])
  18. + env.AppendUnique(CA_SRC = [os.path.join(ca_path, 'adapter_util/ca_adapter_net_ssl.c')])
  19. if ((secured == '1') and (with_tcp == True)):
  20. env.AppendUnique(CPPDEFINES = ['__WITH_TLS__'])