Merge pull request #105 from Zondax/dev

Solve conflicts
Zondax · Mar 27, 2024 · 7f820ea · 7f820ea
2 parents 199bcfe + ecce7c8
commit 7f820ea
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 4 deletions.
diff --git a/app/Makefile.version b/app/Makefile.version
@@ -1,3 +1,3 @@
 APPVERSION_M=1
 APPVERSION_N=0
-APPVERSION_P=24
+APPVERSION_P=25
diff --git a/deps/nanos-secure-sdk b/deps/nanos-secure-sdk
diff --git a/deps/nanosplus-secure-sdk b/deps/nanosplus-secure-sdk
diff --git a/deps/nanox-secure-sdk b/deps/nanox-secure-sdk
diff --git a/ledger_app.toml b/ledger_app.toml
@@ -5,3 +5,4 @@ devices = ["nanos", "nanox", "nanos+"]
 
 [tests]
 unit_directory = "./tests/"
+
diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png
+1 −1		Makefile.app_params
+38 −0		fuzzing/CMakeLists.txt
+40 −0		fuzzing/README.md
+19 −0		fuzzing/fuzzer_apdu_parser.c
+8 −0		fuzzing/fuzzer_base58.c
+8 −0		fuzzing/fuzzer_bip32.c
+22 −0		fuzzing/fuzzer_qrcodegen.c
+6 −0		fuzzing/mock/os_task.c
+3 −0		fuzzing/mock/os_task.h
+1 −1		lib_cxng/include/lcx_sha256.h
+2 −2		lib_standard_app/bip32.c
+7 −7		lib_standard_app/io.h
+1 −0		script.ld
+8 −0		src/app_metadata.c
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@ devices = ["nanos", "nanox", "nanos+"]

		[tests]
		unit_directory = "./tests/"