oxen-io · nielsandriesse · Apr 3, 2019 · Apr 3, 2019 · Apr 3, 2019 · Apr 8, 2019
diff --git a/.gitignore b/.gitignore
@@ -58,3 +58,15 @@ GTAGS
 GRTAGS
 GPATH
 version.txt
+
+# Xcode & MacOS
+.DS_Store
+xcuserdata/
+*.xcodeproj/*
+!*.xcodeproj/project.pbxproj
+!*.xcodeproj/xcshareddata/
+!*.xcworkspace/contents.xcworkspacedata
+/*.gcno
+ios/Core/
+ios/Carthage/
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ option(AMD_RYZEN_HACK "hack for AMD Ryzen FPU bug (support FMA3 and FMA4 in FPU,
 if (NOT MSVC)
 option(STATIC_LINK_RUNTIME "link statically against compiler runtime, standard library and pthreads")
 endif()
-option(NON_PC_TARGET "non-pc target build: iphone, andriod, embedded non-i386 SBC, etc" )
+option(NON_PC_TARGET "non-pc target build: iOS, Android, embedded non-i386 SBC, etc" )
 option(SHADOW "use shadow testing framework. linux only" )
 option(ASAN "use address sanitiser, if your system has it" )
 option(JEMALLOC "use jemalloc. Not required on BSD" )
@@ -70,6 +70,12 @@ if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND SHADOW)
   message( FATAL_ERROR "shadow-framework is Linux only" )
 endif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND SHADOW)
 
+if(${CMAKE_SYSTEM_NAME} MATCHES "iOS")
+  message("Compiling for iOS")
+  add_definitions(-DDarwin)
+  set(UV_LIB "ios/libuv/libuv-ios-arm64.dylib")
+endif(${CMAKE_SYSTEM_NAME} MATCHES "iOS")
+
 if(NOT DEBIAN AND NOT MSVC_VERSION)
   set(OPTIMIZE_FLAGS -O3)
   set(DEBUG_FLAGS -O0 -g3)
@@ -134,7 +140,7 @@ endif(WOW64_CROSS_COMPILE OR WIN64_CROSS_COMPILE)
 
 if(DEBIAN)
   add_definitions(-DDEBIAN)
-elseif(NOT ANDROID AND NOT NON_PC_TARGET)
+elseif(NOT ANDROID AND NOT iOS AND NOT NON_PC_TARGET)
   if (NOT USE_AVX2)
     # Public binary releases
     set(CRYPTO_FLAGS -march=nocona -mtune=core2 -mfpmath=sse)
@@ -294,7 +300,12 @@ else()
 
   add_log_tag(${EXE})
 
-  install(TARGETS ${EXE} RUNTIME DESTINATION bin)
+  if(APPLE)
+    install(TARGETS ${EXE} RUNTIME DESTINATION bin BUNDLE DESTINATION bin)
+  else()
+    install(TARGETS ${EXE} RUNTIME DESTINATION bin)
+  endif()
+
   if(WIN32)
     install(PROGRAMS ${CMAKE_SOURCE_DIR}/lokinet-bootstrap.exe DESTINATION bin)
   else()

diff --git a/abyss-main/Images.xcassets/AppIcon.appiconset/Contents.json b/abyss-main/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,53 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/abyss-main/Images.xcassets/Contents.json b/abyss-main/Images.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/abyss-main/Images.xcassets/LaunchImage.launchimage/Contents.json b/abyss-main/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "minimum-system-version" : "7.0",
+      "subtype" : "retina4",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/cmake/unix.cmake b/cmake/unix.cmake
@@ -1,6 +1,10 @@
 add_definitions(-DUNIX)
 add_definitions(-DPOSIX)
 
+if(${CMAKE_SYSTEM_NAME} MATCHES "iOS")
+  link_directories(../ios/libuv/libuv-ios-arm64.dylib)
+endif()
+
 if (STATIC_LINK_RUNTIME)
   find_library(UV_LIB NAMES libuv.a)
 else()
@@ -20,7 +24,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
   find_library(FS_LIB NAMES c++experimental)
   set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-freebsd.c ${TT_ROOT}/tuntap-unix-bsd.c)
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "iOS")
   find_library(FS_LIB NAMES c++fs c++experimental stdc++fs)
 
   if(FS_LIB STREQUAL FS_LIB-NOTFOUND)

diff --git a/crypto/salsa20/xmm6int/salsa20_xmm6int-sse2.c b/crypto/salsa20/xmm6int/salsa20_xmm6int-sse2.c
@@ -1,6 +1,4 @@
-#if defined(ANDROID) || defined(RPI)
-
-#else
+#if __SSE2__
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -120,4 +118,4 @@ struct crypto_stream_salsa20_implementation
     crypto_stream_salsa20_xmm6int_sse2_implementation = {
         SODIUM_C99(.stream =) stream_sse2,
         SODIUM_C99(.stream_xor_ic =) stream_sse2_xor_ic};
-#endif
+#endif
diff --git a/crypto/salsa20/xmm6int/salsa20_xmm6int-sse2.h b/crypto/salsa20/xmm6int/salsa20_xmm6int-sse2.h
@@ -3,7 +3,7 @@
 
 #include "../stream_salsa20.h"
 #include <sodium/crypto_stream_salsa20.h>
-#ifndef ANDROID
+#if __SSE2__
 extern struct crypto_stream_salsa20_implementation
     crypto_stream_salsa20_xmm6int_sse2_implementation;
-#endif
+#endif
diff --git a/daemon/main.cpp b/daemon/main.cpp
@@ -58,7 +58,7 @@ resolvePath(std::string conffname)
 {
   // implemented in netbsd, removed downstream for security reasons
   // even though it is defined by POSIX.1-2001+
-#if !defined(_WIN32) && !defined(__OpenBSD__)
+#if !defined(_WIN32) && !defined(__OpenBSD__) && !defined(iOS)
   wordexp_t exp_result;
   wordexp(conffname.c_str(), &exp_result, 0);
   char *resolvedPath = realpath(exp_result.we_wordv[0], NULL);

diff --git a/include/tuntap.h b/include/tuntap.h
@@ -42,6 +42,8 @@
 #endif
 #if defined Linux
 #include <netinet/in.h>
+#elif defined(iOS)
+#include <net/ethernet.h>
 #else
 #include <netinet/if_ether.h>
 #endif

diff --git a/ios/Cartfile b/ios/Cartfile
@@ -0,0 +1,2 @@
+github "mutualmobile/MMWormhole" ~> 2.0.0
+github "mxcl/PromiseKit" ~> 6.10.0
diff --git a/ios/Cartfile.resolved b/ios/Cartfile.resolved
@@ -0,0 +1,2 @@
+github "mutualmobile/MMWormhole" "2.0.10"
+github "mxcl/PromiseKit" "6.10.0"