Merge pull request #29 from Zondax/dev

Remove duplicated base64 encode
Zondax · Dec 1, 2023 · ff06e7b · ff06e7b
2 parents c12bdab + cdeb034
commit ff06e7b
Show file tree

Hide file tree

Showing 25 changed files with 35 additions and 483 deletions.
diff --git a/.github/workflows/guidelines_enforcer.yml b/.github/workflows/guidelines_enforcer.yml
@@ -21,5 +21,3 @@ jobs:
   guidelines_enforcer:
     name: Call Ledger guidelines_enforcer
     uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_guidelines_enforcer.yml@v1
-    with:
-      relative_app_directory: 'app'
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -105,6 +105,7 @@ add_definitions(
 #  static libs
 file(GLOB_RECURSE LIB_SRC
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/app_mode.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/base64.c
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/base58.c
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/bignum.c
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/hexutils.c
@@ -115,7 +116,6 @@ file(GLOB_RECURSE LIB_SRC
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser_impl.c
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser_encoding.c
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src/algo_asa.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/app/src/base64.c
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/sha512/sha512.c
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src/base32.c
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/picohash/

diff --git a/app/Makefile.version b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=2
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=1
 # This is the patch version of this release
-APPVERSION_P=10
+APPVERSION_P=11
diff --git a/app/script_s2.ld b/app/script_s2.ld
diff --git a/app/script_x.ld b/app/script_x.ld