Merge pull request #41 from evoskuil/master

Update certificate handling.

Author: evoskuil

builds/msvc/build/buildbase.bat

@@ -11,16 +11,6 @@ IF NOT EXIST %environment% GOTO no_tools
 
 ECHO Building: %solution%
 
-CALL %environment% x86 > nul
-ECHO Platform=x86
-
-ECHO Configuration=StaticDebug
-msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=Win32 %solution% > %log%
-IF errorlevel 1 GOTO error
-ECHO Configuration=StaticRelease
-msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=Win32 %solution% >> %log%
-IF errorlevel 1 GOTO error
-
 CALL %environment% x86_amd64 > nul
 ECHO Platform=x64
 

builds/msvc/vs2013/bitcoin-server/bitcoin-server.vcxproj

@@ -119,10 +119,10 @@
     <Import Project="..\..\..\..\..\..\nuget\boost_program_options-vc120.1.56.0.0\build\native\boost_program_options-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_program_options-vc120.1.56.0.0\build\native\boost_program_options-vc120.targets')" />
     <Import Project="..\..\..\..\..\..\nuget\boost_regex-vc120.1.56.0.0\build\native\boost_regex-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_regex-vc120.1.56.0.0\build\native\boost_regex-vc120.targets')" />
     <Import Project="..\..\..\..\..\..\nuget\boost_system-vc120.1.56.0.0\build\native\boost_system-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_system-vc120.1.56.0.0\build\native\boost_system-vc120.targets')" />
-    <Import Project="..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.8\build\native\czmq_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.8\build\native\czmq_vc120.targets')" />
-    <Import Project="..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.10\build\native\czmqpp_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.10\build\native\czmqpp_vc120.targets')" />
+    <Import Project="..\..\..\..\..\..\nuget\czmq_vc120.3.0.1.0\build\native\czmq_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\czmq_vc120.3.0.1.0\build\native\czmq_vc120.targets')" />
+    <Import Project="..\..\..\..\..\..\nuget\czmqpp_vc120.1.1.0.0\build\native\czmqpp_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.1.0.0\build\native\czmqpp_vc120.targets')" />
     <Import Project="..\..\..\..\..\..\nuget\libsodium_vc120.1.0.0.0\build\native\libsodium_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libsodium_vc120.1.0.0.0\build\native\libsodium_vc120.targets')" />
-    <Import Project="..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.7\build\native\libzmq_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.7\build\native\libzmq_vc120.targets')" />
+    <Import Project="..\..\..\..\..\..\nuget\libzmq_vc120.4.2.0.0\build\native\libzmq_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.2.0.0\build\native\libzmq_vc120.targets')" />
     <Import Project="..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.4\build\native\secp256k1_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.4\build\native\secp256k1_vc120.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -136,9 +136,9 @@
     <Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_regex-vc120.1.56.0.0\build\native\boost_regex-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_regex-vc120.1.56.0.0\build\native\boost_regex-vc120.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_system-vc120.1.56.0.0\build\native\boost_system-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_system-vc120.1.56.0.0\build\native\boost_system-vc120.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\nuget\libsodium_vc120.1.0.0.0\build\native\libsodium_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libsodium_vc120.1.0.0.0\build\native\libsodium_vc120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.7\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.7\build\native\libzmq_vc120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.8\build\native\czmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.8\build\native\czmq_vc120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.10\build\native\czmqpp_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.10\build\native\czmqpp_vc120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.2.0.0\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libzmq_vc120.4.2.0.0\build\native\libzmq_vc120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\nuget\czmq_vc120.3.0.1.0\build\native\czmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmq_vc120.3.0.1.0\build\native\czmq_vc120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.1.0.0\build\native\czmqpp_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmqpp_vc120.1.1.0.0\build\native\czmqpp_vc120.targets'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.4\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.4\build\native\secp256k1_vc120.targets'))" />
   </Target>
 </Project>

builds/msvc/vs2013/bitcoin-server/packages.config

@@ -6,9 +6,9 @@
   <package id="boost_program_options-vc120" version="1.56.0.0" targetFramework="Native" />
   <package id="boost_regex-vc120" version="1.56.0.0" targetFramework="Native" />
   <package id="boost_system-vc120" version="1.56.0.0" targetFramework="Native" />
