Various fixes in node, add tests for p256 signature (#1716)

Author: SpyCheese

crypto/Ed25519.cpp

@@ -237,7 +237,7 @@ Result<SecureString> Ed25519::compute_shared_secret(const PublicKey &public_key,
   BigNum::mod_sub(y2, p, y2, p, context);
 
   BigNum inverse_y_plus_1;
-  BigNum::mod_inverse(inverse_y_plus_1, y2, p, context);
+  TRY_STATUS(BigNum::mod_inverse(inverse_y_plus_1, y2, p, context));
 
   BigNum u;
   BigNum::mod_mul(u, y, inverse_y_plus_1, p, context);

crypto/ellcurve/p256.cpp

@@ -58,7 +58,7 @@ td::Status p256_check_signature(td::Slice data, td::Slice public_key, td::Slice
   SCOPE_EXIT {
     EVP_MD_CTX_free(md_ctx);
   };
-  if (EVP_DigestVerifyInit(md_ctx, nullptr, nullptr, nullptr, pkey) <= 0) {
+  if (EVP_DigestVerifyInit(md_ctx, nullptr, EVP_sha256(), nullptr, pkey) <= 0) {
     return td::Status::Error("Can't init DigestVerify");
   }
   ECDSA_SIG* sig = ECDSA_SIG_new();
@@ -71,7 +71,10 @@ td::Status p256_check_signature(td::Slice data, td::Slice public_key, td::Slice
   BIGNUM* r = BN_bin2bn(buf, 33, nullptr);
   std::copy(signature.ubegin() + 32, signature.ubegin() + 64, buf + 1);
   BIGNUM* s = BN_bin2bn(buf, 33, nullptr);
+  CHECK(r != nullptr && s != nullptr);
   if (ECDSA_SIG_set0(sig, r, s) != 1) {
+    BN_free(r);
+    BN_free(s);
     return td::Status::Error("Invalid signature");
   }
   unsigned char* signature_encoded = nullptr;

crypto/test/fift.cpp

@@ -175,3 +175,7 @@ TEST(Fift, test_secp256k1) {
 TEST(Fift, test_get_extra_balance) {
   run_fift("get_extra_balance.fif");
 }
+
+TEST(Fift, test_p256) {
+  run_fift("p256.fif");
+}

crypto/test/fift/p256.fif

@@ -0,0 +1,25 @@
+"Asm.fif" include
+"FiftExt.fif" include
+
+// Test vectors from https://datatracker.ietf.org/doc/html/rfc6979#appendix-A.2.5
+
+x{73616d706c65} // "sample"
+x{EFD48B2AACB6A8FD1140DD9CD45E81D69D2C877B56AAF991C34D0EA84EAF3716F7CB1C942D657C41D436C7A1B6E29F65F3E900DBB9AFF4064DC4AB2F843ACDA8}
+x{0360FED4BA255A9D31C961EB74C6356D68C049B8923B61FA6CE669622E60F29FB6}
+
+<{ P256_CHKSIGNS }>s 64 runvmx .s // -1 0
+drop drop
+
+x{74657374} // "test"
+x{F1ABB023518351CD71D881567B1EA663ED3EFCF6C5132B354F28D3B0B7D38367019F4113742A2B14BD25926B49C649155F267E60D3814B4C0CC84250E46F0083}
+x{0360FED4BA255A9D31C961EB74C6356D68C049B8923B61FA6CE669622E60F29FB6}
+
+<{ P256_CHKSIGNS }>s 64 runvmx .s // -1 0
+drop drop
+
+x{74657374} // "test"
+x{83910E8B48BB0C74244EBDF7F07A1C5413D61472BD941EF3920E623FBCCEBEB68DDBEC54CF8CD5874883841D712142A56A8D0F218F5003CB0296B6B509619F2C}
+x{0360FED4BA255A9D31C961EB74C6356D68C049B8923B61FA6CE669622E60F29FB6}
+
+<{ P256_CHKSIGNS }>s 64 runvmx .s // 0 0
+drop drop

lite-client/lite-client.cpp

@@ -422,7 +422,12 @@ void TestNode::got_server_mc_block_id(ton::BlockIdExt blkid, ton::ZeroStateIdExt
   }
   td::TerminalIO::out() << "latest masterchain block known to server is " << blkid.to_str();
   if (created > 0) {
-    td::TerminalIO::out() << " created at " << created << " (" << now() - created << " seconds ago)\n";
+    auto time = now();
+    if (time >= created) {
+      td::TerminalIO::out() << " created at " << created << " (" << time - created << " seconds ago)\n";
+    } else {
+        td::TerminalIO::out() << " created at " << created << " (" << created - time << " seconds in the future)\n";
+    }
   } else {
     td::TerminalIO::out() << "\n";
   }

storage/MicrochunkTree.cpp

@@ -188,7 +188,8 @@ td::Result<td::Ref<vm::Cell>> MicrochunkTree::get_proof(td::uint64 l, td::uint64
   if (!torrent.inited_info()) {
     return td::Status::Error("Torrent info is not ready");
   }
-  if (!torrent.get_info().piece_size % MICROCHUNK_SIZE != 0) {
+  // piece_size must be an exact multiple of MICROCHUNK_SIZE
+  if ((torrent.get_info().piece_size % MICROCHUNK_SIZE) != 0) {
     return td::Status::Error("Invalid piece size in torrent");
   }
   td::Ref<vm::Cell> root_raw = vm::CellSlice(vm::NoVm(), root_proof_).prefetch_ref();

tdutils/td/utils/BigNum.cpp

@@ -291,9 +291,12 @@ void BigNum::mod_mul(BigNum &r, BigNum &a, BigNum &b, const BigNum &m, BigNumCon
   LOG_IF(FATAL, result != 1);
 }
 
-void BigNum::mod_inverse(BigNum &r, BigNum &a, const BigNum &m, BigNumContext &context) {
+td::Status BigNum::mod_inverse(BigNum &r, BigNum &a, const BigNum &m, BigNumContext &context) {
   auto result = BN_mod_inverse(r.impl_->big_num, a.impl_->big_num, m.impl_->big_num, context.impl_->big_num_context);
-  LOG_IF(FATAL, result != r.impl_->big_num);
+  if (result != r.impl_->big_num) {
+    return td::Status::Error("Failed to compute modulo inverse");
+  }
+  return td::Status::OK();
 }
 
 void BigNum::div(BigNum *quotient, BigNum *remainder, const BigNum &dividend, const BigNum &divisor,

tdutils/td/utils/BigNum.h

@@ -109,7 +109,7 @@ class BigNum {
 
   static void mod_mul(BigNum &r, BigNum &a, BigNum &b, const BigNum &m, BigNumContext &context);
 
-  static void mod_inverse(BigNum &r, BigNum &a, const BigNum &m, BigNumContext &context);
+  static td::Status mod_inverse(BigNum &r, BigNum &a, const BigNum &m, BigNumContext &context);
 
   static void div(BigNum *quotient, BigNum *remainder, const BigNum &dividend, const BigNum &divisor,
                   BigNumContext &context);

tdutils/td/utils/format.h

@@ -179,11 +179,12 @@ inline StringBuilder &operator<<(StringBuilder &logger, Time t) {
     double value;
   };
 
-  static constexpr NamedValue durations[] = {{"ns", 1e-9}, {"us", 1e-6}, {"ms", 1e-3}, {"s", 1}};
+  static constexpr NamedValue durations[] = {{"ns", 1e-9}, {"us", 1e-6}, {"ms", 1e-3},
+                                             {"s", 1},     {"h", 3600},  {"d", 86400}};
   static constexpr size_t durations_n = sizeof(durations) / sizeof(NamedValue);
 
   size_t i = 0;
-  while (i + 1 < durations_n && t.seconds_ > 10 * durations[i + 1].value) {
+  while (i + 1 < durations_n && std::abs(t.seconds_) > 10 * durations[i + 1].value) {
     i++;
   }
   logger << StringBuilder::FixedDouble(t.seconds_ / durations[i].value, 1) << durations[i].name;

test/regression-tests.ans

@@ -21,6 +21,7 @@ Test_Fift_test_hash_ext_default 686fc5680feca5b3bb207768215b27f6872a95128762dee0
 Test_Fift_test_hmap_default c269246882039824bb5822e896c3e6e82ef8e1251b6b251f5af8ea9fb8d05067
 Test_Fift_test_levels_default 9fba4a7c98aec9000f42846d6e5fd820343ba61d68f9139dd16c88ccda757cf3
 Test_Fift_test_namespaces_default e6419619c51332fb5e8bf22043ef415db686c47fe24f03061e5ad831014e7c6c
+Test_Fift_test_p256_default e1948ddd3d2686baa9f70fdf376ffcebbc2ec5f20eeb366cd856254e61fbfa31
 Test_Fift_test_rist255_default f4d7558f200a656934f986145c19b1dedbe2ad029292a5a975576d6891e25fc4
 Test_Fift_test_secp256k1_default 3118450dace6af05fcdbd54a87d9446162ce11ac6ef6dfc57998cf113587d602
 Test_Fift_test_sort2_default 9b57d47e6a10e7d1bbb565db35400debf2f963031f434742a702ec76555a5d3a