revert a few things

CMakeLists.txt

@@ -138,13 +138,6 @@ endif(WOW64_CROSS_COMPILE OR WIN64_CROSS_COMPILE)
 
 if(DEBIAN)
   add_definitions(-DDEBIAN)
-elseif(NOT ANDROID AND NOT NON_PC_TARGET)
-  if (NOT USE_AVX2)
-    # Public binary releases
-    set(CRYPTO_FLAGS -march=nocona -mtune=core2 -mfpmath=sse)
-  else()
-    set(CRYPTO_FLAGS -march=haswell -mtune=native -mfpmath=sse)
-  endif()
 endif()
 
 # only needed if using AVX2

llarp/crypto/crypto.hpp

@@ -73,7 +73,7 @@ namespace llarp
     virtual void
     randbytes(byte_t *, size_t) = 0;
     /// generate signing keypair
-    virtual bool
+    virtual void
     identity_keygen(SecretKey &) = 0;
     /// generate encryption keypair
     virtual void

llarp/crypto/crypto_libsodium.cpp

@@ -202,13 +202,14 @@ namespace llarp
       randombytes((unsigned char *)ptr, sz);
     }
 
-    bool
+    void
     CryptoLibSodium::identity_keygen(llarp::SecretKey &keys)
     {
       PubKey pk;
-      crypto_sign_keypair(pk.data(), keys.data());
+      int result = crypto_sign_keypair(pk.data(), keys.data());
+      assert(result != -1);
       const PubKey sk_pk = keys.toPublic();
-      return pk == sk_pk;
+      assert(pk == sk_pk);
     }
 
     void

llarp/crypto/crypto_libsodium.hpp

@@ -64,7 +64,7 @@ namespace llarp
       void
       randbytes(byte_t *, size_t) override;
       /// generate signing keypair
-      bool
+      void
       identity_keygen(SecretKey &) override;
       /// generate encryption keypair
       void

llarp/crypto/crypto_noop.hpp

@@ -144,12 +144,11 @@ namespace llarp
       m_value += sz;
     }
 
-    bool
+    void
     identity_keygen(SecretKey &key) override
     {
       std::iota(key.begin(), key.end(), m_value.load() % MAX_BYTE);
       m_value += key.size();
-      return true;
     }
 
     void

llarp/path/pathset.hpp

@@ -199,15 +199,15 @@ namespace llarp
       }
 
       /// override me in subtype
-      virtual bool
-      HandleGotIntroMessage(std::shared_ptr< const dht::GotIntroMessage >)
+      virtual bool HandleGotIntroMessage(
+          std::shared_ptr< const dht::GotIntroMessage >)
       {
         return false;
       }
 
       /// override me in subtype
-      virtual bool
-      HandleGotRouterMessage(std::shared_ptr< const dht::GotRouterMessage >)
+      virtual bool HandleGotRouterMessage(
+          std::shared_ptr< const dht::GotRouterMessage >)
       {
         return false;
       }

llarp/service/info.cpp

@@ -65,7 +65,8 @@ namespace llarp
       return m_CachedAddr.ToString();
     }
 
-    bool ServiceInfo::CalculateAddress(std::array< byte_t, 32 >& data) const
+    bool
+    ServiceInfo::CalculateAddress(std::array< byte_t, 32 >& data) const
     {
       std::array< byte_t, 256 > tmp;
       llarp_buffer_t buf(tmp);

llarp/service/info.hpp

@@ -89,7 +89,8 @@ namespace llarp
       }
 
       /// calculate our address
-      bool CalculateAddress(std::array< byte_t, 32 >& data) const;
+      bool
+      CalculateAddress(std::array< byte_t, 32 >& data) const;
 
       bool
       BDecode(llarp_buffer_t* buf)

test/crypto/mock_crypto.hpp

@@ -58,7 +58,7 @@ namespace llarp
 
       MOCK_METHOD2(randbytes, void(byte_t *, size_t));
 
-      MOCK_METHOD1(identity_keygen, bool(SecretKey &));
+      MOCK_METHOD1(identity_keygen, void(SecretKey &));
 
       MOCK_METHOD1(encryption_keygen, void(SecretKey &));
 

test/crypto/test_llarp_crypto.cpp

@@ -18,18 +18,19 @@ namespace llarp
   TEST_F(IdentityKeyTest, TestKeyGen)
   {
     SecretKey secret;
-    ASSERT_TRUE(crypto.identity_keygen(secret));
+    crypto.identity_keygen(secret);
+    ASSERT_FALSE(secret.IsZero());
   }
 
   TEST_F(IdentityKeyTest, TestSignVerify)
   {
     SecretKey secret;
-    ASSERT_TRUE(crypto.identity_keygen(secret));
+    crypto.identity_keygen(secret);
     AlignedBuffer< 128 > random;
     random.Randomize();
     Signature sig;
 
-    llarp_buffer_t buf(random);
+    const llarp_buffer_t buf(random);
     ASSERT_TRUE(crypto.sign(sig, secret, buf));
     ASSERT_TRUE(crypto.verify(secret.toPublic(), buf, sig));
     random.Randomize();