Skip to content

Commit

Permalink
build: simplier making, depends version is new for now
Browse files Browse the repository at this point in the history
  • Loading branch information
@s0uthwest
s0uthwest committed Dec 25, 2019
1 parent 48a986f commit 0d2dd3d
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 42 deletions.
20 changes: 10 additions & 10 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,23 @@ Usage: `tsschecker [OPTIONS]`

| option (short) | option (long) | description |
|----------------|---------------------------|-----------------------------------------------------------------------------------|
| `-h` | `--help` | prints usage information |
| `-d` | `--device MODEL` | specify device by its model (eg. `iPhone4,1`) |
| `-i` | `--ios VERSION` | specify firmware version (eg. `6.1.3`) |
| `-Z` | `--buildid ` | specific buildid instead of firmware version (eg. `13C75`) |
| `-B` | `--boardconfig ` | specific boardconfig instead of device model (eg. `n61ap`) |
| `-Z` | `--buildid BUILD ` | specific buildid instead of firmware version (eg. `13C75`) |
| `-B` | `--boardconfig BOARD ` | specific boardconfig instead of device model (eg. `n61ap`) |
| `-o` | `--ota` | check OTA signing status, instead of normal restore |
| `-b` | `--no-baseband` | don't check baseband signing status. Request a ticket without baseband |
| `-m` |`--build-manifest` | manually specify buildmanifest (can be used with `-d`) |
| `-m` | `--build-manifest` | manually specify buildmanifest (can be used with `-d`) |
| `-s` | `--save` | save fetched shsh blobs (mostly makes sense with -e) |
| `-u` |`--update-install `| request update ticket instead of erase |
| `-l` | `--latest` | use latest public firmware version instead of manually specifying one<br>especially useful with `-s` and `-e` for saving blobs |
| `-u` | `--update-install `| request update ticket instead of erase |
| `-l` | `--latest` | use latest public firmware version instead of manually specifying one<br>especially useful with `-s` and `-e` for saving signing tickets |
| `-e` | `--ecid ECID` | manually specify an ECID to be used for fetching blobs, instead of using random ones. <br>ECID must be either DEC or HEX eg. `5482657301265` or `ab46efcbf71` |
| | `--apnonce NONCE` | manually specify ApNonce instead of using random one (not required for saving blobs) |
| | `--sepnonce NONCE` | manually specify SepNonce instead of using random one (not required for saving blobs) |
| `-g` | `--generator GEN` | manually specify generator in format 0x%%16llx |
| | `--apnonce NONCE` | manually specify ApNonce instead of using random one (not required for saving signing tickets) |
| | `--sepnonce NONCE` | manually specify SepNonce instead of using random one (not required for saving signing tickets) |
| | `--bbsnum SNUM` | manually specify BbSNUM in HEX for saving valid BBTicket (not required for saving blobs) |
| `-g` | `--generator GEN` | manually specify generator in format 0x%%16llx |
| | `--save-path PATH` | specify path for saving blobs
| `-h` | `--help` | prints usage information | |
| | `--save-path PATH` | specify path for saving blobs |
| |`--beta` | request ticket for beta instead of normal release (use with `-o`) |
| |`--list-devices` | list all known devices |
| |`--list-ios` | list all known firmware versions |
Expand Down
27 changes: 9 additions & 18 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,26 @@ AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR([tsschecker/tsschecker.h])
AC_CONFIG_HEADERS([config.h])

# Checks the platform.
AC_MSG_CHECKING([whether to enable WIN32 specific flags])
case "$host_os" in
*mingw*)
win32=true
AC_MSG_RESULT([yes])
AC_CHECK_TOOL(WINDRES, windres)
;;
*)
win32=false
AC_MSG_RESULT([no])
;;
# Check for operating system
AC_MSG_CHECKING([whether we need platform-specific build settings])
case $host_os in
darwin* )
;;
esac
AM_CONDITIONAL(WIN32, test x$win32 = xtrue)

# Checks for programs.
AC_PROG_CC
CFLAGS+=" -std=c11"
AC_PROG_INSTALL
AC_PROG_LIBTOOL
AC_CONFIG_MACRO_DIRS([m4])
AC_CANONICAL_HOST

# Versioning.
CFLAGS+=" -D TSSCHECKER_VERSION_COUNT=\\\"$(git rev-list --count HEAD | tr -d '\n')\\\""
CFLAGS+=" -D TSSCHECKER_VERSION_SHA=\\\"$(git rev-parse HEAD | tr -d '\n')\\\""

# Checks for libraries.
AC_CANONICAL_HOST

AC_ARG_WITH(
[libcrypto],
[AS_HELP_STRING([--with-libcrypto], [build with libcrypto (default for non-Mac)])],
Expand All @@ -51,16 +42,16 @@ AC_ARG_WITH(
]
)

