Merge pull request #142 from Zondax/dev

Updates

.github/workflows/guidelines_enforcer.yml

@@ -21,6 +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
-      run_for_devices: '["nanos", "nanosp", "nanox"]'

app/Makefile

@@ -50,7 +50,6 @@ endif
 
 APP_LOAD_PARAMS =  --curve secp256k1 $(COMMON_LOAD_PARAMS) --path $(APPPATH)
 
-NANOS_STACK_SIZE := 1932
 include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.devices
 
 $(info TARGET_NAME  = [$(TARGET_NAME)])

app/Makefile.version

@@ -3,4 +3,4 @@ APPVERSION_M=0
 # This is the minor version of this release
 APPVERSION_N=23
 # This is the patch version of this release
-APPVERSION_P=9
+APPVERSION_P=10

app/src/apdu_handler.c

@@ -341,7 +341,7 @@ handleGetAddrEth(volatile uint32_t *flags, volatile uint32_t *tx, uint32_t rx)
     if (with_code != P2_CHAINCODE && with_code != P2_NO_CHAINCODE)
         THROW(APDU_CODE_INVALIDP1P2);
 
-    chain_code = with_code;
+    fil_chain_code = with_code;
 
     zxerr_t zxerr = app_fill_eth_address();
     if (zxerr != zxerr_ok) {

app/src/common/tx.h

@@ -17,6 +17,7 @@
 
 #include "coin.h"
 #include "zxerror.h"
+#include <stdbool.h>
 
 // transaction initializer for the buffer and transaction type.
 void tx_context_fil();

app/src/crypto.c

@@ -45,11 +45,11 @@ static zxerr_t crypto_extractPublicKey(uint8_t *pubKey, uint16_t pubKeyLen, uint
                                                      privateKeyData,
                                                      chainCode,
                                                      NULL,
-                                                     0))
+                                                     0));
 
-    CATCH_CXERROR(cx_ecfp_init_private_key_no_throw(CX_CURVE_256K1, privateKeyData, 32, &cx_privateKey))
-    CATCH_CXERROR(cx_ecfp_init_public_key_no_throw(CX_CURVE_256K1, NULL, 0, &cx_publicKey))
-    CATCH_CXERROR(cx_ecfp_generate_pair_no_throw(CX_CURVE_256K1, &cx_publicKey, &cx_privateKey, 1))
+    CATCH_CXERROR(cx_ecfp_init_private_key_no_throw(CX_CURVE_256K1, privateKeyData, 32, &cx_privateKey));
+    CATCH_CXERROR(cx_ecfp_init_public_key_no_throw(CX_CURVE_256K1, NULL, 0, &cx_publicKey));
+    CATCH_CXERROR(cx_ecfp_generate_pair_no_throw(CX_CURVE_256K1, &cx_publicKey, &cx_privateKey, 1));
     memcpy(pubKey, cx_publicKey.W, SECP256K1_PK_LEN);
     error = zxerr_ok;
 
@@ -69,7 +69,7 @@ __Z_INLINE zxerr_t keccak_hash(const unsigned char *in, unsigned int inLen,
     // return actual size using value from signatureLength
     cx_sha3_t keccak;
     if (cx_keccak_init_no_throw(&keccak, outLen * 8) != CX_OK) return zxerr_unknown;
-    cx_hash_no_throw((cx_hash_t *)&keccak, CX_LAST, in, inLen, out, outLen);
+    CHECK_CX_OK(cx_hash_no_throw((cx_hash_t *)&keccak, CX_LAST, in, inLen, out, outLen));
 
     return zxerr_ok;
 }
@@ -119,7 +119,7 @@ zxerr_t blake_hash(const uint8_t *in, uint16_t inLen, uint8_t *out, uint16_t out
     }
     cx_blake2b_t ctx;
     if (cx_blake2b_init_no_throw(&ctx, outLen * 8) != CX_OK) return zxerr_unknown;
-    cx_hash_no_throw(&ctx.header, CX_LAST, in, inLen, out, outLen);
+    CHECK_CX_OK(cx_hash_no_throw(&ctx.header, CX_LAST, in, inLen, out, outLen));
 
     return zxerr_ok;
 }
