Merge pull request #29 from DaniElectra/nimbus-10600

DECOMPRESSING.md

@@ -15,6 +15,8 @@ This is a tutorial on how to get, extract, and decompress code.bin files for pat
 ### Modules to dump
 - Account (act): 0004013000003802
 - Friends (friends): 0004013000003202
+- HTTP (http): 0004013000002902
+- Socket (socket): 0004013000002E02
 - SSL (ssl): 0004013000002F02
 - Miiverse (miiverse):
     - JPN: 000400300000BC02

Makefile

@@ -7,22 +7,26 @@ CIA_OUT_FOLDER  := $(OUT_FOLDER)/cia_out
 3DSX_OUT_FOLDER := $(OUT_FOLDER)/3dsx_out
 COMBINED_OUT_FOLDER := $(OUT_FOLDER)/combined_out
 
-3DS_OUT	        := 3ds
+3DS_OUT         := 3ds
 CIA_OUT         := cias
 
-LUMA_OUT	    := luma/titles
+LUMA_OUT            := luma/titles
 LUMA_SYSMODULE_OUT  := luma/sysmodules
 
-FRIENDS_TITLE_ID	:= 0004013000003202
-ACT_TITLE_ID	:= 0004013000003802
-SSL_TITLE_ID    := 0004013000002F02
+FRIENDS_TITLE_ID    := 0004013000003202
+ACT_TITLE_ID        := 0004013000003802
+HTTP_TITLE_ID       := 0004013000002902
+SOCKET_TITLE_ID     := 0004013000002E02
+SSL_TITLE_ID        := 0004013000002F02
 MIIVERSE_ID_JPN     := 000400300000BC02
 MIIVERSE_ID_USA     := 000400300000BD02
 MIIVERSE_ID_EUR     := 000400300000BE02
 
-FRIENDS_OUT     := $(LUMA_SYSMODULE_OUT)/$(FRIENDS_TITLE_ID).ips
-ACT_OUT         := $(LUMA_SYSMODULE_OUT)/$(ACT_TITLE_ID).ips
-SSL_OUT         := $(LUMA_SYSMODULE_OUT)/$(SSL_TITLE_ID).ips
+ACT_OUT             := $(LUMA_SYSMODULE_OUT)/$(ACT_TITLE_ID).ips
+FRIENDS_OUT         := $(LUMA_SYSMODULE_OUT)/$(FRIENDS_TITLE_ID).ips
+HTTP_OUT            := $(LUMA_SYSMODULE_OUT)/$(HTTP_TITLE_ID).ips
+SOCKET_OUT          := $(LUMA_SYSMODULE_OUT)/$(SOCKET_TITLE_ID).ips
+SSL_OUT             := $(LUMA_SYSMODULE_OUT)/$(SSL_TITLE_ID).ips
 MIIVERSE_OUT_JPN    := $(LUMA_OUT)/$(MIIVERSE_ID_JPN)
 MIIVERSE_OUT_USA    := $(LUMA_OUT)/$(MIIVERSE_ID_USA)
 MIIVERSE_OUT_EUR    := $(LUMA_OUT)/$(MIIVERSE_ID_EUR)
@@ -39,8 +43,10 @@ all:
 	@$(MAKE) -C patches
 
 # copy patches to patches folders
