Merge remote-tracking branch 'bts/master'

Author: pmconrad

CMakeLists.txt

@@ -281,7 +281,6 @@ set( fc_sources
      src/network/rate_limiting.cpp
      src/network/resolve.cpp
      src/network/url.cpp
-     src/compress/smaz.cpp
      src/compress/zlib.cpp
      )
 
@@ -367,15 +366,6 @@ else()
   set( ZLIB_LIBRARIES "" )
 endif( ZLIB_FOUND )
 
-find_package( BZip2 )
-if( BZIP2_FOUND )
-   MESSAGE( STATUS "bzip2 found" )
-   add_definitions( -DHAS_BZIP2 )
-else()
-   MESSAGE( STATUS "bzip2 not found" )
-   set( BZIP2_LIBRARIES "" )
-endif( BZIP2_FOUND )
-
 # This will become unnecessary once we update to websocketpp which fixes upstream issue #395
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWEBSOCKETPP_STRICT_MASKING")
 
@@ -406,11 +396,10 @@ target_include_directories(fc
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp
   )
 
-#target_link_libraries( fc PUBLIC ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${ECC_LIB} )
 IF(NOT WIN32)
   set(LINK_USR_LOCAL_LIB -L/usr/local/lib)
 ENDIF()
-target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${editline_libraries} ${ECC_LIB} )
+target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${editline_libraries} ${ECC_LIB} )
 
 if(MSVC)
   set_source_files_properties( src/network/http/websocket.cpp PROPERTIES COMPILE_FLAGS "/bigobj" )

include/fc/bloom_filter.hpp

@@ -57,6 +57,20 @@ class bloom_parameters
      random_seed(0xA5A5A5A55A5A5A5AULL)
    {}
 
+   bloom_parameters(unsigned long long int projected_element_count,
+         double false_positive_probability,
+         unsigned long long int maximum_size) :
+            minimum_size(1),
+            maximum_size(maximum_size),
+            minimum_number_of_hashes(1),
+            maximum_number_of_hashes(std::numeric_limits<unsigned int>::max()),
+            projected_element_count(projected_element_count),
+            false_positive_probability(false_positive_probability),
+            random_seed(0xA5A5A5A55A5A5A5AULL)
+   {
+      compute_optimal_parameters();
+   }
+
    virtual ~bloom_parameters()
    {}
 

include/fc/compress/smaz.hpp

@@ -140,7 +140,7 @@ namespace fc { namespace ecc {
     std::string public_key::to_base58( const public_key_data &key )
     {
       uint32_t check = (uint32_t)sha256::hash(key.data, sizeof(key))._hash[0];
-      assert(key.size() + sizeof(check) == 37);
+      static_assert(sizeof(key) + sizeof(check) == 37, "Elliptic public key size (or its hash) is incorrect");
       array<char, 37> data;
       memcpy(data.data, key.begin(), key.size());
       memcpy(data.begin() + key.size(), (const char*)&check, sizeof(check));
@@ -192,7 +192,7 @@ namespace fc { namespace ecc {
         BN_mod(secexp, secexp, order, ctx);
 
         fc::sha256 secret;
-        assert(BN_num_bytes(secexp) <= int64_t(sizeof(secret)));
+        FC_ASSERT(BN_num_bytes(secexp) <= int64_t(sizeof(secret)));
         auto shift = sizeof(secret) - BN_num_bytes(secexp);
         BN_bn2bin(secexp, ((unsigned char*)&secret)+shift);
         return regenerate( secret );

src/compress/smaz.cpp

@@ -75,13 +75,13 @@ namespace fc {
 
     bool public_key::verify( const sha1& digest, const signature& sig )const
     {
-       assert( sig.size() == 2048/8 );
+       static_assert( sig.size() == 2048/8, "Invalid signature size" );
        return 0 != RSA_verify( NID_sha1, (const uint8_t*)&digest, 20,
                                (uint8_t*)sig.data(), 2048/8, my->rsa );
     }
     bool public_key::verify( const sha256& digest, const signature& sig )const
     {
-       assert( sig.size() == 2048/8 );
+       static_assert( sig.size() == 2048/8, "Invalid signature size" );
        return 0 != RSA_verify( NID_sha256, (const uint8_t*)&digest, 32,
                                (uint8_t*)sig.data(), 2048/8, my->rsa );
     }

src/crypto/elliptic_common.cpp

@@ -2,43 +2,11 @@
 
 #include <fstream>
 #include <iostream>
-#include <fc/compress/smaz.hpp>
 #include <fc/compress/zlib.hpp>
 #include <fc/exception/exception.hpp>
 
 BOOST_AUTO_TEST_SUITE(compress)
 
-BOOST_AUTO_TEST_CASE(smaz_test)
-{
-    std::ifstream testfile;
-    testfile.open("README.md");
-
-    std::stringstream buffer;
-    std::string line;
-    std::getline( testfile, line );
-    while( testfile.good() )
-    {
-        buffer << line << "\n";
-        try {
-            std::string compressed = fc::smaz_compress( line );
-            std::string decomp = fc::smaz_decompress( compressed );
-            BOOST_CHECK_EQUAL( decomp, line );
-        }
-        catch ( fc::exception& e )
-        {
-           std::cout<<e.to_detail_string()<<"\n";
-        }
-
-        std::getline( testfile, line );
-    }
-
-    line = buffer.str();
-    std::string compressed = fc::smaz_compress( line );
-    std::string decomp = fc::smaz_decompress( compressed );
-    BOOST_CHECK_EQUAL( decomp, line );
-}
-
-
 extern "C" {
 
 enum