From b8ebd3f7a3256a41e7fd54019610341d8206cf10 Mon Sep 17 00:00:00 2001
From: MITSUNARI Shigeo <herumi@nifty.com>
Date: Sun, 21 Aug 2016 17:46:04 +0900
Subject: reorder of class

---
 include/bls.hpp     | 125 +++++++++++++++++++++++++++-------------------------
 sample/bls_smpl.cpp |   2 +-
 2 files changed, 66 insertions(+), 61 deletions(-)

diff --git a/include/bls.hpp b/include/bls.hpp
index 8a51488..2c4017e 100644
--- a/include/bls.hpp
+++ b/include/bls.hpp
@@ -14,8 +14,8 @@ namespace bls {
 
 namespace impl {
 
-struct PublicKey;
 struct SecretKey;
+struct PublicKey;
 struct Sign;
 
 } // bls::impl
@@ -25,7 +25,7 @@ struct Sign;
 	e : G2 x G1 -> Fp12
 	Q in G2 ; fixed global parameter
 	H : {str} -> G1
-	s : private key
+	s : secret key
 	sQ ; public key
 	s H(m) ; signature of m
 	verify ; e(sQ, H(m)) = e(Q, s H(m))
@@ -37,44 +37,61 @@ struct Sign;
 */
 void init();
 
-class Sign;
-class PublicKey;
 class SecretKey;
+class PublicKey;
+class Sign;
 
-typedef std::vector<Sign> SignVec;
-typedef std::vector<PublicKey> PublicKeyVec;
 typedef std::vector<SecretKey> SecretKeyVec;
+typedef std::vector<PublicKey> PublicKeyVec;
+typedef std::vector<Sign> SignVec;
 
-class Sign {
-	impl::Sign *self_;
-	int id_;
-	friend class PublicKey;
-	friend class SecretKey;
+/*
+	s ; secret key
+*/
+class SecretKey {
+	impl::SecretKey *self_;
+	int id_; // master if id_ = 0, shared if id_ > 0
 	template<class G, class T>
 	friend void LagrangeInterpolation(G& r, const T& vec);
+	template<class T, class G>
+	friend struct Wrap;
 public:
-	Sign();
-	~Sign();
-	Sign(const Sign& rhs);
-	Sign& operator=(const Sign& rhs);
-	bool operator==(const Sign& rhs) const;
-	bool operator!=(const Sign& rhs) const { return !(*this == rhs); }
+	SecretKey();
+	~SecretKey();
+	SecretKey(const SecretKey& rhs);
+	SecretKey& operator=(const SecretKey& rhs);
+	bool operator==(const SecretKey& rhs) const;
+	bool operator!=(const SecretKey& rhs) const { return !(*this == rhs); }
 	int getId() const { return id_; }
-	friend std::ostream& operator<<(std::ostream& os, const Sign& s);
-	friend std::istream& operator>>(std::istream& is, Sign& s);
-	bool verify(const PublicKey& pub, const std::string& m) const;
+	friend std::ostream& operator<<(std::ostream& os, const SecretKey& sec);
+	friend std::istream& operator>>(std::istream& is, SecretKey& sec);
 	/*
-		verify self(pop) with pub
+		make a secret key for id = 0
 	*/
-	bool verify(const PublicKey& pub) const;
+	void init();
+	void getPublicKey(PublicKey& pub) const;
+	void sign(Sign& sign, const std::string& m) const;
 	/*
-		recover sign from k signVec
+		make Pop(Proof of Possesion)
+		pop = prv.sign(pub)
 	*/
-	void recover(const SignVec& signVec);
+	void getPop(Sign& pop, const PublicKey& pub) const;
 	/*
-		add signature key only if id_ == 0
+		make [s_0, ..., s_{k-1}] to prepare k-out-of-n secret sharing
 	*/
-	void add(const Sign& rhs);
+	void getMasterSecretKey(SecretKeyVec& msk, int k) const;
+	/*
+		set a secret key for id > 0 from msk
+	*/
+	void set(const SecretKeyVec& msk, int id);
+	/*
+		recover secretKey from k secVec
+	*/
+	void recover(const SecretKeyVec& secVec);
+	/*
+		add secret key only if id_ == 0
+	*/
+	void add(const SecretKey& rhs);
 };
 
 /*
@@ -115,53 +132,41 @@ public:
 };
 
 /*
-	s ; private key
+	s H(m) ; sign
 */
-class SecretKey {
-	impl::SecretKey *self_;
-	int id_; // master if id_ = 0, shared if id_ > 0
+class Sign {
+	impl::Sign *self_;
+	int id_;
+	friend class PublicKey;
+	friend class SecretKey;
 	template<class G, class T>
 	friend void LagrangeInterpolation(G& r, const T& vec);
-	template<class T, class G>
-	friend struct Wrap;
 public:
-	SecretKey();
-	~SecretKey();
-	SecretKey(const SecretKey& rhs);
-	SecretKey& operator=(const SecretKey& rhs);
-	bool operator==(const SecretKey& rhs) const;
-	bool operator!=(const SecretKey& rhs) const { return !(*this == rhs); }
+	Sign();
+	~Sign();
+	Sign(const Sign& rhs);
+	Sign& operator=(const Sign& rhs);
+	bool operator==(const Sign& rhs) const;
+	bool operator!=(const Sign& rhs) const { return !(*this == rhs); }
 	int getId() const { return id_; }
-	friend std::ostream& operator<<(std::ostream& os, const SecretKey& sec);
-	friend std::istream& operator>>(std::istream& is, SecretKey& sec);
-	/*
-		make a private key for id = 0
-	*/
-	void init();
-	void getPublicKey(PublicKey& pub) const;
-	void sign(Sign& sign, const std::string& m) const;
-	/*
-		make Pop(Proof of Possesion)
-	*/
-	void getPop(Sign& pop, const PublicKey& pub) const;
-	/*
-		make [s_0, ..., s_{k-1}] to prepare k-out-of-n secret sharing
-	*/
-	void getMasterSecretKey(SecretKeyVec& msk, int k) const;
+	friend std::ostream& operator<<(std::ostream& os, const Sign& s);
+	friend std::istream& operator>>(std::istream& is, Sign& s);
+	bool verify(const PublicKey& pub, const std::string& m) const;
 	/*
-		set a private key for id > 0 from msk
+		verify self(pop) with pub
 	*/
-	void set(const SecretKeyVec& msk, int id);
+	bool verify(const PublicKey& pub) const;
 	/*
-		recover secretKey from k secVec
+		recover sign from k signVec
 	*/
-	void recover(const SecretKeyVec& secVec);
+	void recover(const SignVec& signVec);
 	/*
-		add private key only if id_ == 0
+		add signature key only if id_ == 0
 	*/
-	void add(const SecretKey& rhs);
+	void add(const Sign& rhs);
 };
 
+
 /*
 	make master public key [s_0 Q, ..., s_{k-1} Q] from msk
 */
diff --git a/sample/bls_smpl.cpp b/sample/bls_smpl.cpp
index bbb558c..7c08a39 100644
--- a/sample/bls_smpl.cpp
+++ b/sample/bls_smpl.cpp
@@ -6,7 +6,7 @@
 typedef std::vector<int> IntVec;
 
 const std::string pubFile = "sample/publickey";
-const std::string secFile = "sample/privatekey";
+const std::string secFile = "sample/secretkey";
 const std::string signFile = "sample/sign";
 
 std::string makeName(const std::string& name, int id)
-- 
cgit v1.2.3