@@ -131,8 +131,8 @@ zxerr_t blake_hash_cid(const unsigned char *in, unsigned int inLen,
 
     cx_blake2b_t ctx;
     if (cx_blake2b_init_no_throw(&ctx, outLen * 8) != CX_OK) return zxerr_unknown;
-    cx_hash_no_throw(&ctx.header, 0, prefix, sizeof(prefix), NULL, 0);
-    cx_hash_no_throw(&ctx.header, CX_LAST, in, inLen, out, outLen);
+    CHECK_CX_OK(cx_hash_no_throw(&ctx.header, 0, prefix, sizeof(prefix), NULL, 0));
+    CHECK_CX_OK(cx_hash_no_throw(&ctx.header, CX_LAST, in, inLen, out, outLen));
 
     return zxerr_ok;
 }
@@ -170,16 +170,16 @@ zxerr_t _sign(uint8_t *output, uint16_t outputLen, const uint8_t *message, uint1
                                                      privateKeyData,
                                                      NULL,
                                                      NULL,
-                                                     0))
+                                                     0));
 
-    CATCH_CXERROR(cx_ecfp_init_private_key_no_throw(CX_CURVE_256K1, privateKeyData, 32, &cx_privateKey))
+    CATCH_CXERROR(cx_ecfp_init_private_key_no_throw(CX_CURVE_256K1, privateKeyData, 32, &cx_privateKey));
     CATCH_CXERROR(cx_ecdsa_sign_no_throw(&cx_privateKey,
                                          CX_RND_RFC6979 | CX_LAST,
                                          CX_SHA256,
                                          message,
                                          messageLen,
                                          signature->der_signature,
-                                         &signatureLength, &tmpInfo))
+                                         &signatureLength, &tmpInfo));
 
     const err_convert_e err_c = convertDERtoRSV(signature->der_signature, tmpInfo,  signature->r, signature->s, &signature->v);
     if (err_c == no_error) {
@@ -316,7 +316,7 @@ zxerr_t crypto_fillEthAddress(uint8_t *buffer, uint16_t buffer_len, uint16_t *ad
     MEMZERO(buffer, buffer_len);
     answer_eth_t *const answer = (answer_eth_t *) buffer;
 
-    CHECK_ZXERR(crypto_extractPublicKey(&answer->publicKey[1], sizeof_field(answer_eth_t, publicKey) - 1, &chain_code))
+    CHECK_ZXERR(crypto_extractPublicKey(&answer->publicKey[1], sizeof_field(answer_eth_t, publicKey) - 1, &fil_chain_code))
 
     answer->publicKey[0] = SECP256K1_PK_LEN;
 

app/src/crypto_helper.c

@@ -20,7 +20,7 @@
 
 uint32_t hdPath[MAX_BIP32_PATH];
 uint32_t hdPath_len;
-uint8_t chain_code;
+uint8_t fil_chain_code;
 
 bool isTestnet() {
     return hdPath[0] == HDPATH_0_TESTNET &&

app/src/crypto_helper.h

@@ -25,7 +25,7 @@ extern "C" {
 
 extern uint32_t hdPath[MAX_BIP32_PATH];
 extern uint32_t hdPath_len;
-extern uint8_t chain_code;
+extern uint8_t fil_chain_code;
 
 #define ADDRESS_PROTOCOL_LEN        1
 

app/src/crypto_test.c

@@ -13,14 +13,16 @@
 *  See the License for the specific language governing permissions and
 *  limitations under the License.
 ********************************************************************************/
+// Implementation from methods that are needed for cpp_test
+#if !defined(LEDGER_SPECIFIC)
+
 #include <hexutils.h>
 #include "zxerror.h"
 #include "coin.h"
 #include "crypto_helper.h"
 
-// Implementation from methods that are needed for cpp_test
-#if !defined (TARGET_NANOS) && !defined(TARGET_NANOS2) && !defined(TARGET_NANOX) && !defined(TARGET_STAX)
 #include "blake2.h"
+#include "zxmacros.h"
 
 char *crypto_testPubKey;
 

ledger_app.toml

@@ -0,0 +1,7 @@
+[app]
+build_directory = "./app/"
+sdk = "C"
+devices = ["nanos", "nanox", "nanos+"]
+
+[tests]
+unit_directory = "./tests/"