Fork Sync

.github/workflows/build.yml

@@ -2,6 +2,7 @@ name: build
 
 on:
   push:
+  pull_request:
   schedule:
     - cron: '0 0 1 * *'
 
@@ -12,31 +13,38 @@ jobs:
     - name: install dependencies
       run: |
           sudo apt-get update
-          sudo apt-get install cython
+          pip install cython
     - name: prepare environment
       run: |
           echo "target_triplet=`gcc -dumpmachine`" >> $GITHUB_ENV
     - name: fetch libplist
-      uses: dawidd6/action-download-artifact@v2
+      uses: dawidd6/action-download-artifact@v6
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
         workflow: build.yml
         name: libplist-latest_${{env.target_triplet}}
         repo: libimobiledevice/libplist
     - name: fetch libusbmuxd
-      uses: dawidd6/action-download-artifact@v2
+      uses: dawidd6/action-download-artifact@v6
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
         workflow: build.yml
         name: libusbmuxd-latest_${{env.target_triplet}}
         repo: libimobiledevice/libusbmuxd
     - name: fetch libimobiledevice-glue
-      uses: dawidd6/action-download-artifact@v2
+      uses: dawidd6/action-download-artifact@v6
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
         workflow: build.yml
         name: libimobiledevice-glue-latest_${{env.target_triplet}}
         repo: libimobiledevice/libimobiledevice-glue
+    - name: fetch libtatsu
+      uses: dawidd6/action-download-artifact@v6
+      with:
+        github_token: ${{secrets.GITHUB_TOKEN}}
+        workflow: build.yml
+        name: libtatsu-latest_${{env.target_triplet}}
+        repo: libimobiledevice/libtatsu
     - name: install external dependencies
       run: |
           mkdir extract
