Merge pull request #606 from ivmaykov/fix-imports

[core] clang-format the include order + fix resulting build breaks

core/include/aes_gcm_dev.h

@@ -1,5 +1,9 @@
 #pragma once
 
+#include <squareup/subzero/internal.pb.h>
+#include <stddef.h>
+#include <stdint.h>
+
 /* This header is meant for the dev target, and should only be included in the
  * dev implementation */
 

core/include/aes_gcm_ncipher.h

@@ -1,5 +1,10 @@
 #pragma once
 
+#include <nfastapp.h>
+#include <squareup/subzero/internal.pb.h>
+#include <stddef.h>
+#include <stdint.h>
+
 /* This header is meant for the nCipher target, and should only be included in the
  * codesafe/ncipher implementation */
 

core/include/print.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <stddef.h>
+#include <stdint.h>
+
 void print_uint8(uint8_t value);
 void print_uint16(uint16_t value);
 void print_uint32(uint32_t value);

core/include/qrsignatures.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 
 /**
  * signature verification wrapper for trezor crypto util.

core/include/sign.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <squareup/subzero/internal.pb.h>
+
 Result handle_sign_tx(
     const InternalCommandRequest_SignTxRequest* const request,
     InternalCommandResponse_SignTxResponse *response);

core/src/checks/bip32.c

@@ -1,15 +1,15 @@
-#include <stdio.h>
-#include <string.h>
-
 #include "bip32.h"
-#include "bip39.h"
-#include "curves.h"
 
-#include "config.h"
+#include "bip39.h"
 #include "checks.h"
+#include "config.h"
+#include "curves.h"
 #include "log.h"
 #include "squareup/subzero/internal.pb.h"
 
+#include <stdio.h>
+#include <string.h>
+
 /**
  * Perform BIP32 derivation using a hardcoded mnemonic and verify that we get
  * specific private/public keys back.

core/src/checks/check_sign_tx.c

@@ -1,34 +1,31 @@
 #include "base58.h"
 #include "bip32.h"
 #include "bip39.h"
+#include "checks.h"
+#include "conv.h"
 #include "curves.h"
+#include "ecdsa.h"
+#include "hash.h"
+#include "log.h"
+#include "memzero.h"
+#include "nist256p1.h"
+#include "print.h"
+#include "qrsignatures.h"
+#include "script.h"
+#include "sign.h"
+
 #include <assert.h>
 #include <config.h>
+#include <pb_decode.h>
+#include <pb_encode.h>
 #include <protection.h>
 #include <rpc.h>
-#include <pb_encode.h>
-#include <pb_decode.h>
 #include <squareup/subzero/common.pb.h>
 #include <squareup/subzero/internal.pb.h>
 #include <squareup/subzero/service.pb.h>
 #include <stdio.h>
 #include <string.h>
 
-#include <assert.h>
-
-#include "checks.h"
-#include "conv.h"
-#include "hash.h"
-#include "log.h"
-#include "print.h"
-#include "script.h"
-#include "sign.h"
-#include "ecdsa.h"
-#include "nist256p1.h"
-#include "memzero.h"
-#include "qrsignatures.h"
-
-
 // Return a constructed request for test
 static int construct_request(InternalCommandRequest_SignTxRequest *tx) {
 

core/src/checks/conv_checks.c

@@ -1,10 +1,10 @@
-#include <inttypes.h>
-#include <stdint.h>
-
 #include "checks.h"
 #include "conv.h"
 #include "log.h"
 
+#include <inttypes.h>
+#include <stdint.h>
+
 int verify_conv_btc_to_satoshi(void) {
   uint32_t btc = 0;
   uint64_t satoshi = conv_btc_to_satoshi(btc);

core/src/checks/self_checks.c

@@ -1,9 +1,9 @@
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "checks.h"
 #include "log.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+
 typedef int (*self_check_function)(void);
 
 typedef struct self_check_function_info {

core/src/checks/validate_fees.c

@@ -1,10 +1,10 @@
-#include <stdio.h>
-
 #include "checks.h"
+#include "log.h"
 #include "rpc.h"
 #include "sign.h"
 #include "squareup/subzero/internal.pb.h"
-#include "log.h"
+
+#include <stdio.h>
 
 int verify_validate_fees(void) {
   int r = 0;

core/src/dev/aes_gcm.c

@@ -1,11 +1,12 @@
-#include <stdint.h>
-#include <squareup/subzero/internal.pb.h> // For error codes
-#include "log.h"
-#include "memzero.h"
 #include "aes_gcm_dev.h"
 #include "gcm.h"
+#include "log.h"
+#include "memzero.h"
 #include "rand.h"
 
+#include <squareup/subzero/internal.pb.h> // For error codes
+#include <stdint.h>
+
 #define IV_SIZE_IN_BYTES (12)
 #define TAG_SIZE_IN_BYTES (16)
 

core/src/dev/execute_command_hooks.c

@@ -1,7 +1,7 @@
-#include <squareup/subzero/internal.pb.h>
-
 #include "rpc.h"
 
+#include <squareup/subzero/internal.pb.h>
+
 Result pre_execute_command(const InternalCommandRequest* const in) {
   (void)in;
   return Result_SUCCESS;

core/src/dev/init_wallet.c

@@ -1,21 +1,22 @@
-#include <assert.h>
-#include <pb_decode.h>
-#include <pb_encode.h>
-#include <squareup/subzero/common.pb.h>
-#include <squareup/subzero/internal.pb.h>
-#include <stdio.h>
+#include "init_wallet.h"
 
 #include "bip32.h"
 #include "bip39.h"
 #include "checks.h"
 #include "config.h"
 #include "curves.h"
-#include "init_wallet.h"
 #include "log.h"
 #include "protection.h"
 #include "rand.h"
 #include "rpc.h"
 
+#include <assert.h>
+#include <pb_decode.h>
+#include <pb_encode.h>
+#include <squareup/subzero/common.pb.h>
+#include <squareup/subzero/internal.pb.h>
+#include <stdio.h>
+
 /**
  * Initialize a wallet.
  * in prod:

core/src/dev/no_rollback.c

@@ -1,12 +1,13 @@
+#include "no_rollback.h"
+
+#include "config.h"
+#include "log.h"
+
 #include <assert.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "no_rollback.h"
-#include "config.h"
-#include "log.h"
-
 Result no_rollback_read(const char* filename, char buf[static VERSION_SIZE]) {
   char tmp_file[100];
   snprintf(tmp_file, sizeof(tmp_file), "/tmp/%s", filename);

core/src/dev/protection.c

@@ -1,13 +1,14 @@
-#include <assert.h>
-#include <protection.h>
-#include <squareup/subzero/common.pb.h>
-#include <squareup/subzero/internal.pb.h>
+#include "protection.h"
 
+#include "aes_gcm_dev.h"
 #include "log.h"
 #include "memzero.h"
-#include "aes_gcm_dev.h"
 #include "rand.h"
 
+#include <assert.h>
+#include <squareup/subzero/common.pb.h>
+#include <squareup/subzero/internal.pb.h>
+
 // Protection: developer edition.
 
 // Hardcoded master seed encryption key and public key encryption key

core/src/finalize_wallet.c

@@ -1,14 +1,14 @@
-#include <assert.h>
-#include <bip32.h>
-#include <curves.h>
-#include <squareup/subzero/internal.pb.h>
-
 #include "config.h"
 #include "log.h"
 #include "protection.h"
 #include "rpc.h"
 #include "strlcpy.h"
 
+#include <assert.h>
+#include <bip32.h>
+#include <curves.h>
+#include <squareup/subzero/internal.pb.h>
+
 Result
 handle_finalize_wallet(
     const InternalCommandRequest_FinalizeWalletRequest* const in,

core/src/fuzz.c

@@ -1,15 +1,15 @@
+#include "pb_decode.h"
+#include "pb_encode.h"
+#include "rpc.h"
+
+#include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
-#include <sys/stat.h>
 #include <stdlib.h>
 #include <string.h>
-#include <fcntl.h>
-#include <errno.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
-#include "pb_decode.h"
-#include "pb_encode.h"
-#include "rpc.h"
-
 /* This is useful for debugging the fuzz driver. from nanopb docs. */
 static bool fwrite_callback(pb_ostream_t *stream, const uint8_t *buf, size_t count) {
    FILE *file = (FILE*) stream->state;

core/src/init_wallet.c

@@ -1,4 +1,5 @@
 #include "init_wallet.h"
+
 #include "log.h"
 
 /**

core/src/main.c

@@ -2,27 +2,27 @@
  * nCipher wallet code.
  */
 
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <stdbool.h>
-
-#include "no_rollback.h"
 #include "checks.h"
 #include "config.h"
 #include "hash.h"
 #include "init.h"
 #include "log.h"
 #include "memzero.h"
 #include "nanopb_stream.h"
+#include "no_rollback.h"
 #include "pb_decode.h"
 #include "pb_encode.h"
 #include "print.h"
 #include "rpc.h"
 
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <unistd.h>
+
 int main(int argc, char **argv) {
   int r;
   bool checks_only = false;

core/src/memzero.c

@@ -1,7 +1,7 @@
-#include <stdint.h>
-
 #include "memzero.h"
 
+#include <stdint.h>
+
 /**
  * This function MUST NEVER be included in a file with any other functions.
  * Security relies on the fact that the linker cannot optimize function calls

core/src/nanopb_stream.c

@@ -2,13 +2,13 @@
  * This file is mostly a copy of nanopb/examples/network_server/common.h
  */
 
+#include "nanopb_stream.h"
+
 #include <pb_decode.h>
 #include <pb_encode.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include "nanopb_stream.h"
-
 static bool write_callback(pb_ostream_t *stream, const uint8_t *buf,
                            size_t count) {
   int fd = (intptr_t)stream->state;

core/src/ncipher/additional_checks.c

@@ -1,13 +1,13 @@
-#include <nfastapp.h>
-#include <seelib.h>
-#include <stdint.h>
-#include <squareup/subzero/internal.pb.h> // For error codes
-
 #include "aes_gcm_ncipher.h"
 #include "checks.h"
 #include "log.h"
 #include "transact.h"
 
+#include <nfastapp.h>
+#include <seelib.h>
+#include <squareup/subzero/internal.pb.h> // For error codes
+#include <stdint.h>
+
 extern M_KeyID master_seed_encryption_key;
 extern M_KeyID pub_key_encryption_key;