Link against the new libtatsu and remove tss code

libimobiledevice · May 23, 2024 · 04a3f49 · 04a3f49
1 parent 56d2c01
commit 04a3f49
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 1,876 deletions.
diff --git a/configure.ac b/configure.ac
@@ -20,6 +20,7 @@ LIBIMOBILEDEVICE_VERSION=1.3.0
 LIBUSBMUXD_VERSION=2.0.2
 LIBPLIST_VERSION=2.6.0
 LIMD_GLUE_VERSION=1.2.0
+LIBTATSU_VERSION=1.0.0
 LIBZIP_VERSION=1.0
 LIBCURL_VERSION=7.0
 OPENSSL_VERSION=0.9.8
@@ -29,6 +30,7 @@ AC_SUBST(LIBIMOBILEDEVICE_VERSION)
 AC_SUBST(LIBUSBMUXD_VERSION)
 AC_SUBST(LIBPLIST_VERSION)
 AC_SUBST(LIMD_GLUE_VERSION)
+AC_SUBST(LIBTATSU_VERSION)
 AC_SUBST(LIBZIP_VERSION)
 AC_SUBST(LIBCURL_VERSION)
 AC_SUBST(OPENSSL_VERSION)
@@ -44,6 +46,7 @@ PKG_CHECK_MODULES(libimobiledevice, libimobiledevice-1.0 >= $LIBIMOBILEDEVICE_VE
 PKG_CHECK_MODULES(libusbmuxd, libusbmuxd-2.0 >= $LIBUSBMUXD_VERSION)
 PKG_CHECK_MODULES(libplist, libplist-2.0 >= $LIBPLIST_VERSION)
 PKG_CHECK_MODULES(limd_glue, libimobiledevice-glue-1.0 >= $LIMD_GLUE_VERSION)
+PKG_CHECK_MODULES(libtatsu, libtatsu-1.0 >= $LIBTATSU_VERSION)
 PKG_CHECK_MODULES(libzip, libzip >= $LIBZIP_VERSION)
 PKG_CHECK_MODULES(libcurl, libcurl >= $LIBCURL_VERSION)
 PKG_CHECK_MODULES(zlib, zlib)

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -6,6 +6,7 @@ AM_CFLAGS = \
 	$(libusbmuxd_CFLAGS) \
 	$(libplist_CFLAGS) \
 	$(limd_glue_CFLAGS) \
+	$(libtatsu_CFLAGS) \
 	$(libzip_CFLAGS) \
 	$(zlib_CFLAGS) \
 	$(openssl_CFLAGS) \
@@ -18,6 +19,7 @@ AM_LDFLAGS = \
 	$(libusbmuxd_LIBS) \
 	$(libplist_LIBS) \
 	$(limd_glue_LIBS) \
+	$(libtatsu_LIBS) \
 	$(libzip_LIBS) \
 	$(zlib_LIBS) \
 	$(openssl_LIBS) \
@@ -31,7 +33,6 @@ idevicerestore_SOURCES = \
 	idevicerestore.c idevicerestore.h \
 	endianness.h \
 	common.c common.h \
-	tss.c tss.h \
 	fls.c fls.h \
 	mbn.c mbn.h \
 	img3.c img3.h \

diff --git a/src/dfu.c b/src/dfu.c
@@ -27,8 +27,9 @@
 #include <unistd.h>
 #include <libirecovery.h>
 
+#include <libtatsu/tss.h>
+
 #include "dfu.h"
-#include "tss.h"
 #include "recovery.h"
 #include "idevicerestore.h"
 #include "common.h"

diff --git a/src/idevicerestore.c b/src/idevicerestore.c
@@ -46,10 +46,10 @@
 #endif
 
 #include <libimobiledevice-glue/utils.h>
+#include <libtatsu/tss.h>
 
 #include "ace3.h"
 #include "dfu.h"
-#include "tss.h"
 #include "img3.h"
 #include "img4.h"
 #include "ipsw.h"
@@ -359,6 +359,7 @@ int idevicerestore_start(struct idevicerestore_client_t* client)
 			idevice_set_debug_level(1);
 			irecv_set_debug_level(1);
 		}
+		tss_set_debug_level(client->debug_level);
 	}
 
 	idevicerestore_progress(client, RESTORE_STEP_DETECT, 0.0);

diff --git a/src/img4.c b/src/img4.c
@@ -22,9 +22,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <libtatsu/tss.h>
+
 #include "common.h"
 #include "img4.h"
-#include "tss.h"
 
 #define ASN1_PRIVATE 0xc0
 #define ASN1_PRIMITIVE_TAG 0x1f

diff --git a/src/recovery.c b/src/recovery.c
@@ -29,8 +29,9 @@
 #include <libimobiledevice/restore.h>
 #include <libimobiledevice/libimobiledevice.h>
 
+#include <libtatsu/tss.h>
+
 #include "idevicerestore.h"
-#include "tss.h"
 #include "img3.h"
 #include "restore.h"
 #include "recovery.h"

diff --git a/src/restore.c b/src/restore.c
@@ -38,14 +38,14 @@
 #endif
 #include <zip.h>
 #include <libirecovery.h>
+#include <libtatsu/tss.h>
 
 #include "idevicerestore.h"
 #include "asr.h"
 #include "fdr.h"
 #include "fls.h"
 #include "mbn.h"
 #include "ftab.h"
-#include "tss.h"
 #include "ipsw.h"
 #include "restore.h"
 #include "common.h"