@@ -45,7 +53,7 @@ jobs:
           done
           sudo cp -r extract/* /
           sudo ldconfig
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: autogen
@@ -60,7 +68,7 @@ jobs:
           DESTDIR=`pwd`/dest make install
           tar -C dest -cf libimobiledevice.tar usr
     - name: publish artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: libimobiledevice-latest_${{env.target_triplet}}
         path: libimobiledevice.tar
@@ -74,37 +82,44 @@ jobs:
           else
             brew install libtool autoconf automake pkgconfig
           fi
-          pip install cython
+          pip3 install --break-system-packages cython
       shell: bash
     - name: fetch libplist
-      uses: dawidd6/action-download-artifact@v2
+      uses: dawidd6/action-download-artifact@v6
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
         workflow: build.yml
         name: libplist-latest_macOS
         repo: libimobiledevice/libplist
     - name: fetch libusbmuxd
-      uses: dawidd6/action-download-artifact@v2
+      uses: dawidd6/action-download-artifact@v6
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
         workflow: build.yml
         name: libusbmuxd-latest_macOS
         repo: libimobiledevice/libusbmuxd
     - name: fetch libimobiledevice-glue
-      uses: dawidd6/action-download-artifact@v2
+      uses: dawidd6/action-download-artifact@v6
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
         workflow: build.yml
         name: libimobiledevice-glue-latest_macOS
         repo: libimobiledevice/libimobiledevice-glue
+    - name: fetch libtatsu
+      uses: dawidd6/action-download-artifact@v6
+      with:
+        github_token: ${{secrets.GITHUB_TOKEN}}
+        workflow: build.yml
+        name: libtatsu-latest_macOS
+        repo: libimobiledevice/libtatsu
     - name: install external dependencies
       run: |
           mkdir extract
           for I in *.tar; do
             tar -C extract -xvf $I
           done
           sudo cp -r extract/* /
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: install additional requirements
       run: |
           mkdir -p lib
@@ -133,6 +148,17 @@ jobs:
           done
           export CFLAGS="$USEARCHS -isysroot $SDKDIR"
           echo "Using CFLAGS: $CFLAGS"
+          PYTHON3_BIN=`xcrun -f python3`
+          if test -x $PYTHON3_BIN; then
+            export PYTHON=$PYTHON3_BIN
+            PYTHON_VER=`$PYTHON3_BIN -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('VERSION'))"`
+            PYTHON_EXEC_PREFIX=`$PYTHON3_BIN -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('exec_prefix'))"`
+            PYTHON_LIBS_PATH=$PYTHON_EXEC_PREFIX/lib
+            PYTHON_FRAMEWORK_PATH=$PYTHON_EXEC_PREFIX/Python3
+            export PYTHON_CPPFLAGS="-I$PYTHON_EXEC_PREFIX/Headers"
+            export PYTHON_LIBS="-L$PYTHON_LIBS_PATH -lpython$PYTHON_VER"
+            export PYTHON_EXTRA_LDFLAGS="-Wl,-stack_size,1000000  -framework CoreFoundation $PYTHON_FRAMEWORK_PATH"
+          fi
           ./autogen.sh PKG_CONFIG_PATH=/usr/local/lib/pkgconfig --enable-debug \
               openssl_CFLAGS="-I${{ env.DEPSDIR }}/libressl-${{ env.LIBRESSL_VER }}/include" \
               openssl_LIBS="-Xlinker ${{ env.LIBSSL }} -Xlinker ${{ env.LIBCRYPTO }}"
@@ -146,7 +172,7 @@ jobs:
           DESTDIR=`pwd`/dest make install
           tar -C dest -cf libimobiledevice.tar usr
     - name: publish artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: libimobiledevice-latest_macOS
         path: libimobiledevice.tar
@@ -183,34 +209,41 @@ jobs:
           echo "target_triplet=`gcc -dumpmachine`" >> $GITHUB_ENV
           git config --global core.autocrlf false
     - name: fetch libplist
-      uses: dawidd6/action-download-artifact@v2
+      uses: dawidd6/action-download-artifact@v6
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
         workflow: build.yml
         name: libplist-latest_${{ matrix.arch }}-${{ env.dest }}
         repo: libimobiledevice/libplist
     - name: fetch libusbmuxd
-      uses: dawidd6/action-download-artifact@v2
+      uses: dawidd6/action-download-artifact@v6
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
         workflow: build.yml
         name: libusbmuxd-latest_${{ matrix.arch }}-${{ env.dest }}
         repo: libimobiledevice/libusbmuxd
     - name: fetch libimobiledevice-glue
-      uses: dawidd6/action-download-artifact@v2
+      uses: dawidd6/action-download-artifact@v6
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
         workflow: build.yml
         name: libimobiledevice-glue-latest_${{ matrix.arch }}-${{ env.dest }}
         repo: libimobiledevice/libimobiledevice-glue
+    - name: fetch libtatsu
+      uses: dawidd6/action-download-artifact@v6
+      with:
+        github_token: ${{secrets.GITHUB_TOKEN}}
+        workflow: build.yml
+        name: libtatsu-latest_${{ matrix.arch }}-${{ env.dest }}
+        repo: libimobiledevice/libtatsu
     - name: install external dependencies
       run: |
           mkdir extract
           for I in *.tar; do
             tar -C extract -xvf $I
           done
           cp -r extract/* /
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: autogen
       run: ./autogen.sh CC=gcc CXX=g++ --enable-debug
     - name: make
@@ -223,7 +256,7 @@ jobs:
           DESTDIR=`pwd`/dest make install
           tar -C dest -cf libimobiledevice.tar ${{ env.dest }}
     - name: publish artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: libimobiledevice-latest_${{ matrix.arch }}-${{ env.dest }}
         path: libimobiledevice.tar

.gitignore

@@ -37,6 +37,7 @@ docs/html
 libimobiledevice-1.0.pc
 tools/.libs/*
 tools/idevice*
+tools/afcclient
 !tools/idevice*.[ch]
 cython/.libs/*
 cython/*.c

3rd_party/ed25519/Makefile.am

@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = \
 	$(GLOBAL_CFLAGS) \
-	$(openssl_CFLAGS)
+	$(ssl_lib_CFLAGS)
 
 AM_LDFLAGS =
 

3rd_party/ed25519/seed.c

@@ -30,7 +30,7 @@ int ed25519_create_seed(unsigned char *seed) {
         return 1;
     }
 
-    fread(seed, 1, 32, f);
+    if(fread(seed, 1, 32, f)){}
     fclose(f);
 #endif
 

3rd_party/libsrp6a-sha512/Makefile.am

@@ -5,11 +5,9 @@ AM_CPPFLAGS = \
         -I$(top_srcdir) \
         -Wno-incompatible-pointer-types
 
-include_HEADERS = srp.h srp_aux.h cstr.h
-
 AM_CFLAGS = -DHAVE_CONFIG_H
 if HAVE_OPENSSL
-AM_CFLAGS += -DOPENSSL=1 -DOPENSSL_ENGINE=1 $(openssl_CFLAGS)
+AM_CFLAGS += -DOPENSSL=1 $(openssl_CFLAGS)
 else
 if HAVE_GCRYPT
 AM_CFLAGS += -DGCRYPT=1 $(libgcrypt_CFLAGS)
@@ -25,7 +23,9 @@ noinst_LTLIBRARIES = libsrp6a-sha512.la
 libsrp6a_sha512_la_SOURCES = \
   t_conv.c t_math.c t_misc.c \
   t_truerand.c cstr.c \
-  srp.c srp6a_sha512_client.c
-if !HAVE_OPENSSL
-libsrp6a_sha512_la_SOURCES += t_sha.c
-endif
+  srp.c srp6a_sha512_client.c \
+  srp.h srp_aux.h cstr.h \
+  t_sha.c
+#if !HAVE_OPENSSL
+#libsrp6a_sha512_la_SOURCES += t_sha.c
+#endif

3rd_party/libsrp6a-sha512/cstr.c

@@ -8,71 +8,30 @@
 #define MINSIZE		4		/* Absolute minimum - one word */
 
 static char cstr_empty_string[] = { '\0' };
