Updated decrypt0r to work with img4tool by xerub

BTW I cleaned build.sh and removed the way to save SHSHs with savethemblobs

Author: mathieu

.gitignore

@@ -5,3 +5,4 @@ decrypt0r
 *.im4p
 *.dec
 IPSW
+kernel*

build.sh

@@ -37,12 +37,6 @@ if [[ $(uname) != 'Linux' ]]; then
   exit 1
 fi
 
-if [[ $(uname -m) == x86_64 ]]; then
-	wget https://www.dropbox.com/s/b6m5bkaqym2gaqh/joker?dl=0 -O joker
-	mv joker /usr/local/bin/
-	chmod +x /usr/local/bin/joker
-fi
-
 apt-get -y install binutils
 apt-get -y install p7zip-full
 apt-get -y install git
@@ -64,22 +58,16 @@ git clone https://github.com/xerub/xpwn.git
 mkdir ~/build
 cd ~/build
 cmake ~/xpwn
-make
-make package
-tar xvjf XPwn-0.5.8-Linux.tar.bz2
-
-wget
-cd XPwn-0.5.8-Linux
-cp dmg hdutil hfsplus ipsw ticket xpwntool validate /usr/local/bin/ # Maybe I can replace this shit with one line : sudo make install 
+make install
 
 echo "XPwn binaries installed !"
 
-
 echo "Now installing reimagine..."
 
 apt-get -y install libssl-dev:i386 #Should work for reimagine
 apt-get -y install clang
 
+# Reimagine
 cd ~
 git clone https://github.com/danzatt/reimagine.git #
 cd reimagine
@@ -88,19 +76,13 @@ git clone https://github.com/danzatt/opensn0w-X.git
 cd ~
 cd reimagine/opensn0w-X/src && make all
 cd ../.. && make
-
 cp ~/reimagine/reimagine /usr/local/bin/
-
 echo "Installed reimagine !"
-echo "Downloading Savethemblobs..."
-cd ~
-git clone https://github.com/Neal/savethemblobs.git
-cp savethemblobs/savethemblobs.py /usr/local/bin/
-echo "Installed Savethemblobs"
 
 apt-get -y install gcc
-cd ~ # I don't know yet why I install it
-git clone https://github.com/matteyeux/iOS-Utilities.git
-cd iOS-Utilities
-make
-make install
+
+git clone --recursive https://github.com/xerub/img4tool 
+cd img4tool/lzfse 
+make && make install 
+cd ../
+make && cp img4 /usr/local/bin/

src/decrypt0r.c

@@ -17,25 +17,23 @@ int main(int argc, char const *argv[])
 	printf("Choose what you want to do\n");
 	printf(" 1) Decrypt Root Filesystem\n");
 	printf(" 2) Decrypt Ramdisk\n");
-	printf(" 3) Decrypt IMG3 File\n");
+	printf(" 3) Decrypt IMG3/IMG4 File\n");
 	printf(" 4) Decrypt DFU File\n");
 	printf(" 5) Decrypt Kernelcache\n");
 	printf(" 6) Grab Keybags\n");
 	printf(" 7) Patch iBEC/iBSS\n");
-	printf(" 8) Save SHSHs blobs\n");
 	printf("> ");
 	choice_of_your_life = fgetn();
 
 	switch (choice_of_your_life)
 	{
 		case 1 : rootfs(); break;
 		case 2 : Ramdisk(); break;
-		case 3 : IMG3(); break;
+		case 3 : IMGfile(); break;
 		case 4 : DFU_file(); break;
 		case 5 : kernelcache(); break;
 		case 6 : get_keybags(); break;
 		case 7 : patcher(); break;
-		case 8 : save_blobs(); break;
 		default : printf("No option available yet\n"); 
 	}
 	return 0;	

src/firmware_tools.c

@@ -255,7 +255,7 @@ int Ramdisk()
 	return 0;
 }
 
-int IMG3()
+int IMGfile()
 {	
 	char name[120];
 	char buildCommand[1024];
@@ -293,7 +293,7 @@ int IMG3()
 
 	else if (im4p == 1)
 	{
-		sprintf(buildCommand, "dd if=target bs=52 skip=1 | openssl aes-256-cbc -K %s -iv %s -nopad -d > %s.dec", keyiv, key, name);
+		sprintf(buildCommand, "img4 -extra target %s.dec %s%s", name, keyiv, key);
 	}
 
 	else {
@@ -338,7 +338,7 @@ int DFU_file()
 
 	else if (im4p == 1)
 	{
-		sprintf(buildCommand, "dd if=target bs=52 skip=1 | openssl aes-256-cbc -K %s -iv %s -nopad -d > %s.dec", keyiv, key, dfu_name);
+		sprintf(buildCommand, "img4 -extra target %s.dec %s%s", dfu_name, keyiv, key);
 	}
 	system(buildCommand);
 	rename("target", dfu_name);
@@ -363,6 +363,7 @@ int kernelcache()
 
 	printf("Enter the key IV for %s: ", name);
 	fget(keyiv, 80);
+
 	rename(name, "target");
 
 	if (im4p == 0)
@@ -372,7 +373,14 @@ int kernelcache()
 
 	else if (im4p == 1)
 	{
-		sprintf(buildCommand, "dd if=target bs=52 skip=1 | openssl aes-256-cbc -K %s -iv %s -nopad -d > %s.dec", keyiv, key, name);
+		if (strcmp(keyiv, "")==0 && strcmp(keyiv, "")==0)
+		{
+			sprintf(buildCommand, "img4 -image target %s.dec", name);
+		} 
+		else {
+			sprintf(buildCommand, "img4 -extra target %s.dec %s%s", name, keyiv, key);
+		}
+
 	}
 	system(buildCommand);
 	rename("target", name);
@@ -421,15 +429,15 @@ int patcher()
 	return 0;
 }
 
-int save_blobs()
-{	
-	char ecid[15], model[10], command[256];
-	swag_logo();
-	printf("ECID : ");
-	fget(ecid, 15);
-	printf("model (e.g iPhone5,4 for iPhone 5C) : ");
-	fget(model, 10);
-	sprintf(command, "savethemblobs.py --no-submit-cydia --skip-cydia --skip-ifaith 0x%s %s", ecid, model);
-	system(command);
-	printf("Blobs saved to ~/.shsh\n");
-}
+// int save_blobs()
+// {	
+// 	char ecid[15], model[10], command[256];
+// 	swag_logo();
+// 	printf("ECID : ");
+// 	fget(ecid, 15);
+// 	printf("model (e.g iPhone5,4 for iPhone 5C) : ");
+// 	fget(model, 10);
+// 	sprintf(command, "savethemblobs.py --no-submit-cydia --skip-cydia --skip-ifaith 0x%s %s", ecid, model);
+// 	system(command);
+// 	printf("Blobs saved to ~/.shsh\n");
+// }

src/firmware_tools.h

@@ -7,7 +7,7 @@ int unziper();
 int ipswDownloader(); 
 int rootfs();
 int Ramdisk();
-int IMG3();
+int IMGfile();
 int DFU_file();
 int kernelcache();
 int patcher();