PKG_CHECK_MODULES(libplist, libplist >= 1.0)
PKG_CHECK_MODULES(libplist, libplist >= 2.0.0)
PKG_CHECK_MODULES(libcurl, libcurl >= 1.0)
PKG_CHECK_MODULES(libfragmentzip, libfragmentzip >= 1.0)
PKG_CHECK_MODULES(libfragmentzip, libfragmentzip >= 48)
AS_IF([test "x$with_libcrypto" != xno],
[PKG_CHECK_MODULES(libcrypto, libcrypto >= 1.0)]
)
PKG_CHECK_MODULES(libirecovery, libirecovery >= 0.2.0)

# Checks for header files.
AC_CHECK_HEADERS([getopt.h stddef.h stdlib.h string.h stdio.h unistd.h])
AC_CHECK_HEADERS([getopt.h stddef.h stdio.h])

# Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_INT32_T
Expand Down
4 changes: 2 additions & 2 deletions tsschecker.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 47;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -185,7 +185,7 @@
};
};
buildConfigurationList = 87EB909A1C2940CD002CEE70 /* Build configuration list for PBXProject "tsschecker" */;
compatibilityVersion = "Xcode 3.2";
compatibilityVersion = "Xcode 6.3";
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
Expand Down
4 changes: 0 additions & 4 deletions tsschecker/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,5 @@ bin_PROGRAMS = tsschecker
tsschecker_CFLAGS = $(AM_CFLAGS)
tsschecker_LDADD = $(AM_LDFLAGS) libjssy.a

if WIN32
tsschecker_LDFLAGS = -all-static -static-libgcc
endif

tsschecker_SOURCES = tsschecker.c tss.c download.c main.c
endif
15 changes: 7 additions & 8 deletions tsschecker/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,26 +65,25 @@ static struct option longopts[] = {
void cmd_help(){
printf("Usage: tsschecker [OPTIONS]\n");
printf("Checks (real) signing status of device/firmware\n\n");
printf(" -h, --help\t\t\tprints usage information\n");
printf(" -d, --device MODEL\t\tspecific device by its model (eg. iPhone4,1)\n");
printf(" -i, --ios VERSION\t\tspecific firmware version (eg. 6.1.3)\n");
printf(" -Z --buildid\t\t\tspecific buildid instead of firmware version (eg. 13C75)\n");
printf(" -B, --boardconfig\t\tspecific boardconfig instead of device model (eg. n61ap)\n");
printf(" -h, --help\t\t\tprints usage information\n");
printf(" -Z --buildid BUILD \t\tspecific buildid instead of firmware version (eg. 13C75)\n");
printf(" -B, --boardconfig BOARD \tspecific boardconfig instead of device model (eg. n61ap)\n");
printf(" -o, --ota\t\t\tcheck OTA signing status, instead of normal restore\n");
printf(" -b, --no-baseband\t\tdon't check baseband signing status. Request a ticket without baseband\n");
printf(" -m, --build-manifest\t\tmanually specify buildmanifest (can be used with -d)\n");
printf(" -s, --save\t\t\tsave fetched shsh blobs (mostly makes sense with -e)\n");
printf(" -u, --update-install\t\trequest update ticket instead of erase\n");
printf(" -l, --latest\t\t\tuse latest public firmware version instead of manually specifying one\n");
printf(" \t\tespecially useful with -s and -e for saving blobs\n");
printf(" -e, --ecid ECID\t\tmanually specify ECID to be used for fetching blobs, instead of using random ones\n");
printf(" \t\tespecially useful with -s and -e for saving signing tickets\n");
printf(" -e, --ecid ECID\t\tmanually specify ECID to be used for fetching signing tickets, instead of using random ones\n");
printf(" \t\tECID must be either DEC or HEX eg. 5482657301265 or ab46efcbf71\n");
printf(" -g, --generator GEN\t\tmanually specify generator in format 0x%%16llx\n");
printf(" --apnonce NONCE\t\tmanually specify ApNonce instead of using random one (not required for saving blobs)\n");
printf(" --sepnonce NONCE\t\tmanually specify SepNonce instead of using random one (not required for saving blobs)\n");
printf(" --bbsnum SNUM\t\tmanually specify BbSNUM in HEX for saving valid BBTicket (not required for saving blobs)\n");
printf(" -g, --generator GEN\t\tmanually specify generator in format 0x%%16llx\n");
printf(" --save-path PATH\t\tspecify path for saving blobs\n");
printf(" -h, --help\t\t\tprints usage information\n");
printf(" --save-path PATH\t\tspecify path for saving signing tickets\n");
printf(" --beta\t\t\trequest ticket for beta instead of normal release (use with -o)\n");
printf(" --list-devices\t\tlist all known devices\n");
printf(" --list-ios\t\tlist all known firmware versions\n");
Expand Down

0 comments on commit 0d2dd3d

Please sign in to comment.