Browse Source

Use mbedtls for linux crypto.

Brucey 3 years ago
parent
commit
62bd14546d
3 changed files with 9 additions and 1 deletions
  1. 0 1
      core.mod/source.bmx
  2. 7 0
      zip.mod/source.bmx
  3. 2 0
      zip.mod/zip.bmx

+ 0 - 1
core.mod/source.bmx

@@ -29,7 +29,6 @@ Import "libarchive/libarchive/*.h"
 Import "libarchive/libarchive/archive_acl.c"
 Import "libarchive/libarchive/archive_check_magic.c"
 Import "libarchive/libarchive/archive_cmdline.c"
-Import "libarchive/libarchive/archive_cryptor.c"
 Import "libarchive/libarchive/archive_entry_copy_stat.c"
 Import "libarchive/libarchive/archive_entry_link_resolver.c"
 Import "libarchive/libarchive/archive_entry_sparse.c"

+ 7 - 0
zip.mod/source.bmx

@@ -26,7 +26,14 @@ Import Pub.zlib
 
 Import "../../pub.mod/zlib.mod/*.h"
 
+?linux
+Import Net.mbedtls
+
+Import "../../net.mod/mbedtls.mod/mbedtls/include/*.h"
+?
+
 Import "../core.mod/include/*.h"
 Import "../core.mod/libarchive/libarchive/*.h"
+Import "../core.mod/libarchive/libarchive/archive_cryptor.c"
 Import "../core.mod/libarchive/libarchive/archive_read_support_format_zip.c"
 Import "../core.mod/mods/archive_write_set_format_zip.c"

+ 2 - 0
zip.mod/zip.bmx

@@ -29,6 +29,8 @@ ModuleInfo "CC_OPTS: -DHAVE_ZLIB_H"
 ModuleInfo "CC_OPTS: -DHAVE_CONFIG_H -D_FILE_OFFSET_BITS=64"
 ?win32
 ModuleInfo "CC_OPTS: -DLIBARCHIVE_STATIC"
+?linux
+ModuleInfo "CC_OPTS: -DHAVE_LIBMBEDCRYPTO -DHAVE_MBEDTLS_AES_H"
 ?
 
 Import Archive.Core