diff --git a/.circleci/bazel-test b/.circleci/bazel-test index b2d236d99d7..e48c2c69038 100755 --- a/.circleci/bazel-test +++ b/.circleci/bazel-test @@ -5,10 +5,10 @@ set -eux git submodule update --init --recursive /src/workspace/tools/inject-repo c-toxcore cd /src/workspace && bazel test -k \ + --config=ci \ --config=remote \ --build_tag_filters=-haskell \ --test_tag_filters=-haskell \ - --remote_download_minimal \ -- \ //c-toxcore/... \ "$@" diff --git a/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 b/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 index 8ceccafe9a9..2ccc4b842aa 100644 --- a/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 +++ b/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 @@ -1 +1 @@ -61c4cff326cf3a32fa5edad1c899c9eb586e4ebfcb8d11c9cf55d120fc7ab467 /usr/local/bin/tox-bootstrapd +036adfc1e993624ae0bf49f08c2890bb44e6d4224a07a8c7fd2e2b5a8be6bf4c /usr/local/bin/tox-bootstrapd diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index fc28e0c069b..9e9f114657c 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c @@ -2988,6 +2988,7 @@ static State_Load_Status load_nospam_keys(Messenger *m, const uint8_t *data, uin load_secret_key(m->net_crypto, data + sizeof(uint32_t) + CRYPTO_PUBLIC_KEY_SIZE); if (!pk_equal(data + sizeof(uint32_t), nc_get_self_public_key(m->net_crypto))) { + LOGGER_ERROR(m->log, "public key stored in savedata does not match its secret key"); return STATE_LOAD_STATUS_ERROR; } diff --git a/toxcore/group.c b/toxcore/group.c index 0e851b1e348..40e81a11b89 100644 --- a/toxcore/group.c +++ b/toxcore/group.c @@ -802,6 +802,7 @@ static int addpeer(Group_Chats *g_c, uint32_t groupnumber, const uint8_t *real_p if (peer_index != -1) { if (!pk_equal(g->group[peer_index].real_pk, real_pk)) { + LOGGER_ERROR(g_c->m->log, "peer public key is incorrect for peer %d", peer_number); return -1; } @@ -3679,6 +3680,7 @@ static State_Load_Status load_conferences_helper(Group_Chats *g_c, const uint8_t if (groupnumber == -1) { // If this fails there's a serious problem, don't bother with cleanup + LOGGER_ERROR(g_c->m->log, "conference creation failed"); return STATE_LOAD_STATUS_ERROR; } @@ -3696,6 +3698,7 @@ static State_Load_Status load_conferences_helper(Group_Chats *g_c, const uint8_t assert(ret); } + LOGGER_ERROR(g_c->m->log, "conference loading failed"); return STATE_LOAD_STATUS_ERROR; } @@ -3705,6 +3708,7 @@ static State_Load_Status load_conferences_helper(Group_Chats *g_c, const uint8_t nullptr, true, false); if (peer_index == -1) { + LOGGER_ERROR(g_c->m->log, "adding peer %d failed", g->peer_number); return STATE_LOAD_STATUS_ERROR; } diff --git a/toxcore/state.c b/toxcore/state.c index 701cf4426be..e4f769ad251 100644 --- a/toxcore/state.c +++ b/toxcore/state.c @@ -52,7 +52,7 @@ int state_load(const Logger *log, state_load_cb *state_load_callback, void *oute } case STATE_LOAD_STATUS_ERROR: { - LOGGER_ERROR(log, "Error occcured in state file (type: %u).", type); + LOGGER_ERROR(log, "Error occcured in state file (type: 0x%02x).", type); return -1; }