-static cstr_allocator * default_alloc = NULL;
-
-/*
- * It is assumed, for efficiency, that it is okay to pass more arguments
- * to a function than are called for, as long as the required arguments
- * are in proper form.  If extra arguments to malloc() and free() cause
- * problems, define PEDANTIC_ARGS below.
- */
-#ifdef PEDANTIC_ARGS
-static void * Cmalloc(int n, void * heap) { return malloc(n); }
-static void Cfree(void * p, void * heap) { free(p); }
-static cstr_allocator malloc_allocator = { Cmalloc, Cfree, NULL };
-#else
-static cstr_allocator malloc_allocator = { malloc, free, NULL };
-#endif
-
-_TYPE( void )
-cstr_set_allocator(cstr_allocator * alloc)
-{
-  default_alloc = alloc;
-}
 
 _TYPE( cstr * )
-cstr_new_alloc(cstr_allocator * alloc)
+cstr_new()
 {
   cstr * str;
 
-  if(alloc == NULL) {
-    if(default_alloc == NULL) {
-      default_alloc = &malloc_allocator;
-    }
-    alloc = default_alloc;
-  }
-
-  str = (cstr *) (*alloc->alloc)(sizeof(cstr), alloc->heap);
+  str = (cstr *) malloc(sizeof(cstr));
   if(str) {
     str->data = cstr_empty_string;
     str->length = str->cap = 0;
     str->ref = 1;
-    str->allocator = alloc;
   }
   return str;
 }
 
 _TYPE( cstr * )
-cstr_new()
-{
-  return cstr_new_alloc(NULL);
-}
-
-_TYPE( cstr * )
-cstr_dup_alloc(const cstr * str, cstr_allocator * alloc)
+cstr_dup(const cstr * str)
 {
-  cstr * nstr = cstr_new_alloc(alloc);
+  cstr * nstr = cstr_new();
   if(nstr)
     cstr_setn(nstr, str->data, str->length);
   return nstr;
 }
 
-_TYPE( cstr * )
-cstr_dup(const cstr * str)
-{
-  return cstr_dup_alloc(str, NULL);
-}
-
 _TYPE( cstr * )
 cstr_create(const char * s)
 {
@@ -101,9 +60,9 @@ cstr_clear_free(cstr * str)
   if(--str->ref == 0) {
     if(str->cap > 0) {
       memset(str->data, 0, str->cap);
-      (*str->allocator->free)(str->data, str->allocator->heap);
+      free(str->data);
     }
-    (*str->allocator->free)(str, str->allocator->heap);
+    free(str);
   }
 }
 
@@ -112,16 +71,16 @@ cstr_free(cstr * str)
 {
   if(--str->ref == 0) {
     if(str->cap > 0)
-      (*str->allocator->free)(str->data, str->allocator->heap);
-    (*str->allocator->free)(str, str->allocator->heap);
+      free(str->data);
+    free(str);
   }
 }
 
 _TYPE( void )
 cstr_empty(cstr * str)
 {
   if(str->cap > 0)
-    (*str->allocator->free)(str->data, str->allocator->heap);
+    free(str->data);
   str->data = cstr_empty_string;
   str->length = str->cap = 0;
 }
@@ -137,8 +96,7 @@ cstr_alloc(cstr * str, int len)
     if(len < MINSIZE)
       len = MINSIZE;
 
-    t = (char *) (*str->allocator->alloc)(len * sizeof(char),
-					  str->allocator->heap);
+    t = (char *) malloc(len * sizeof(char));
     if(t) {
       if(str->data) {
 	t[str->length] = 0;