diff options
| -rw-r--r-- | include/bls.hpp | 30 | ||||
| -rw-r--r-- | src/bls.cpp | 38 | ||||
| -rw-r--r-- | test/bls_test.cpp | 17 |
3 files changed, 39 insertions, 46 deletions
diff --git a/include/bls.hpp b/include/bls.hpp index 6101381..7d40ee3 100644 --- a/include/bls.hpp +++ b/include/bls.hpp @@ -17,7 +17,7 @@ namespace impl { struct PublicKey; struct PrivateKey; struct Sign; -struct Verifier; +struct MasterPublicKey; } // bls::impl @@ -50,19 +50,19 @@ public: /* Feldman's verifiable secret sharing */ -class Verifier { - impl::Verifier *self_; +class MasterPublicKey { + impl::MasterPublicKey *self_; friend class PrivateKey; friend class PublicKey; public: - Verifier(); - ~Verifier(); - Verifier(const Verifier& rhs); - Verifier& operator=(const Verifier& rhs); - bool operator==(const Verifier& rhs) const; - bool operator!=(const Verifier& rhs) const { return !(*this == rhs); } - friend std::ostream& operator<<(std::ostream& os, const Verifier& ver); - friend std::istream& operator>>(std::istream& is, Verifier& ver); + MasterPublicKey(); + ~MasterPublicKey(); + MasterPublicKey(const MasterPublicKey& rhs); + MasterPublicKey& operator=(const MasterPublicKey& rhs); + bool operator==(const MasterPublicKey& rhs) const; + bool operator!=(const MasterPublicKey& rhs) const { return !(*this == rhs); } + friend std::ostream& operator<<(std::ostream& os, const MasterPublicKey& mpk); + friend std::istream& operator>>(std::istream& is, MasterPublicKey& mpk); }; class PublicKey { @@ -87,9 +87,9 @@ public: */ void recover(const std::vector<PublicKey>& pubVec); /* - validate self by Verifier + validate self by MasterPublicKey */ - bool isValid(const Verifier& ver) const; + bool isValid(const MasterPublicKey& mpk) const; }; class PrivateKey { @@ -112,9 +112,9 @@ public: void sign(Sign& sign, const std::string& m) const; /* k-out-of-n secret sharing of privateKey - set verifier if ver is not 0 + set verifier if mpk is not 0 */ - void share(std::vector<PrivateKey>& prvVec, int n, int k, Verifier *ver = 0); + void share(std::vector<PrivateKey>& prvVec, int n, int k, MasterPublicKey *mpk = 0); /* recover privateKey from k prvVec */ diff --git a/src/bls.cpp b/src/bls.cpp index 3747c18..ecbb59e 100644 --- a/src/bls.cpp +++ b/src/bls.cpp @@ -164,7 +164,7 @@ struct PublicKey { const G2& get() const { return sQ; } }; -struct Verifier { +struct MasterPublicKey { std::vector<G2> vecR; }; @@ -236,49 +236,49 @@ void Sign::recover(const std::vector<Sign>& signVec) id_ = 0; } -Verifier::Verifier() - : self_(new impl::Verifier()) +MasterPublicKey::MasterPublicKey() + : self_(new impl::MasterPublicKey()) { } -Verifier::~Verifier() +MasterPublicKey::~MasterPublicKey() { delete self_; } -Verifier::Verifier(const Verifier& rhs) - : self_(new impl::Verifier(*rhs.self_)) +MasterPublicKey::MasterPublicKey(const MasterPublicKey& rhs) + : self_(new impl::MasterPublicKey(*rhs.self_)) { } -Verifier& Verifier::operator=(const Verifier& rhs) +MasterPublicKey& MasterPublicKey::operator=(const MasterPublicKey& rhs) { *self_ = *rhs.self_; return *this; } -bool Verifier::operator==(const Verifier& rhs) const +bool MasterPublicKey::operator==(const MasterPublicKey& rhs) const { return self_->vecR == rhs.self_->vecR; } -std::ostream& operator<<(std::ostream& os, const Verifier& ver) +std::ostream& operator<<(std::ostream& os, const MasterPublicKey& mpk) { - const size_t n = ver.self_->vecR.size(); + const size_t n = mpk.self_->vecR.size(); os << n; for (size_t i = 0; i < n; i++) { - os << '\n' << ver.self_->vecR[i]; + os << '\n' << mpk.self_->vecR[i]; } return os; } -std::istream& operator>>(std::istream& is, Verifier& ver) +std::istream& operator>>(std::istream& is, MasterPublicKey& mpk) { size_t n; is >> n; - ver.self_->vecR.resize(n); + mpk.self_->vecR.resize(n); for (size_t i = 0; i < n; i++) { - is >> ver.self_->vecR[i]; + is >> mpk.self_->vecR[i]; } return is; } @@ -335,10 +335,10 @@ void PublicKey::recover(const std::vector<PublicKey>& pubVec) id_ = 0; } -bool PublicKey::isValid(const Verifier& ver) const +bool PublicKey::isValid(const MasterPublicKey& mpk) const { G2 v; - evalPoly(v, Fr(id_), ver.self_->vecR); + evalPoly(v, Fr(id_), mpk.self_->vecR); return v == self_->sQ; } @@ -398,7 +398,7 @@ void PrivateKey::sign(Sign& sign, const std::string& m) const sign.id_ = id_; } -void PrivateKey::share(std::vector<PrivateKey>& prvVec, int n, int k, Verifier *ver) +void PrivateKey::share(std::vector<PrivateKey>& prvVec, int n, int k, MasterPublicKey *mpk) { if (id_ != 0) throw cybozu::Exception("bls:PrivateKey:share:already shared") << id_; if (n <= 0 || k <= 0 || k > n) throw cybozu::Exception("bls:PrivateKey:share:bad n, k") << n << k; @@ -410,8 +410,8 @@ void PrivateKey::share(std::vector<PrivateKey>& prvVec, int n, int k, Verifier * poly.eval(prvVec[i].self_->s, id); prvVec[i].id_ = id; } - if (ver == 0) return; - std::vector<G2>& vecR = ver->self_->vecR; + if (mpk == 0) return; + std::vector<G2>& vecR = mpk->self_->vecR; vecR.resize(k); for (size_t i = 0; i < vecR.size(); i++) { G2::mul(vecR[i], getQ(), poly.c[i]); diff --git a/test/bls_test.cpp b/test/bls_test.cpp index 3cfc78c..64c04c2 100644 --- a/test/bls_test.cpp +++ b/test/bls_test.cpp @@ -172,20 +172,13 @@ CYBOZU_TEST_AUTO(verifier) bls::PublicKey pub0; prv0.getPublicKey(pub0); std::vector<bls::PrivateKey> prvVec; - bls::Verifier ver; - prv0.share(prvVec, n, k, &ver); - CYBOZU_TEST_ASSERT(pub0.isValid(ver)); + bls::MasterPublicKey mpk; + prv0.share(prvVec, n, k, &mpk); + CYBOZU_TEST_ASSERT(pub0.isValid(mpk)); for (size_t i = 0; i < prvVec.size(); i++) { bls::PublicKey pub; prvVec[i].getPublicKey(pub); - CYBOZU_TEST_ASSERT(pub.isValid(ver)); - } - { - std::ostringstream oss; - oss << ver; - bls::Verifier ver2; - std::istringstream iss(oss.str()); - iss >> ver2; - CYBOZU_TEST_EQUAL(ver, ver2); + CYBOZU_TEST_ASSERT(pub.isValid(mpk)); } + streamTest(mpk); } |