making crypto code a private lib

RogueMaster · Mar 12, 2023 · 47890a1 · 47890a1
1 parent ad40ecc
commit 47890a1
Show file tree

Hide file tree

Showing 145 changed files with 24 additions and 21 deletions.
diff --git a/application.fam b/application.fam
@@ -11,6 +11,11 @@ App(
     order=10,
     fap_icon="flipbip_10px.png",
     fap_icon_assets="icons",
+    fap_private_libs=[
+        Lib(
+            name="crypto",
+        ),
+    ],
     fap_category="Misc",
     fap_description="Crypto toolkit for Flipper",
     fap_author="Struan Clark (xtruan)",

diff --git a/flipbip.c b/flipbip.c
@@ -1,8 +1,9 @@
 #include "flipbip.h"
-#include "crypto/memzero.h"
-#include "crypto/bip39.h"
 #include "helpers/flipbip_file.h"
 #include "helpers/flipbip_haptic.h"
+// From: lib/crypto
+#include <memzero.h>
+#include <bip39.h>
 
 bool flipbip_custom_event_callback(void* context, uint32_t event) {
     furi_assert(context);

diff --git a/helpers/flipbip_file.c b/helpers/flipbip_file.c
@@ -1,10 +1,9 @@
 #include "flipbip_file.h"
-#include "../helpers/flipbip_string.h"
-
-#include "../crypto/memzero.h"
-#include "../crypto/rand.h"
-
 #include <storage/storage.h>
+#include "../helpers/flipbip_string.h"
+// From: lib/crypto
+#include <memzero.h>
+#include <rand.h>
 
 #define FLIPBIP_APP_BASE_FOLDER EXT_PATH("apps_data/flipbip")
 #define FLIPBIP_DAT_FILE_NAME ".flipbip.dat"

diff --git a/helpers/flipbip_led.h b/helpers/flipbip_led.h
@@ -1,5 +1,2 @@
-
-
 void flipbip_led_set_rgb(void* context, int red, int green, int blue);
-
 void flipbip_led_reset(void* context);
diff --git a/helpers/flipbip_string.c b/helpers/flipbip_string.c
@@ -30,9 +30,9 @@
 #include <ctype.h>
 #include <stdint.h>
 #include <string.h>
-
-#include "../crypto/memzero.h"
-#include "../crypto/rc4.h"
+// From: lib/crypto
+#include <memzero.h>
+#include <rc4.h>
 
 char* flipbip_strtok(char* s, const char* delim) {
     static char* last;

diff --git a/crypto/AUTHORS → lib/crypto/AUTHORS b/crypto/AUTHORS → lib/crypto/AUTHORS
diff --git a/crypto/CONTRIBUTORS → lib/crypto/CONTRIBUTORS b/crypto/CONTRIBUTORS → lib/crypto/CONTRIBUTORS
diff --git a/crypto/LICENSE → lib/crypto/LICENSE b/crypto/LICENSE → lib/crypto/LICENSE
diff --git a/crypto/Makefile → lib/crypto/Makefile b/crypto/Makefile → lib/crypto/Makefile
diff --git a/crypto/README.md → lib/crypto/README.md b/crypto/README.md → lib/crypto/README.md
diff --git a/crypto/address.c → lib/crypto/address.c b/crypto/address.c → lib/crypto/address.c
diff --git a/crypto/address.h → lib/crypto/address.h b/crypto/address.h → lib/crypto/address.h
diff --git a/crypto/aes/aes.h → lib/crypto/aes/aes.h b/crypto/aes/aes.h → lib/crypto/aes/aes.h
diff --git a/crypto/aes/aes_modes.c → lib/crypto/aes/aes_modes.c b/crypto/aes/aes_modes.c → lib/crypto/aes/aes_modes.c
diff --git a/crypto/aes/aescrypt.c → lib/crypto/aes/aescrypt.c b/crypto/aes/aescrypt.c → lib/crypto/aes/aescrypt.c
diff --git a/crypto/aes/aeskey.c → lib/crypto/aes/aeskey.c b/crypto/aes/aeskey.c → lib/crypto/aes/aeskey.c
diff --git a/crypto/aes/aesopt.h → lib/crypto/aes/aesopt.h b/crypto/aes/aesopt.h → lib/crypto/aes/aesopt.h
diff --git a/crypto/aes/aestab.c → lib/crypto/aes/aestab.c b/crypto/aes/aestab.c → lib/crypto/aes/aestab.c
diff --git a/crypto/aes/aestab.h → lib/crypto/aes/aestab.h b/crypto/aes/aestab.h → lib/crypto/aes/aestab.h
diff --git a/crypto/aes/aestst.c → lib/crypto/aes/aestst.c b/crypto/aes/aestst.c → lib/crypto/aes/aestst.c
diff --git a/crypto/aes/aestst.h → lib/crypto/aes/aestst.h b/crypto/aes/aestst.h → lib/crypto/aes/aestst.h
diff --git a/crypto/base32.c → lib/crypto/base32.c b/crypto/base32.c → lib/crypto/base32.c
diff --git a/crypto/base32.h → lib/crypto/base32.h b/crypto/base32.h → lib/crypto/base32.h
diff --git a/crypto/base58.c → lib/crypto/base58.c b/crypto/base58.c → lib/crypto/base58.c
diff --git a/crypto/base58.h → lib/crypto/base58.h b/crypto/base58.h → lib/crypto/base58.h
diff --git a/crypto/bignum.c → lib/crypto/bignum.c b/crypto/bignum.c → lib/crypto/bignum.c
diff --git a/crypto/bignum.h → lib/crypto/bignum.h b/crypto/bignum.h → lib/crypto/bignum.h
diff --git a/crypto/bip32.c → lib/crypto/bip32.c b/crypto/bip32.c → lib/crypto/bip32.c
diff --git a/crypto/bip32.h → lib/crypto/bip32.h b/crypto/bip32.h → lib/crypto/bip32.h
diff --git a/crypto/bip39.c → lib/crypto/bip39.c b/crypto/bip39.c → lib/crypto/bip39.c
diff --git a/crypto/bip39.h → lib/crypto/bip39.h b/crypto/bip39.h → lib/crypto/bip39.h
diff --git a/crypto/bip39_english.c → lib/crypto/bip39_english.c b/crypto/bip39_english.c → lib/crypto/bip39_english.c
diff --git a/crypto/blake256.c → lib/crypto/blake256.c b/crypto/blake256.c → lib/crypto/blake256.c
diff --git a/crypto/blake256.h → lib/crypto/blake256.h b/crypto/blake256.h → lib/crypto/blake256.h
diff --git a/crypto/blake2_common.h → lib/crypto/blake2_common.h b/crypto/blake2_common.h → lib/crypto/blake2_common.h
diff --git a/crypto/blake2b.c → lib/crypto/blake2b.c b/crypto/blake2b.c → lib/crypto/blake2b.c
diff --git a/crypto/blake2b.h → lib/crypto/blake2b.h b/crypto/blake2b.h → lib/crypto/blake2b.h
diff --git a/crypto/blake2s.c → lib/crypto/blake2s.c b/crypto/blake2s.c → lib/crypto/blake2s.c
diff --git a/crypto/blake2s.h → lib/crypto/blake2s.h b/crypto/blake2s.h → lib/crypto/blake2s.h
diff --git a/crypto/byte_order.h → lib/crypto/byte_order.h b/crypto/byte_order.h → lib/crypto/byte_order.h
diff --git a/crypto/cardano.c → lib/crypto/cardano.c b/crypto/cardano.c → lib/crypto/cardano.c
diff --git a/crypto/cardano.h → lib/crypto/cardano.h b/crypto/cardano.h → lib/crypto/cardano.h
diff --git a/crypto/cash_addr.c → lib/crypto/cash_addr.c b/crypto/cash_addr.c → lib/crypto/cash_addr.c
diff --git a/crypto/cash_addr.h → lib/crypto/cash_addr.h b/crypto/cash_addr.h → lib/crypto/cash_addr.h
diff --git a/crypto/chacha20poly1305/LICENSE → lib/crypto/chacha20poly1305/LICENSE b/crypto/chacha20poly1305/LICENSE → lib/crypto/chacha20poly1305/LICENSE
diff --git a/crypto/chacha20poly1305/chacha20poly1305.c → ...rypto/chacha20poly1305/chacha20poly1305.c b/crypto/chacha20poly1305/chacha20poly1305.c → ...rypto/chacha20poly1305/chacha20poly1305.c
diff --git a/crypto/chacha20poly1305/chacha20poly1305.h → ...rypto/chacha20poly1305/chacha20poly1305.h b/crypto/chacha20poly1305/chacha20poly1305.h → ...rypto/chacha20poly1305/chacha20poly1305.h
diff --git a/crypto/chacha20poly1305/chacha_merged.c → lib/crypto/chacha20poly1305/chacha_merged.c b/crypto/chacha20poly1305/chacha_merged.c → lib/crypto/chacha20poly1305/chacha_merged.c
diff --git a/crypto/chacha20poly1305/ecrypt_config.h → lib/crypto/chacha20poly1305/ecrypt_config.h b/crypto/chacha20poly1305/ecrypt_config.h → lib/crypto/chacha20poly1305/ecrypt_config.h
diff --git a/crypto/chacha20poly1305/ecrypt_machine.h → lib/crypto/chacha20poly1305/ecrypt_machine.h b/crypto/chacha20poly1305/ecrypt_machine.h → lib/crypto/chacha20poly1305/ecrypt_machine.h
diff --git a/crypto/chacha20poly1305/ecrypt_portable.h → ...crypto/chacha20poly1305/ecrypt_portable.h b/crypto/chacha20poly1305/ecrypt_portable.h → ...crypto/chacha20poly1305/ecrypt_portable.h
diff --git a/crypto/chacha20poly1305/ecrypt_sync.h → lib/crypto/chacha20poly1305/ecrypt_sync.h b/crypto/chacha20poly1305/ecrypt_sync.h → lib/crypto/chacha20poly1305/ecrypt_sync.h
diff --git a/crypto/chacha20poly1305/ecrypt_types.h → lib/crypto/chacha20poly1305/ecrypt_types.h b/crypto/chacha20poly1305/ecrypt_types.h → lib/crypto/chacha20poly1305/ecrypt_types.h
diff --git a/crypto/chacha20poly1305/poly1305_donna.c → lib/crypto/chacha20poly1305/poly1305_donna.c b/crypto/chacha20poly1305/poly1305_donna.c → lib/crypto/chacha20poly1305/poly1305_donna.c
diff --git a/crypto/chacha20poly1305/poly1305_donna.h → lib/crypto/chacha20poly1305/poly1305_donna.h b/crypto/chacha20poly1305/poly1305_donna.h → lib/crypto/chacha20poly1305/poly1305_donna.h
diff --git a/crypto/chacha20poly1305/poly1305_donna_32.h → ...ypto/chacha20poly1305/poly1305_donna_32.h b/crypto/chacha20poly1305/poly1305_donna_32.h → ...ypto/chacha20poly1305/poly1305_donna_32.h
diff --git a/crypto/chacha20poly1305/rfc7539.c → lib/crypto/chacha20poly1305/rfc7539.c b/crypto/chacha20poly1305/rfc7539.c → lib/crypto/chacha20poly1305/rfc7539.c
diff --git a/crypto/chacha20poly1305/rfc7539.h → lib/crypto/chacha20poly1305/rfc7539.h b/crypto/chacha20poly1305/rfc7539.h → lib/crypto/chacha20poly1305/rfc7539.h
diff --git a/crypto/chacha_drbg.c → lib/crypto/chacha_drbg.c b/crypto/chacha_drbg.c → lib/crypto/chacha_drbg.c
diff --git a/crypto/chacha_drbg.h → lib/crypto/chacha_drbg.h b/crypto/chacha_drbg.h → lib/crypto/chacha_drbg.h
diff --git a/crypto/check_mem.h → lib/crypto/check_mem.h b/crypto/check_mem.h → lib/crypto/check_mem.h
diff --git a/crypto/curves.c → lib/crypto/curves.c b/crypto/curves.c → lib/crypto/curves.c
diff --git a/crypto/curves.h → lib/crypto/curves.h b/crypto/curves.h → lib/crypto/curves.h
diff --git a/crypto/ecdsa.c → lib/crypto/ecdsa.c b/crypto/ecdsa.c → lib/crypto/ecdsa.c
diff --git a/crypto/ecdsa.h → lib/crypto/ecdsa.h b/crypto/ecdsa.h → lib/crypto/ecdsa.h
diff --git a/crypto/ed25519_donna/README.md → lib/crypto/ed25519_donna/README.md b/crypto/ed25519_donna/README.md → lib/crypto/ed25519_donna/README.md
diff --git a/...to/ed25519_donna/curve25519_donna_32bit.c → ...to/ed25519_donna/curve25519_donna_32bit.c b/...to/ed25519_donna/curve25519_donna_32bit.c → ...to/ed25519_donna/curve25519_donna_32bit.c
diff --git a/...to/ed25519_donna/curve25519_donna_32bit.h → ...to/ed25519_donna/curve25519_donna_32bit.h b/...to/ed25519_donna/curve25519_donna_32bit.h → ...to/ed25519_donna/curve25519_donna_32bit.h
diff --git a/.../ed25519_donna/curve25519_donna_helpers.c → .../ed25519_donna/curve25519_donna_helpers.c b/.../ed25519_donna/curve25519_donna_helpers.c → .../ed25519_donna/curve25519_donna_helpers.c
diff --git a/.../ed25519_donna/curve25519_donna_helpers.h → .../ed25519_donna/curve25519_donna_helpers.h b/.../ed25519_donna/curve25519_donna_helpers.h → .../ed25519_donna/curve25519_donna_helpers.h
diff --git a/..._donna/curve25519_donna_scalarmult_base.c → ..._donna/curve25519_donna_scalarmult_base.c b/..._donna/curve25519_donna_scalarmult_base.c → ..._donna/curve25519_donna_scalarmult_base.c
diff --git a/..._donna/curve25519_donna_scalarmult_base.h → ..._donna/curve25519_donna_scalarmult_base.h b/..._donna/curve25519_donna_scalarmult_base.h → ..._donna/curve25519_donna_scalarmult_base.h
diff --git a/crypto/ed25519_donna/ed25519.c → lib/crypto/ed25519_donna/ed25519.c b/crypto/ed25519_donna/ed25519.c → lib/crypto/ed25519_donna/ed25519.c
diff --git a/crypto/ed25519_donna/ed25519.h → lib/crypto/ed25519_donna/ed25519.h b/crypto/ed25519_donna/ed25519.h → lib/crypto/ed25519_donna/ed25519.h
diff --git a/crypto/ed25519_donna/ed25519_donna.h → lib/crypto/ed25519_donna/ed25519_donna.h b/crypto/ed25519_donna/ed25519_donna.h → lib/crypto/ed25519_donna/ed25519_donna.h
diff --git a/...d25519_donna/ed25519_donna_32bit_tables.c → ...d25519_donna/ed25519_donna_32bit_tables.c b/...d25519_donna/ed25519_donna_32bit_tables.c → ...d25519_donna/ed25519_donna_32bit_tables.c
diff --git a/...d25519_donna/ed25519_donna_32bit_tables.h → ...d25519_donna/ed25519_donna_32bit_tables.h b/...d25519_donna/ed25519_donna_32bit_tables.h → ...d25519_donna/ed25519_donna_32bit_tables.h
diff --git a/...519_donna/ed25519_donna_basepoint_table.c → ...519_donna/ed25519_donna_basepoint_table.c b/...519_donna/ed25519_donna_basepoint_table.c → ...519_donna/ed25519_donna_basepoint_table.c
diff --git a/...519_donna/ed25519_donna_basepoint_table.h → ...519_donna/ed25519_donna_basepoint_table.h b/...519_donna/ed25519_donna_basepoint_table.h → ...519_donna/ed25519_donna_basepoint_table.h
diff --git a/...o/ed25519_donna/ed25519_donna_impl_base.c → ...o/ed25519_donna/ed25519_donna_impl_base.c b/...o/ed25519_donna/ed25519_donna_impl_base.c → ...o/ed25519_donna/ed25519_donna_impl_base.c
diff --git a/...o/ed25519_donna/ed25519_donna_impl_base.h → ...o/ed25519_donna/ed25519_donna_impl_base.h b/...o/ed25519_donna/ed25519_donna_impl_base.h → ...o/ed25519_donna/ed25519_donna_impl_base.h
diff --git a/...to/ed25519_donna/ed25519_donna_portable.h → ...to/ed25519_donna/ed25519_donna_portable.h b/...to/ed25519_donna/ed25519_donna_portable.h → ...to/ed25519_donna/ed25519_donna_portable.h
diff --git a/crypto/ed25519_donna/ed25519_hash_custom.h → ...rypto/ed25519_donna/ed25519_hash_custom.h b/crypto/ed25519_donna/ed25519_hash_custom.h → ...rypto/ed25519_donna/ed25519_hash_custom.h
diff --git a/...d25519_donna/ed25519_hash_custom_keccak.h → ...d25519_donna/ed25519_hash_custom_keccak.h b/...d25519_donna/ed25519_hash_custom_keccak.h → ...d25519_donna/ed25519_hash_custom_keccak.h
diff --git a/.../ed25519_donna/ed25519_hash_custom_sha3.h → .../ed25519_donna/ed25519_hash_custom_sha3.h b/.../ed25519_donna/ed25519_hash_custom_sha3.h → .../ed25519_donna/ed25519_hash_custom_sha3.h
diff --git a/crypto/ed25519_donna/ed25519_keccak.c → lib/crypto/ed25519_donna/ed25519_keccak.c b/crypto/ed25519_donna/ed25519_keccak.c → lib/crypto/ed25519_donna/ed25519_keccak.c
diff --git a/crypto/ed25519_donna/ed25519_keccak.h → lib/crypto/ed25519_donna/ed25519_keccak.h b/crypto/ed25519_donna/ed25519_keccak.h → lib/crypto/ed25519_donna/ed25519_keccak.h
diff --git a/crypto/ed25519_donna/ed25519_sha3.c → lib/crypto/ed25519_donna/ed25519_sha3.c b/crypto/ed25519_donna/ed25519_sha3.c → lib/crypto/ed25519_donna/ed25519_sha3.c
diff --git a/crypto/ed25519_donna/ed25519_sha3.h → lib/crypto/ed25519_donna/ed25519_sha3.h b/crypto/ed25519_donna/ed25519_sha3.h → lib/crypto/ed25519_donna/ed25519_sha3.h
diff --git a/crypto/ed25519_donna/modm_donna_32bit.c → lib/crypto/ed25519_donna/modm_donna_32bit.c b/crypto/ed25519_donna/modm_donna_32bit.c → lib/crypto/ed25519_donna/modm_donna_32bit.c
diff --git a/crypto/ed25519_donna/modm_donna_32bit.h → lib/crypto/ed25519_donna/modm_donna_32bit.h b/crypto/ed25519_donna/modm_donna_32bit.h → lib/crypto/ed25519_donna/modm_donna_32bit.h
diff --git a/crypto/groestl.c → lib/crypto/groestl.c b/crypto/groestl.c → lib/crypto/groestl.c
diff --git a/crypto/groestl.h → lib/crypto/groestl.h b/crypto/groestl.h → lib/crypto/groestl.h
diff --git a/crypto/groestl_internal.h → lib/crypto/groestl_internal.h b/crypto/groestl_internal.h → lib/crypto/groestl_internal.h
diff --git a/crypto/hasher.c → lib/crypto/hasher.c b/crypto/hasher.c → lib/crypto/hasher.c
diff --git a/crypto/hasher.h → lib/crypto/hasher.h b/crypto/hasher.h → lib/crypto/hasher.h
diff --git a/crypto/hmac.c → lib/crypto/hmac.c b/crypto/hmac.c → lib/crypto/hmac.c
diff --git a/crypto/hmac.h → lib/crypto/hmac.h b/crypto/hmac.h → lib/crypto/hmac.h
diff --git a/crypto/hmac_drbg.c → lib/crypto/hmac_drbg.c b/crypto/hmac_drbg.c → lib/crypto/hmac_drbg.c
diff --git a/crypto/hmac_drbg.h → lib/crypto/hmac_drbg.h b/crypto/hmac_drbg.h → lib/crypto/hmac_drbg.h
diff --git a/crypto/memzero.c → lib/crypto/memzero.c b/crypto/memzero.c → lib/crypto/memzero.c
diff --git a/crypto/memzero.h → lib/crypto/memzero.h b/crypto/memzero.h → lib/crypto/memzero.h
diff --git a/crypto/monero/base58.c → lib/crypto/monero/base58.c b/crypto/monero/base58.c → lib/crypto/monero/base58.c
diff --git a/crypto/monero/base58.h → lib/crypto/monero/base58.h b/crypto/monero/base58.h → lib/crypto/monero/base58.h
diff --git a/crypto/monero/int_util.h → lib/crypto/monero/int_util.h b/crypto/monero/int_util.h → lib/crypto/monero/int_util.h
diff --git a/crypto/monero/monero.h → lib/crypto/monero/monero.h b/crypto/monero/monero.h → lib/crypto/monero/monero.h
diff --git a/crypto/monero/serialize.c → lib/crypto/monero/serialize.c b/crypto/monero/serialize.c → lib/crypto/monero/serialize.c
diff --git a/crypto/monero/serialize.h → lib/crypto/monero/serialize.h b/crypto/monero/serialize.h → lib/crypto/monero/serialize.h
diff --git a/crypto/monero/xmr.c → lib/crypto/monero/xmr.c b/crypto/monero/xmr.c → lib/crypto/monero/xmr.c
diff --git a/crypto/monero/xmr.h → lib/crypto/monero/xmr.h b/crypto/monero/xmr.h → lib/crypto/monero/xmr.h
diff --git a/crypto/nem.c → lib/crypto/nem.c b/crypto/nem.c → lib/crypto/nem.c
diff --git a/crypto/nem.h → lib/crypto/nem.h b/crypto/nem.h → lib/crypto/nem.h
diff --git a/crypto/nist256p1.c → lib/crypto/nist256p1.c b/crypto/nist256p1.c → lib/crypto/nist256p1.c
diff --git a/crypto/nist256p1.h → lib/crypto/nist256p1.h b/crypto/nist256p1.h → lib/crypto/nist256p1.h
diff --git a/crypto/nist256p1.table → lib/crypto/nist256p1.table b/crypto/nist256p1.table → lib/crypto/nist256p1.table
diff --git a/crypto/options.h → lib/crypto/options.h b/crypto/options.h → lib/crypto/options.h
diff --git a/crypto/pbkdf2.c → lib/crypto/pbkdf2.c b/crypto/pbkdf2.c → lib/crypto/pbkdf2.c
diff --git a/crypto/pbkdf2.h → lib/crypto/pbkdf2.h b/crypto/pbkdf2.h → lib/crypto/pbkdf2.h
diff --git a/crypto/rand.c → lib/crypto/rand.c b/crypto/rand.c → lib/crypto/rand.c
diff --git a/crypto/rand.h → lib/crypto/rand.h b/crypto/rand.h → lib/crypto/rand.h
diff --git a/crypto/rc4.c → lib/crypto/rc4.c b/crypto/rc4.c → lib/crypto/rc4.c
diff --git a/crypto/rc4.h → lib/crypto/rc4.h b/crypto/rc4.h → lib/crypto/rc4.h
diff --git a/crypto/rfc6979.c → lib/crypto/rfc6979.c b/crypto/rfc6979.c → lib/crypto/rfc6979.c
diff --git a/crypto/rfc6979.h → lib/crypto/rfc6979.h b/crypto/rfc6979.h → lib/crypto/rfc6979.h
diff --git a/crypto/ripemd160.c → lib/crypto/ripemd160.c b/crypto/ripemd160.c → lib/crypto/ripemd160.c
diff --git a/crypto/ripemd160.h → lib/crypto/ripemd160.h b/crypto/ripemd160.h → lib/crypto/ripemd160.h
diff --git a/crypto/script.c → lib/crypto/script.c b/crypto/script.c → lib/crypto/script.c
diff --git a/crypto/script.h → lib/crypto/script.h b/crypto/script.h → lib/crypto/script.h
diff --git a/crypto/secp256k1.c → lib/crypto/secp256k1.c b/crypto/secp256k1.c → lib/crypto/secp256k1.c
diff --git a/crypto/secp256k1.h → lib/crypto/secp256k1.h b/crypto/secp256k1.h → lib/crypto/secp256k1.h
diff --git a/crypto/secp256k1.table → lib/crypto/secp256k1.table b/crypto/secp256k1.table → lib/crypto/secp256k1.table
diff --git a/crypto/segwit_addr.c → lib/crypto/segwit_addr.c b/crypto/segwit_addr.c → lib/crypto/segwit_addr.c
diff --git a/crypto/segwit_addr.h → lib/crypto/segwit_addr.h b/crypto/segwit_addr.h → lib/crypto/segwit_addr.h
diff --git a/crypto/setup.py → lib/crypto/setup.py b/crypto/setup.py → lib/crypto/setup.py
diff --git a/crypto/sha2.c → lib/crypto/sha2.c b/crypto/sha2.c → lib/crypto/sha2.c
diff --git a/crypto/sha2.h → lib/crypto/sha2.h b/crypto/sha2.h → lib/crypto/sha2.h
diff --git a/crypto/sha3.c → lib/crypto/sha3.c b/crypto/sha3.c → lib/crypto/sha3.c
diff --git a/crypto/sha3.h → lib/crypto/sha3.h b/crypto/sha3.h → lib/crypto/sha3.h
diff --git a/crypto/shamir.c → lib/crypto/shamir.c b/crypto/shamir.c → lib/crypto/shamir.c
diff --git a/crypto/shamir.h → lib/crypto/shamir.h b/crypto/shamir.h → lib/crypto/shamir.h
diff --git a/crypto/slip39.c → lib/crypto/slip39.c b/crypto/slip39.c → lib/crypto/slip39.c
diff --git a/crypto/slip39.h → lib/crypto/slip39.h b/crypto/slip39.h → lib/crypto/slip39.h
diff --git a/crypto/slip39_wordlist.h → lib/crypto/slip39_wordlist.h b/crypto/slip39_wordlist.h → lib/crypto/slip39_wordlist.h
diff --git a/scenes/flipbip_scene_settings.c b/scenes/flipbip_scene_settings.c
@@ -1,6 +1,7 @@
 #include "../flipbip.h"
-#include "../crypto/memzero.h"
 #include <lib/toolbox/value_index.h>
+// From: lib/crypto
+#include <memzero.h>
 
 const char* const haptic_text[2] = {
     "OFF",

diff --git a/views/flipbip_scene_1.c b/views/flipbip_scene_1.c
@@ -5,18 +5,18 @@
 #include <gui/elements.h>
 //#include <dolphin/dolphin.h>
 #include <storage/storage.h>
+#include <string.h>
 #include "FlipBIP_icons.h"
 #include "../helpers/flipbip_haptic.h"
 #include "../helpers/flipbip_led.h"
 #include "../helpers/flipbip_string.h"
 #include "../helpers/flipbip_file.h"
-
-#include <string.h>
-#include "../crypto/rand.h"
-#include "../crypto/bip32.h"
-#include "../crypto/bip39.h"
-#include "../crypto/curves.h"
-#include "../crypto/memzero.h"
+// From: /lib/crypto
+#include <memzero.h>
+#include <rand.h>
+#include <curves.h>
+#include <bip32.h>
+#include <bip39.h>
 
 #define DERIV_PURPOSE 44
 #define DERIV_ACCOUNT 0
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,2 @@


		void flipbip_led_set_rgb(void* context, int red, int green, int blue);

		void flipbip_led_reset(void* context);