ps3netsrv 20240210

- Added command line option to build local ISO file from directory - Added command line option to decrypt ISO (Rebug/3k3y encrypted) into new ISO - New makeiso tool based on ps3netsrv
aldostools · Feb 10, 2024 · 96741a3 · 96741a3
1 parent dd0edb4
commit 96741a3
Show file tree

Hide file tree

Showing 6 changed files with 203 additions and 24 deletions.
diff --git a/_Projects_/ps3netsrv/Makefile b/_Projects_/ps3netsrv/Makefile
@@ -13,6 +13,10 @@ CPPFLAGS += -Wall -Wno-format -I./include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_B
 #CFLAGS += -DOPT_FILE_SEEK
 #CPPFLAGS += -DOPT_FILE_SEEK
 
+#OUTPUT := makeiso
+#CFLAGS += -DMAKEISO
+#CPPFLAGS += -DMAKEISO
+
 #CFLAGS += -DNOSSL
 #CPPFLAGS +=-DNOSSL
 #OBJS = src/main.o src/compat.o src/mem.o src/File.o src/VIsoFile.o

diff --git a/_Projects_/ps3netsrv/bins/Windows/makeiso.exe b/_Projects_/ps3netsrv/bins/Windows/makeiso.exe
diff --git a/_Projects_/ps3netsrv/bins/Windows/ps3netsrv.exe b/_Projects_/ps3netsrv/bins/Windows/ps3netsrv.exe
diff --git a/_Projects_/ps3netsrv/include/color.h b/_Projects_/ps3netsrv/include/color.h
@@ -48,6 +48,7 @@ static void set_red_text(void)
 #endif
 }
 
+#ifndef MAKEISO
 static void set_gray_text(void)
 {
 #ifdef WIN32
@@ -56,5 +57,6 @@ static void set_gray_text(void)
 	printf("\033[1;30m");
 #endif
 }
+#endif
 
 #endif
diff --git a/_Projects_/ps3netsrv/src/File.cpp b/_Projects_/ps3netsrv/src/File.cpp
@@ -8,6 +8,8 @@
 #include "common.h"
 #include "compat.h"
 
+extern int make_iso;
+
 static const int FAILED		= -1;
 static const int SUCCEEDED	=  0;
 
@@ -98,15 +100,17 @@ int File::open(const char *path, int flags)
 		path_ps3iso_loc = strstr((char *)path, (char *)"ps3iso");
 
 	char *path_ext_loc = NULL;
-	if (path_ps3iso_loc)
+	if (path_ps3iso_loc || make_iso)
 	{
 		path_ext_loc = strstr((char *)(path + flen), (char *)".iso");
 		if (path_ext_loc == NULL)
 			path_ext_loc = strstr((char *)(path + flen), (char *)".ISO");
 	}
 
 	// Encryption only makes sense for .iso or .ISO files in the .../PS3ISO/ folder so exit quick if req is is not related.
-	if (is_multipart || (path_ps3iso_loc == NULL) || (path_ext_loc == NULL) || (path_ext_loc < path_ps3iso_loc))
+	if(make_iso)
+		;
+	else if (is_multipart || (path_ps3iso_loc == NULL) || (path_ext_loc == NULL) || (path_ext_loc < path_ps3iso_loc))
 	{
 		// Clean-up old region_info_ (even-though it shouldn't be needed).
 		if (region_info_ != NULL)
@@ -161,20 +165,20 @@ int File::open(const char *path, int flags)
 	key_path[path_ext_loc - path + 4] = 'y';
 	key_path[path_ext_loc - path + 5] = '\0';
 
-	key_fd = open_file(key_path, flags);
+	key_fd = open_file(key_path, O_RDONLY);
 
-	if (!FD_OK(key_fd))
+	if (!FD_OK(key_fd) && (path_ext_loc > path))
 	{
 		// Check for redump encrypted mode by looking for the ".key" is the same path of the ".iso".
 		key_path[path_ext_loc - path + 1] = 'k';
 		key_path[path_ext_loc - path + 2] = 'e';
 		key_path[path_ext_loc - path + 3] = 'y';
 		key_path[path_ext_loc - path + 4] = '\0';
 
-		key_fd = open_file(key_path, flags);
+		key_fd = open_file(key_path, O_RDONLY);
 	}
 
-	if (!FD_OK(key_fd))
+	if (!FD_OK(key_fd) && (path_ps3iso_loc > path))
 	{
 		// Check for redump encrypted mode by looking for the ".key" or ".dkey" file in the "REDKEY" folder.
 		key_path[path_ps3iso_loc - path + 0] = 'R';
@@ -184,7 +188,7 @@ int File::open(const char *path, int flags)
 		key_path[path_ps3iso_loc - path + 4] = 'E';
 		key_path[path_ps3iso_loc - path + 5] = 'Y';
 
-		key_fd = open_file(key_path, flags);
+		key_fd = open_file(key_path, O_RDONLY);
 
 		if (!FD_OK(key_fd))
 		{
@@ -195,7 +199,7 @@ int File::open(const char *path, int flags)
 			key_path[path_ext_loc - path + 4] = 'y';
 			key_path[path_ext_loc - path + 5] = '\0';
 
-			key_fd = open_file(key_path, flags);
+			key_fd = open_file(key_path, O_RDONLY);
 		}
 	}