-  <package id="czmq_vc120" version="2.2.0.8" targetFramework="Native" />
-  <package id="czmqpp_vc120" version="1.0.0.10" targetFramework="Native" />
+  <package id="czmq_vc120" version="3.0.1.0" targetFramework="Native" />
+  <package id="czmqpp_vc120" version="1.1.0.0" targetFramework="Native" />
   <package id="libsodium_vc120" version="1.0.0.0" targetFramework="Native" />
-  <package id="libzmq_vc120" version="4.1.0.7" targetFramework="Native" />
+  <package id="libzmq_vc120" version="4.2.0.0" targetFramework="Native" />
   <package id="secp256k1_vc120" version="0.1.0.4" targetFramework="Native" />
 </packages>

configure.ac

@@ -128,9 +128,9 @@ AS_IF([test x$bash_completion_dir = xyes],
 # The chained zmq dependency doesn't set a minimum version for sodium.
 PKG_CHECK_MODULES([sodium], [libsodium >= 1.0.0])
 
-# Require czmq++ of at least version 0.4.1 and output ${czmq___CFLAGS} and ${czmq___LIBS}.
+# Require czmq++ of at least version 1.1.0 and output ${czmq___CFLAGS} and ${czmq___LIBS}.
 #------------------------------------------------------------------------------
-PKG_CHECK_MODULES([czmq__], [libczmq++ >= 0.4.1])
+PKG_CHECK_MODULES([czmq__], [libczmq++ >= 1.1.0])
 
 # Require bitcoin-node of at least version 2.0.0 and output ${bitcoin_node_CFLAGS} and ${bitcoin_node_LIBS}.
 #------------------------------------------------------------------------------

data/server.cfg

@@ -17,10 +17,10 @@ publisher_enabled = false
 tx_pool_capacity = 2000
 
 [logging]
-# The error log file path, defaults to 'error.log'.
-error_file = error.log
 # The debug log file path, defaults to 'debug.log'.
 debug_file = debug.log
+# The error log file path, defaults to 'error.log'.
+error_file = error.log
 # Write service requests to the log, impacts performance, defaults to false.
 log_requests = false
 
@@ -35,15 +35,15 @@ block_publish = tcp://*:9093
 tx_publish = tcp://*:9094
 
 [identity]
-# The path to the server's certificate, not used by default.
-#certificate_file = 
-# The client certificates directory, allows anonymous clients if not set.
-#client_certs_path = 
+# The path to the ZPL-encoded server private certificate file.
+# cert_file = 
+# The directory for ZPL-encoded client public certificate files, allows anonymous clients if not set.
+# client_certs_path = 
 # Allowed client IP address, all clients allowed if none set, multiple entries allowed.
-#client = 127.0.0.1
-#client = 
+# client = 127.0.0.1
+# client = 
 # Node to augment peer discovery, formatted as host:port, multiple entries allowed.
-#peer = obelisk.airbitz.co:8333
-#peer = 
+# peer = obelisk.airbitz.co:8333
+# peer = 
 # The server name, must be unique if specified.
-#unique_name = 
+# unique_name = 

libbitcoin-server.pc.in

@@ -16,7 +16,7 @@ URL: https://github.com/libbitcoin/libbitcoin-server
 Version: @PACKAGE_VERSION@
 
 # Our dependencies that publish package configuration.
-Requires: libsodium >= 1.0.0 libczmq++ >= 0.4.1 libbitcoin-node >= 2.0.0
+Requires: libsodium >= 1.0.0 libczmq++ >= 1.1.0 libbitcoin-node >= 2.0.0
 
 # Our own include directory and any other compiler flags we require.
 Cflags: -I${includedir} -std=c++11

src/message.cpp

@@ -43,7 +43,7 @@ bool incoming_message::recv(czmqpp::socket& socket)
     ++it;
     // [ ID ]
     const data_chunk& raw_id = *it;
-    if (raw_id.size() != 4)
+    if (raw_id.size() != sizeof(uint32_t))
         return false;
     id_ = from_little_endian_unsafe<uint32_t>(raw_id.begin());
     ++it;
@@ -105,7 +105,7 @@ void outgoing_message::send(czmqpp::socket& socket) const
     append_str(message, command_);
     // [ ID ]
     data_chunk raw_id = to_data_chunk(to_little_endian(id_));
-    BITCOIN_ASSERT(raw_id.size() == 4);
+    BITCOIN_ASSERT(raw_id.size() == sizeof(id_));
     message.append(raw_id);
     // [ DATA ]
     message.append(data_);

src/node_impl.cpp

@@ -148,7 +148,7 @@ bool node_impl::start(settings_type& config)
 void node_impl::start_session()
 {
     // Start session
-    auto session_started = [this](const std::error_code& ec)
+    const auto session_started = [this](const std::error_code& ec)
     {
         if (ec)
             wait_and_retry_start(ec);
@@ -170,14 +170,13 @@ bool node_impl::stop()
 {
     // Stop session
     std::promise<std::error_code> ec_session;
-    auto session_stopped =
-        [&](const std::error_code& ec)
+    const auto session_stopped = [&ec_session](const std::error_code& ec)
     {
         ec_session.set_value(ec);
     };
     session_.stop(session_stopped);
     // Query the error_code and wait for startup completion.
-    std::error_code ec = ec_session.get_future().get();
+    const auto ec = ec_session.get_future().get();
     if (ec)
         log_error(LOG_NODE) << "Problem stopping session: " << ec.message();
 
@@ -248,13 +247,13 @@ void node_impl::recv_transaction(const std::error_code& ec,
         log_warning(LOG_NODE) << "recv_transaction: " << ec.message();
         return;
     }
-    auto handle_deindex = [](const std::error_code& ec)
+    const auto handle_deindex = [](const std::error_code& ec)
     {
         if (ec)
             log_error(LOG_NODE) << "Deindex error: " << ec.message();
     };
     // Called when the transaction becomes confirmed in a block.
-    auto handle_confirm = [this, tx, handle_deindex](
+    const auto handle_confirm = [this, tx, handle_deindex](
         const std::error_code& ec)
     {
         log_debug(LOG_NODE) << "Confirm transaction: " << ec.message()
@@ -282,15 +281,15 @@ void node_impl::handle_mempool_store(
             << encode_hash(hash_transaction(tx)) << ": " << ec.message();
         return;
     }
-    auto handle_index = [](const std::error_code& ec)
+    const auto handle_index = [](const std::error_code& ec)
     {
         if (ec)
             log_error(LOG_NODE) << "Index error: " << ec.message();
     };
     indexer_.index(tx, handle_index);
     log_info(LOG_NODE) << "Accepted transaction: "
         << encode_hash(hash_transaction(tx));
-    for (auto notify: notify_txs_)
+    for (const auto notify: notify_txs_)
         notify(tx);
 }
 
@@ -306,7 +305,7 @@ void node_impl::reorganize(const std::error_code& /* ec */,
         {
             size_t height = fork_point + i + 1;
             const block_type& blk = *new_blocks[i];
-            for (auto notify: notify_blocks_)
+            for (const auto notify: notify_blocks_)
                 notify(height, blk);
         }
     chain_.subscribe_reorganize(

src/publisher.cpp

@@ -72,7 +72,7 @@ void publisher::send_blk(uint32_t height, const block_type& blk)
 {
     // Serialize the height.
     data_chunk raw_height = to_data_chunk(to_little_endian(height));
-    BITCOIN_ASSERT(raw_height.size() == 4);
+    BITCOIN_ASSERT(raw_height.size() == sizeof(uint32_t));
     // Serialize the 80 byte header.
     data_chunk raw_blk_header(bc::satoshi_raw_size(blk.header));
     DEBUG_ONLY(auto it =) satoshi_save(blk.header, raw_blk_header.begin());

src/settings.cpp

@@ -199,19 +199,19 @@ const options_description config_type::load_settings()
         "The error log file path, defaults to 'error.log'."
     )
     (
-        "general.blockchain_path",
-        value<path>(&settings.blockchain_path)->default_value("blockchain"),
-        "The blockchain directory, defaults to 'blockchain'."
-    )
-    (
-        "identity.certificate",
-        value<path>(&settings.certificate_file),
-        "The path to the server's certificate, not used by default."
+        "identity.cert_file",
+        value<path>(&settings.cert_file),
+        "The path to the ZPL-encoded server private certificate file."
     )
     (
         "identity.client_certs_path",
         value<path>(&settings.client_certs_path),
-        "The client certificates directory, allows anonymous clients if not set."
+        "The directory for ZPL-encoded client public certificate files, allows anonymous clients if not set."
+    )
+    (
+        "general.blockchain_path",
+        value<path>(&settings.blockchain_path)->default_value("blockchain"),
+        "The blockchain directory, defaults to 'blockchain'."
     )
     (
         "identity.client",