repo-sync-2025-05-14T14:40:52+0800 (#526)

Author: shaojian-ant

.gitignore

@@ -26,8 +26,6 @@ _build
 
 # bazel
 bazel-*
-# bazel lock file
-MODULE.bazel.lock
 
 # cmake related
 abseil-cpp

MODULE.bazel

@@ -21,7 +21,7 @@
 
 module(
     name = "yacl",
-    version = "0.4.5b11-nightly-20250428",
+    version = "0.4.5b11-nightly-20250514",
     compatibility_level = 1,
 )
 

MODULE.bazel.lock

@@ -20,4 +20,4 @@ namespace examples::zkp {
 inline constexpr const char* kBpEcName = "secp256k1";
 inline constexpr const char* kBpEcLib = "openssl";
 
-}  // namespace examples::zkp
+}  // namespace examples::zkp

yacl/crypto/experimental/zkp/bulletproofs/bp_config.h

@@ -1040,6 +1040,34 @@ TEST_P(BigIntArithTest, ToBytes) {
   BigInt a("1234567890", 10, lib_);
   BigInt b("-1234567890", 10, lib_);
 
+  {
+    uint8_t buf;
+    a.ToBytes(reinterpret_cast<unsigned char*>(&buf), 1, Endian::native);
+    EXPECT_EQ(buf, 210);
+    b.ToBytes(reinterpret_cast<unsigned char*>(&buf), 1, Endian::native);
+    EXPECT_EQ(buf, 46);
+  }
+  {
+    uint8_t buf;
+    a.ToBytes(reinterpret_cast<unsigned char*>(&buf), 1, Endian::big);
+    EXPECT_EQ(buf, 210);
+    b.ToBytes(reinterpret_cast<unsigned char*>(&buf), 1, Endian::big);
+    EXPECT_EQ(buf, 46);
+  }
+  {
+    uint16_t buf;
+    a.ToBytes(reinterpret_cast<unsigned char*>(&buf), 2, Endian::native);
+    EXPECT_EQ(buf, 722);
+    b.ToBytes(reinterpret_cast<unsigned char*>(&buf), 2, Endian::native);
+    EXPECT_EQ(buf, 64814);
+  }
+  {
+    uint16_t buf;
+    a.ToBytes(reinterpret_cast<unsigned char*>(&buf), 2, Endian::big);
+    EXPECT_EQ(buf, 53762);
+    b.ToBytes(reinterpret_cast<unsigned char*>(&buf), 2, Endian::big);
+    EXPECT_EQ(buf, 12029);
+  }
   {
     uint32_t buf;
     a.ToBytes(reinterpret_cast<unsigned char*>(&buf), 4, Endian::native);

yacl/math/bigint/bigint_test.cc

@@ -594,7 +594,16 @@ yacl::Buffer GMPInt::ToBytes(size_t byte_len, Endian endian) const {
 
 void GMPInt::ToBytes(unsigned char* buf, size_t buf_len, Endian endian) const {
   size_t byte_count = (gmp_.mpz_sizeinbase_(z_, 2) + 7) / 8;
-  YACL_ENFORCE_GE(buf_len, byte_count, "Buffer is too small");
+  if (buf_len < byte_count) {
+    std::vector<unsigned char> tmp(byte_count);
+    ToBytes(tmp.data(), byte_count, endian);
+    if (endian == Endian::little) {
+      memcpy(buf, tmp.data(), buf_len);
+    } else {
+      memcpy(buf, tmp.data() + byte_count - buf_len, buf_len);
+    }
+    return;
+  }
   memset(buf, 0, buf_len);
   int endianness = endian == Endian::big ? 1 : -1;
   if (endian == Endian::little) {

yacl/math/bigint/gmp/gmp_int.cc

@@ -497,6 +497,17 @@ yacl::Buffer BigNum::ToBytes(size_t byte_len, Endian endian) const {
 }
 
 void BigNum::ToBytes(unsigned char* buf, size_t buf_len, Endian endian) const {
+  size_t byte_count = BN_num_bytes(bn_.get());
+  if (buf_len < byte_count) {
+    std::vector<unsigned char> tmp(byte_count);
+    ToBytes(tmp.data(), byte_count, endian);
+    if (endian == Endian::little) {
+      memcpy(buf, tmp.data(), buf_len);
+    } else {
+      memcpy(buf, tmp.data() + byte_count - buf_len, buf_len);
+    }
+    return;
+  }
   memset(buf, 0, buf_len);
   if (endian == Endian::big) {
     OSSL_RET_NOT_MINUS_1(BN_bn2binpad(bn_.get(), buf, buf_len));