-	@cp -r patches/friends/out/* $(PATCHES_OUT_FOLDER)/$(FRIENDS_OUT)
 	@cp -r patches/act/out/* $(PATCHES_OUT_FOLDER)/$(ACT_OUT)
+	@cp -r patches/friends/out/* $(PATCHES_OUT_FOLDER)/$(FRIENDS_OUT)
+	@cp -r patches/http/out/* $(PATCHES_OUT_FOLDER)/$(HTTP_OUT)
+	@cp -r patches/socket/out/* $(PATCHES_OUT_FOLDER)/$(SOCKET_OUT)
 	@cp -r patches/ssl/out/* $(PATCHES_OUT_FOLDER)/$(SSL_OUT)
 	@cp -r patches/miiverse/out/* $(PATCHES_OUT_FOLDER)/$(MIIVERSE_OUT_JPN)
 	@cp -r patches/miiverse/out/* $(PATCHES_OUT_FOLDER)/$(MIIVERSE_OUT_USA)

README.md

@@ -24,6 +24,7 @@ Thanks to:
 
 - [pinklimes](https://github.com/gitlimes) for the CIA version banner
 - [TraceEntertains](https://github.com/TraceEntertains) for making a CIA version of Nimbus and maintaining the project
+- [DaniElectra](https://github.com/DaniElectra) for making the 3DS HTTP and Socket patches
 - [SciresM](https://github.com/SciresM) for making the 3DS SSL patches
 - [zaksabeast](https://github.com/zaksabeast) for the original 3ds-Friend-Account-Manager and all the research into the friends and act system titles
 - [shutterbug2000](https://github.com/shutterbug2000) for the GUI

app/Makefile

@@ -52,7 +52,7 @@ BNR_AUDIO := meta/audio.wav
 VERSION_HEADER = version.hpp
 
 VERSION_MAJOR := 1
-VERSION_MINOR := 5
+VERSION_MINOR := 6
 VERSION_MICRO := 0
 
 #GFXBUILD	:=	$(ROMFS)/gfx

patches/Makefile

@@ -1,21 +1,29 @@
-.PHONY: all clean act friends miiverse ssl
+.PHONY: all clean act friends http miiverse ssl socket
 
-all: act friends miiverse ssl
+all: act friends http miiverse ssl socket
 
 act:
 	@make -C act
 
 friends:
 	@make -C friends
-
+
+http:
+	@make -C http
+
 miiverse:
 	@make -C miiverse
-	
+
 ssl:
 	@make -C ssl
 
+socket:
+	@make -C socket
+
 clean:
 	@make -C act clean
 	@make -C friends clean
+	@make -C http clean
 	@make -C miiverse clean
 	@make -C ssl clean
+	@make -C socket clean

patches/http/.gitignore

@@ -0,0 +1,4 @@
+# build stuff and code.bin
+code.bin
+build
+out

patches/http/Makefile

@@ -0,0 +1,9 @@
+.PHONY: all clean
+
+all:
+	@mkdir -p build out
+	@armips src/main.s
+	@flips -c code.bin build/patched_code.bin out/code.ips
+
+clean:
+	@rm -rf build out

patches/http/README.md

@@ -0,0 +1,5 @@
+# Pretendo patches for http:C
+
+These patches redirect Nintendo URLs to Pretendo when a Pretendo account is being used.
+
+Developed by [DaniElectra](https://github.com/DaniElectra) and [TraceEntertains](https://github.com/TraceEntertains)

patches/http/src/frdu.s

@@ -0,0 +1,63 @@
+; according to ghidra these .data addresses are not used, lets hope that its right
+frd_handle equ 0x11C340
+nasc_environment equ 0x11C344
+
+get_nasc_environment: ; 0x1accc
+	push    {r4, r11, lr}
+
+	; we have to cache the nasc environment on memory
+	; or the frd sysmodule will hang when trying to perform
+	; a request due to call recursion
+	ldr     r0, =nasc_environment      ; load nasc environment address to r0
+	ldr     r0, [r0]                   ; load nasc environment
+	cmn     r0, #0                     ; check if r0 has a value
+	bne     get_nasc_environment_end   ; if it does, return it
+
+	bl      get_frd_u_handle           ; get the frd_handle
+
+	; first we use the SetClientSdkVersion command, or this wont work
+	mrc     p15, 0x0, r4, c13, c0, 0x3 ; get our thread local storage and store it in r4
+	ldr     r0, =0x00320042            ; load frd:u SetClientSdkVersion header into r0
+	str     r0, [r4, #0x80]!           ; set cmdbuf[0] to our cmdhdr from r0
+	ldr     r0, =0x70000C8             ; set sdk version, same as nimbus
+	str     r0, [r4, #0x4]             ; set cmdbuf[1] to the sdk version
+	mov     r0, 32                     ; set placeholder kernel process id
+	str     r0, [r4, #0x8]             ; set cmdbuf[2] to the placeholder process id
+	ldr     r0, =frd_handle            ; load frd_handle address to r0
+	ldr     r0, [r0]                   ; load frd_handle
+	swi     0x32                       ; send the request
+
+	; now, we can make the request for the nasc environment
+	mrc     p15, 0x0, r4, c13, c0, 0x3 ; get our thread local storage and store it in r4
+	ldr     r0, =0x00300000            ; load frd:u GetServerTypes header into r0
+	str     r0, [r4, #0x80]!           ; set cmdbuf[0] to our cmdhdr from r0
+	ldr     r0, =frd_handle            ; load frd_handle address to r0
+	ldr     r0, [r0]                   ; load frd_handle
+	swi     0x32                       ; send the request
+	cmn     r0, #0                     ; check if r0 is negative
+	bmi     get_nasc_environment_clear ; if it is, go to the clear label to return 0
+	ldr     r2, [r4, #0x4]             ; load result into r2
+	cmn     r2, #0                     ; check if r2 is negative
+	bmi     get_nasc_environment_clear ; if it is, go to the clear label to return 0
+	ldr     r0, [r4, #0x8]             ; get our nasc environment from cmdbuf[2] to return and store it in r0
+	add     r0, r0, #1                 ; add 1 to distinguish uninitialized value 0
+	ldr     r1, =nasc_environment      ; load nasc environment address to r1
+	str     r0, [r1]                   ; store the local nasc environment to memory
+	b       get_nasc_environment_end   ; jump to the end
+
+get_nasc_environment_clear: ; 0x1ad4c
+	mov     r0, #0
+
+get_nasc_environment_end: ; 0x1ad50
+	pop     {r4, r11, lr}
+	bx      lr
+
+get_frd_u_handle: ; 0x1ad58
+	push    {r11, lr}
+
+	ldr     r0, =frd_handle            ; load frd_handle address to r0
+	ldr     r1, =frdu_name             ; load frdu name into r1
+	bl      get_service_handle         ; get frd_handle
+
+	pop     {r11, lr}
+	bx      lr

patches/http/src/main.s

@@ -0,0 +1,146 @@
+.3ds
+
+.open "code.bin", "build/patched_code.bin", 0x100000
+
+;                                   (r0)              (r1)
+; Result get_service_handle(Handle* handle_out, char* service_name)
+get_service_handle equ 0x10DB40
+
+;                    (r0)       (r1)        (r2)
+; void* memcpy(void* dst, void* src, size_t size)
+memcpy equ 0x10D2DC
+
+;                     (r0)
+; size_t strlen(char* string)
+strlen equ 0x10F8B0
+
+replace_hook_addr equ 0x113868
+replace_function_addr equ 0x11AA70
+
+.org replace_hook_addr
+	replace_hook:
+		bl replace_func_jump ; Load our custom code instead of the normal address (0xE04C)
+
+.org replace_function_addr
+	; moves the char* from r5 into r0, then jumps to the code that replaces stuff in it
+	replace_func_jump: ; 0x1aa70
+		mov     r0, r5
+		b       handle_replacements
+
+	.include "src/strfunctions.s"
+
+	;                                                         (r0)                     (r1)          (r2)
+	; returns modified char* in r0, func variables are (char* stringToReplaceOn, char* target, char* replacement)
+	find_and_replace: ; 0x1ac38 0x1ab90
+		push    {r11, lr}
+		add     r11, sp, #4
+		sub     sp, sp, #0x20
+		str     r0, [r11, #-0x18]
+		str     r1, [r11, #-0x1c]
+		str     r2, [r11, #-0x20]
+		ldr     r1, [r11, #-0x1c]
+		ldr     r0, [r11, #-0x18]
+		bl      strstr
+		str     r0, [r11, #-8]
+		ldr     r3, [r11, #-8]
+		cmp     r3, #0
+		beq     find_and_replace_lab_1
+		ldr     r0, [r11, #-0x1c]
+		bl      strlen
+		mov     r3, r0
+		str     r3, [r11, #-0xc]
+		ldr     r0, [r11, #-0x20]
+		bl      strlen
+		mov     r3, r0
+		str     r3, [r11, #-0x10]
+		ldr     r3, [r11, #-0xc]
+		ldr     r2, [r11, #-8]
+		add     r3, r2, r3
+		mov     r0, r3
+		bl      strlen
+		mov     r3, r0
+		str     r3, [r11, #-0x14]
+		ldr     r3, [r11, #-0x10]
+		ldr     r2, [r11, #-8]
+		add     r0, r2, r3
+		ldr     r3, [r11, #-0xc]
+		ldr     r2, [r11, #-8]
+		add     r1, r2, r3
+		ldr     r3, [r11, #-0x14]
+		add     r3, r3, #1
+		mov     r2, r3
+		bl      memcpy
+		ldr     r2, [r11, #-0x10]
+		ldr     r1, [r11, #-0x20]
+		ldr     r0, [r11, #-8]
+		bl      memcpy
+		b       find_and_replace_lab_2
+
+	find_and_replace_lab_1: ; 0x1ac3c
+		mov     r0, r0
+
+	find_and_replace_lab_2: ; 0x1ac40
+		sub     sp, r11, #4
+		pop     {r11, lr}
+		bx      lr
+
+	handle_replacements: ; 0x1ac4c
+		push    {r11, lr}
+		add     r11, sp, #4
+		sub     sp, sp, #0x28
+		str     r0, [r11, #-0x28] ; store r0 (our char* we are replacing string stuff on) into stack -0x28
+		bl      get_nasc_environment ; get the nasc environment
+		cmp     r0, #2 ; check if r0 is 2
+		bne     handle_replacements_end ; if it isnt, skip the replacements
+
+		; else, run the replacements
+		ldr     r3, =target1
+		str     r3, [r11, #-0x8] ; store the just loaded target1 into stack -0x8
+		ldr     r3, =target2
+		str     r3, [r11, #-0xc] ; store the just loaded target2 into stack -0xc
+		ldr     r3, =target3
+		str     r3, [r11, #-0x10] ; store the just loaded target3 into stack -0x10
+		ldr     r3, =replacementPretendo 
+		str     r3, [r11, #-0x14] ; store the just loaded replacementPretendo into stack -0x14
+
+		ldr     r2, [r11, #-0x14] ; load replacementPretendo into r2
+		ldr     r1, [r11, #-0x8] ; load target1 into r1
+		ldr     r0, [r11, #-0x28] ; load our char* back into r0
+		bl      find_and_replace
+		ldr     r2, [r11, #-0x14] ; load replacementPretendo into r2
+		ldr     r1, [r11, #-0xc] ; load target2 into r1
+		ldr     r0, [r11, #-0x28] ; load our char* back into r0
+		bl      find_and_replace
+		ldr     r2, [r11, #-0x14] ; load replacementPretendo into r2
+		ldr     r1, [r11, #-0x10] ; load target3 into r1
+		ldr     r0, [r11, #-0x28] ; load our char* back into r0
+		bl      find_and_replace
+
+	handle_replacements_end: ; 0x1acb8
+		mov     r0, r0
+		mov     r0, r3
+		sub     sp, r11, #4
+		pop     {r11, lr}
+		bx      lr
+
+	.include "src/frdu.s"
+
+; strings
+	.pool
+
+	frdu_name:
+		.asciiz "frd:u"
+
+	target1:
+		.asciiz "nintendowifi.net"
+
+	target2:
+		.asciiz "nintendo.net"
+
+	target3:
+		.asciiz "pokemon-gl.com"
+
+	replacementPretendo:
+		.asciiz "pretendo.cc"
+
+.close