Fix libsodium, remove ifdefs, compile warning

kwvg · Aug 28, 2018 · 04a978e · 04a978e
1 parent f2ddfad
commit 04a978e
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -248,10 +248,9 @@ keybase team request-access chia_network
 
 ### TODO
 * Serialize aggregation info
-* Optimize performance
+* New constant time hashing to g2
 * Secure allocation during signing, key derivation
 * Threshold signatures
-* Full python implementation
 * Remove unnecessary dependency files
 * Constant time and side channel attacks
 * Adaptor signatures / Blind signatures
diff --git a/src/aggregationinfo.cpp b/src/aggregationinfo.cpp
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_AGGREGATIONINFO_CPP_
-#define SRC_AGGREGATIONINFO_CPP_
-
 #include <string>
 #include <cstring>
 #include <set>
@@ -395,5 +392,3 @@ AggregationInfo::AggregationInfo() {}
 AggregationInfo::~AggregationInfo() {
     Clear();
 }
-
-#endif  // SRC_BLSAGGREGATIONINFO_HPP_
diff --git a/src/bls.cpp b/src/bls.cpp
@@ -40,8 +40,8 @@ bool BLS::Init() {
         std::cout << "ep_param_set_any_pairf() failed";
         return false;
     }
-#if BLSALLOC
-    if (sodium::sodium_init() < 0) {
+#if BLSALLOC == sodium
+    if (libsodium::sodium_init() < 0) {
         std::cout << "libsodium init failed";
         return false;
     }
@@ -53,8 +53,8 @@ void BLS::AssertInitialized() {
     if (!relic::core_get()) {
         throw std::string("Library not initialized properly. Call BLS::Init()");
     }
-#if BLSALLOC
-    if (sodium::sodium_init() < 0) {
+#if BLSALLOC == sodium
+    if (libsodium::sodium_init() < 0) {
         throw std::string("Libsodium initialization failed.");
     }
 #endif

diff --git a/src/blssignature.cpp b/src/blssignature.cpp
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_BLSSIGNATURE_CPP_
-#define SRC_BLSSIGNATURE_CPP_
-
 #include <string>
 #include <cstring>
 #include "blssignature.hpp"
@@ -201,5 +198,3 @@ void BLSSignature::CompressPoint(uint8_t* result, relic::g2_t* point) {
     }
     std::memcpy(result, buffer + 1, SIGNATURE_SIZE);
 }
-
-#endif  // SRC_BLSSIGNATURE_CPP_
diff --git a/src/blsutil.hpp b/src/blsutil.hpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <cstdlib>
 
-#if BLSALLOC
+#if BLSALLOC == sodium
 namespace libsodium {
     #include "sodium/utils.h"
     #include "sodium/core.h"

diff --git a/src/chaincode.cpp b/src/chaincode.cpp
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_CHAINCODE_CPP_
-#define SRC_CHAINCODE_CPP_
-
 #include "chaincode.hpp"
 #include "bls.hpp"
 
@@ -52,6 +49,3 @@ std::ostream &operator<<(std::ostream &os, ChainCode const &s) {
 void ChainCode::Serialize(uint8_t *buffer) const {
     bn_write_bin(buffer, ChainCode::CHAIN_CODE_SIZE, chainCode);
 }
-
-#endif  // SRC_CHAINCODE_CPP_
-
diff --git a/src/extendedprivatekey.cpp b/src/extendedprivatekey.cpp
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_EXTENDEDPRIVATEKEY_CPP_
-#define SRC_EXTENDEDPRIVATEKEY_CPP_
-
 #include <string>
 #include <cstring>
 #include "extendedprivatekey.hpp"
@@ -218,5 +215,3 @@ void ExtendedPrivateKey::Serialize(uint8_t *buffer) const {
 
 // Destructors in BLSPrivateKey and ChainCode handle cleaning of memory
 ExtendedPrivateKey::~ExtendedPrivateKey() {}
-
-#endif  // SRC_EXTENDEDPRIVATEKEY_CPP_
diff --git a/src/extendedpublickey.cpp b/src/extendedpublickey.cpp
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_EXTENDEDPUBLICKEY_CPP_
-#define SRC_EXTENDEDPUBLICKEY_CPP_
-
 #include <string>
 #include "extendedpublickey.hpp"
 #include "extendedprivatekey.hpp"
@@ -58,7 +55,7 @@ ExtendedPublicKey ExtendedPublicKey::PublicChild(uint32_t i) const {
     size_t inputLen = BLSPublicKey::PUBLIC_KEY_SIZE + 4 + 1;
 
     // Hmac input includes sk or pk, int i, and byte with 0 or 1
-    uint8_t hmacInput[inputLen];
+    uint8_t hmacInput[BLSPublicKey::PUBLIC_KEY_SIZE + 4 + 1];
 
     // Fill the input with the required data
     pk.Serialize(hmacInput);
@@ -145,5 +142,3 @@ void ExtendedPublicKey::Serialize(uint8_t *buffer) const {
     chainCode.Serialize(buffer + 13);
     pk.Serialize(buffer + 13 + ChainCode::CHAIN_CODE_SIZE);
 }
-
-#endif  // SRC_EXTENDEDPUBLICKEY_CPP_