src: Recover some more code of 4a1013a

Chia-Network · Jul 2, 2021 · 7615e4f · 7615e4f
1 parent ea0b8cb
commit 7615e4f
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 66 deletions.
diff --git a/src/bls.cpp b/src/bls.cpp
@@ -12,11 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <algorithm>
-#include <cstring>
-#include <set>
-#include <string>
-
 #include "bls.hpp"
 
 #if BLSALLOC_SODIUM
@@ -25,9 +20,6 @@
 
 namespace bls {
 
-const char BLS::GROUP_ORDER[] =
-    "73EDA753299D7D483339D80809A1D80553BDA402FFFE5BFEFFFFFFFF00000001";
-
 bool BLSInitResult = BLS::Init();
 
 Util::SecureAllocCallback Util::secureAllocCallback;

diff --git a/src/bls.hpp b/src/bls.hpp
@@ -15,29 +15,13 @@
 #ifndef SRC_BLS_HPP_
 #define SRC_BLS_HPP_
 
-#include <vector>
-#include <map>
-#include <string>
-#include <stdexcept>
-
-#include "relic_conf.h"
-
-#if defined GMP && ARITH == GMP
-#include <gmp.h>
-#endif
-
 #include "privatekey.hpp"
 #include "util.hpp"
 #include "schemes.hpp"
 #include "elements.hpp"
 #include "hkdf.hpp"
 #include "hdkeys.hpp"
 
-extern "C" {
-#include "relic.h"
-}
-#include "relic_test.h"
-
 namespace bls {
 
 /*
@@ -46,8 +30,6 @@ namespace bls {
  */
 class BLS {
  public:
-    // Order of g1, g2, and gt. Private keys are in {0, GROUP_ORDER}.
-    static const char GROUP_ORDER[];
     static const size_t MESSAGE_HASH_LEN = 32;
 
     // Initializes the BLS library (called automatically)

diff --git a/src/elements.cpp b/src/elements.cpp
@@ -12,18 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <algorithm>
 #include <cstring>
-#include <string>
 
 #include "bls.hpp"
-#include "elements.hpp"
-#include "privatekey.hpp"
-#include "util.hpp"
 
 namespace bls {
 
-
 G1Element G1Element::FromBytes(const Bytes& bytes)
 {
     if (bytes.size() != SIZE) {
@@ -145,7 +139,6 @@ uint32_t G1Element::GetFingerprint() const
     return Util::FourBytesToInt(hash);
 }
 
-
 std::vector<uint8_t> G1Element::Serialize() const {
     uint8_t buffer[G1Element::SIZE + 1];
     g1_write_bin(buffer, G1Element::SIZE + 1, p, 1);

diff --git a/src/elements.hpp b/src/elements.hpp
@@ -106,7 +106,6 @@ class G2Element {
     friend G2Element operator*(const G2Element &a, const bn_t &k);
     friend G2Element operator*(const bn_t &k, const G2Element &a);
 
-
 private:
     g2_t q;
 };

diff --git a/src/privatekey.cpp b/src/privatekey.cpp
@@ -12,16 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <algorithm>
-#include <cassert>
-#include <cstring>
-#include <string>
-
 #include "bls.hpp"
-#include "elements.hpp"
-#include "hkdf.hpp"
-#include "privatekey.hpp"
-#include "util.hpp"
 
 namespace bls {
 

diff --git a/src/privatekey.hpp b/src/privatekey.hpp
@@ -77,13 +77,7 @@ class PrivateKey {
         size_t len,
         const uint8_t *dst,
         size_t dst_len) const;
-
-    G2Element SignG2Prehashed(
-        const uint8_t *messageHash,
-        const uint8_t *dst,
-        size_t dst_len) const;
-
-
+
  private:
     // Don't allow public construction, force static methods
     PrivateKey();

diff --git a/src/schemes.cpp b/src/schemes.cpp
@@ -13,9 +13,7 @@
 // limitations under the License.
 
 #include <algorithm>
-#include <cstring>
 #include <set>
-#include <string>
 
 #include "bls.hpp"
 #include "elements.hpp"

diff --git a/src/schemes.hpp b/src/schemes.hpp
@@ -26,13 +26,14 @@
 
 #include "elements.hpp"
 #include "privatekey.hpp"
-#include "util.hpp"
 
 using std::vector;
 
 // These are all MPL schemes
 namespace bls {
 
+class Bytes;
+
 class CoreMPL {
 
 public:

diff --git a/src/util.hpp b/src/util.hpp
@@ -15,22 +15,10 @@
 #ifndef SRC_BLSUTIL_HPP_
 #define SRC_BLSUTIL_HPP_
 
-#include <iostream>
 #include <iomanip>
 #include <sstream>
 #include <string>
-#include <cstdlib>
-
-#include "relic_conf.h"
-
-#if defined GMP && ARITH == GMP
-#include <gmp.h>
-#endif
-
-extern "C" {
-#include "relic.h"
-}
-#include "relic_test.h"
+#include <vector>
 
 namespace bls {
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,7 +106,6 @@ class G2Element { @@
         friend G2Element operator*(const G2Element &a, const bn_t &k);
         friend G2Element operator*(const bn_t &k, const G2Element &a);
     private:
         g2_t q;
     };
@@ Expand Down @@