Move include/bitcoin/ssl to include/bitcoin/network/ssl.

builds/cmake/CMakeLists.txt

@@ -379,7 +379,7 @@ endif()
 #------------------------------------------------------------------------------
 target_include_directories( ${CANONICAL_LIB_NAME} PRIVATE
     "../../include"
-    "../../include/bitcoin/ssl"
+    "../../include/bitcoin/network/ssl"
     ${bitcoin_system_FOR_BUILD_INCLUDE_DIRS} )
 
 target_include_directories( ${CANONICAL_LIB_NAME} PUBLIC
@@ -712,7 +712,7 @@ if (with-tests)
 #------------------------------------------------------------------------------
     target_include_directories( libbitcoin-network-test PRIVATE
         "../../include"
-        "../../include/bitcoin/ssl"
+        "../../include/bitcoin/network/ssl"
         "../../test/ssl/wolfssl" )
 
 #     libbitcoin-network-test project specific libraries/linker flags.

builds/msvc/vs2022/libbitcoin-network.import.props

@@ -30,7 +30,7 @@
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <!-- Prevent boost from seeing ssl includes when ssl is deselected  (requires external headers). -->
-      <AdditionalIncludeDirectories Condition="'$(Option-ssl)' == 'true'">$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\bitcoin\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Option-ssl)' == 'true'">$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\bitcoin\network\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-network)' == 'static' Or '$(Linkage-libbitcoin-network)' == 'ltcg'">BCT_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Option-ssl)' == 'true'">WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.props

@@ -26,7 +26,7 @@
       <AdditionalIncludeDirectories>$(RepoRoot)include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <!-- Prevent boost from seeing ssl includes when ssl is deselected  (requires external headers). -->
-      <AdditionalIncludeDirectories Condition="'$(Option-ssl)' == 'true'">$(RepoRoot)include\bitcoin\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Option-ssl)' == 'true'">$(RepoRoot)include\bitcoin\network\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <EnablePREfast>false</EnablePREfast>
       <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">BCT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -42,10 +42,10 @@
 
         <!-- These are only used as inlined headers, so never compile them directly. -->
         <ExcludedFromBuild Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\scr\ssl\wolfssl\src\'))">true</ExcludedFromBuild>
-        <ExcludedFromBuild Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\include\bitcoin\ssl\wolfcrypt\src\'))">true</ExcludedFromBuild>
+        <ExcludedFromBuild Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\include\bitcoin\network\ssl\wolfcrypt\src\'))">true</ExcludedFromBuild>
 
         <!-- Exclude wolfssl sources when ssl is deselected (requires external linkage). -->
-        <ExcludedFromBuild Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\include\bitcoin\ssl\wolfcrypt\src\')) And '$(Option-ssl)' == 'false'">true</ExcludedFromBuild>
+        <ExcludedFromBuild Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\include\bitcoin\network\ssl\wolfcrypt\src\')) And '$(Option-ssl)' == 'false'">true</ExcludedFromBuild>
       </ClCompile>
     </ItemGroup>
   </Target>

include/bitcoin/network.hpp

@@ -164,5 +164,132 @@
 #include <bitcoin/network/sessions/session_seed.hpp>
 #include <bitcoin/network/sessions/session_server.hpp>
 #include <bitcoin/network/sessions/sessions.hpp>
+#include <bitcoin/network/ssl/openssl/conf.h>
+#include <bitcoin/network/ssl/openssl/dh.h>
+#include <bitcoin/network/ssl/openssl/engine.h>
+#include <bitcoin/network/ssl/openssl/err.h>
+#include <bitcoin/network/ssl/openssl/openssl.h>
+#include <bitcoin/network/ssl/openssl/rsa.h>
+#include <bitcoin/network/ssl/openssl/ssl.h>
+#include <bitcoin/network/ssl/openssl/x509.h>
+#include <bitcoin/network/ssl/openssl/x509v3.h>
+#include <bitcoin/network/ssl/wolfssl/callbacks.h>
+#include <bitcoin/network/ssl/wolfssl/certs_test.h>
+#include <bitcoin/network/ssl/wolfssl/error-ssl.h>
+#include <bitcoin/network/ssl/wolfssl/internal.h>
+#include <bitcoin/network/ssl/wolfssl/ocsp.h>
+#include <bitcoin/network/ssl/wolfssl/options.h>
+#include <bitcoin/network/ssl/wolfssl/ssl.h>
+#include <bitcoin/network/ssl/wolfssl/test.h>
+#include <bitcoin/network/ssl/wolfssl/version.h>
+#include <bitcoin/network/ssl/wolfssl/wolfio.h>
+#include <bitcoin/network/ssl/wolfssl/wolfssl.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/aes.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/asn1.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/bio.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/bn.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/buffer.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/cmac.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/compat_types.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/conf.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/crypto.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/des.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/dh.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/dsa.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/ec.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/ec25519.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/ec448.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/ecdh.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/ecdsa.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/ed25519.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/ed448.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/engine.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/err.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/evp.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/fips_rand.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/hmac.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/kdf.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/lhash.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/md4.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/md5.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/modes.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/obj_mac.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/objects.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/opensslv.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/pem.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/pkcs12.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/pkcs7.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/rand.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/rc4.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/ripemd.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/rsa.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/sha.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/sha3.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/ssl.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/stack.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/tls1.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/x509.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/x509_vfy.h>
+#include <bitcoin/network/ssl/wolfssl/openssl/x509v3.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/aes.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/arc4.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/ascon.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/asn.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/asn_public.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/blake2.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/camellia.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/chacha.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/chacha20_poly1305.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/cmac.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/coding.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/cpuid.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/cryptocb.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/curve25519.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/curve448.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/des3.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/dh.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/dsa.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/ecc.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/ed25519.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/ed448.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/error-crypt.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/fe_operations.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/fips_test.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/hash.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/hmac.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/hpke.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/kdf.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/libwolfssl_sources.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/logging.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/md2.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/md4.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/md5.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/mem_track.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/memory.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/misc.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/oid_sum.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/pkcs12.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/pkcs7.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/poly1305.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/pwdbased.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/random.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/rc2.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/ripemd.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/rsa.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/settings.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/sha.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/sha256.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/sha3.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/sha512.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/signature.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/siphash.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/sp_int.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/srp.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/types.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/user_settings.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/visibility.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/wc_encrypt.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/wc_port.h>
+#include <bitcoin/network/ssl/wolfssl/wolfcrypt/wolfmath.h>
 
 #endif

include/bitcoin/network/have.hpp

@@ -24,10 +24,8 @@
 /// WITH_ indicates build symbol.
 /// ---------------------------------------------------------------------------
 
-// TODO: this conflicts with a scneario in which the developer wants to exclude
-// the embedded wolfssl and link one externally, as this symbol must be defined
-// in this and dependent projects so that boost can link the library with
-// configuration. However that will also activate the embedded build.
+// TODO: change this to condition on WITH_SSL once *nix builds are updated.
+// TODO: then also update the .props files to additionally emit WITH_SSL also.
 /// This enables integral ssl support via embedded wolfssl.
 /// If not defined then boost-compatible SSL must be externally linked.
 /// The build config must always define either the internal ssl include path or

test/messages/peer/detail/alert.cpp

@@ -20,6 +20,8 @@
 
 BOOST_AUTO_TEST_SUITE(p2p_alert_tests)
 
+// Avoid namespace conflict with ::alert (wolfssl).
+using alert = network::messages::peer::alert;
 using namespace network::messages::peer;
 
 BOOST_AUTO_TEST_CASE(alert__properties__always__expected)