diff --git a/Makefile.am b/Makefile.am index 25c806999..2b4d76ac0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,7 +32,7 @@ doc_DATA = \ # src/libbitcoin-network.la => ${libdir} #------------------------------------------------------------------------------ lib_LTLIBRARIES = src/libbitcoin-network.la -src_libbitcoin_network_la_CPPFLAGS = -I${srcdir}/include -I${srcdir}/include/bitcoin/ssl ${bitcoin_system_BUILD_CPPFLAGS} +src_libbitcoin_network_la_CPPFLAGS = -I${srcdir}/include -I${srcdir}/include/bitcoin/network/ssl ${bitcoin_system_BUILD_CPPFLAGS} src_libbitcoin_network_la_LIBADD = ${bitcoin_system_LIBS} src_libbitcoin_network_la_SOURCES = \ src/error.cpp \ @@ -180,7 +180,7 @@ if WITH_TESTS TESTS = libbitcoin-network-test_runner.sh check_PROGRAMS = test/libbitcoin-network-test -test_libbitcoin_network_test_CPPFLAGS = -I${srcdir}/include -I${srcdir}/include/bitcoin/ssl -I${srcdir}/test/ssl/wolfssl ${bitcoin_system_BUILD_CPPFLAGS} +test_libbitcoin_network_test_CPPFLAGS = -I${srcdir}/include -I${srcdir}/include/bitcoin/network/ssl -I${srcdir}/test/ssl/wolfssl ${bitcoin_system_BUILD_CPPFLAGS} test_libbitcoin_network_test_LDADD = src/libbitcoin-network.la ${boost_unit_test_framework_LIBS} ${bitcoin_system_LIBS} test_libbitcoin_network_test_SOURCES = \ test/error.cpp \ @@ -691,142 +691,142 @@ include_bitcoin_network_sessions_HEADERS = \ include/bitcoin/network/sessions/session_server.hpp \ include/bitcoin/network/sessions/sessions.hpp -include_bitcoin_ssl_openssldir = ${includedir}/bitcoin/ssl/openssl -include_bitcoin_ssl_openssl_HEADERS = \ - include/bitcoin/ssl/openssl/conf.h \ - include/bitcoin/ssl/openssl/dh.h \ - include/bitcoin/ssl/openssl/engine.h \ - include/bitcoin/ssl/openssl/err.h \ - include/bitcoin/ssl/openssl/openssl.h \ - include/bitcoin/ssl/openssl/rsa.h \ - include/bitcoin/ssl/openssl/ssl.h \ - include/bitcoin/ssl/openssl/x509.h \ - include/bitcoin/ssl/openssl/x509v3.h - -include_bitcoin_ssl_wolfssldir = ${includedir}/bitcoin/ssl/wolfssl -include_bitcoin_ssl_wolfssl_HEADERS = \ - include/bitcoin/ssl/wolfssl/callbacks.h \ - include/bitcoin/ssl/wolfssl/certs_test.h \ - include/bitcoin/ssl/wolfssl/error-ssl.h \ - include/bitcoin/ssl/wolfssl/internal.h \ - include/bitcoin/ssl/wolfssl/ocsp.h \ - include/bitcoin/ssl/wolfssl/options.h \ - include/bitcoin/ssl/wolfssl/ssl.h \ - include/bitcoin/ssl/wolfssl/test.h \ - include/bitcoin/ssl/wolfssl/version.h \ - include/bitcoin/ssl/wolfssl/wolfio.h \ - include/bitcoin/ssl/wolfssl/wolfssl.h - -include_bitcoin_ssl_wolfssl_openssldir = ${includedir}/bitcoin/ssl/wolfssl/openssl -include_bitcoin_ssl_wolfssl_openssl_HEADERS = \ - include/bitcoin/ssl/wolfssl/openssl/aes.h \ - include/bitcoin/ssl/wolfssl/openssl/asn1.h \ - include/bitcoin/ssl/wolfssl/openssl/bio.h \ - include/bitcoin/ssl/wolfssl/openssl/bn.h \ - include/bitcoin/ssl/wolfssl/openssl/buffer.h \ - include/bitcoin/ssl/wolfssl/openssl/cmac.h \ - include/bitcoin/ssl/wolfssl/openssl/compat_types.h \ - include/bitcoin/ssl/wolfssl/openssl/conf.h \ - include/bitcoin/ssl/wolfssl/openssl/crypto.h \ - include/bitcoin/ssl/wolfssl/openssl/des.h \ - include/bitcoin/ssl/wolfssl/openssl/dh.h \ - include/bitcoin/ssl/wolfssl/openssl/dsa.h \ - include/bitcoin/ssl/wolfssl/openssl/ec.h \ - include/bitcoin/ssl/wolfssl/openssl/ec25519.h \ - include/bitcoin/ssl/wolfssl/openssl/ec448.h \ - include/bitcoin/ssl/wolfssl/openssl/ecdh.h \ - include/bitcoin/ssl/wolfssl/openssl/ecdsa.h \ - include/bitcoin/ssl/wolfssl/openssl/ed25519.h \ - include/bitcoin/ssl/wolfssl/openssl/ed448.h \ - include/bitcoin/ssl/wolfssl/openssl/engine.h \ - include/bitcoin/ssl/wolfssl/openssl/err.h \ - include/bitcoin/ssl/wolfssl/openssl/evp.h \ - include/bitcoin/ssl/wolfssl/openssl/fips_rand.h \ - include/bitcoin/ssl/wolfssl/openssl/hmac.h \ - include/bitcoin/ssl/wolfssl/openssl/kdf.h \ - include/bitcoin/ssl/wolfssl/openssl/lhash.h \ - include/bitcoin/ssl/wolfssl/openssl/md4.h \ - include/bitcoin/ssl/wolfssl/openssl/md5.h \ - include/bitcoin/ssl/wolfssl/openssl/modes.h \ - include/bitcoin/ssl/wolfssl/openssl/obj_mac.h \ - include/bitcoin/ssl/wolfssl/openssl/objects.h \ - include/bitcoin/ssl/wolfssl/openssl/opensslv.h \ - include/bitcoin/ssl/wolfssl/openssl/pem.h \ - include/bitcoin/ssl/wolfssl/openssl/pkcs12.h \ - include/bitcoin/ssl/wolfssl/openssl/pkcs7.h \ - include/bitcoin/ssl/wolfssl/openssl/rand.h \ - include/bitcoin/ssl/wolfssl/openssl/rc4.h \ - include/bitcoin/ssl/wolfssl/openssl/ripemd.h \ - include/bitcoin/ssl/wolfssl/openssl/rsa.h \ - include/bitcoin/ssl/wolfssl/openssl/sha.h \ - include/bitcoin/ssl/wolfssl/openssl/sha3.h \ - include/bitcoin/ssl/wolfssl/openssl/ssl.h \ - include/bitcoin/ssl/wolfssl/openssl/stack.h \ - include/bitcoin/ssl/wolfssl/openssl/tls1.h \ - include/bitcoin/ssl/wolfssl/openssl/x509.h \ - include/bitcoin/ssl/wolfssl/openssl/x509_vfy.h \ - include/bitcoin/ssl/wolfssl/openssl/x509v3.h - -include_bitcoin_ssl_wolfssl_wolfcryptdir = ${includedir}/bitcoin/ssl/wolfssl/wolfcrypt -include_bitcoin_ssl_wolfssl_wolfcrypt_HEADERS = \ - include/bitcoin/ssl/wolfssl/wolfcrypt/aes.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/arc4.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/ascon.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/asn.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/asn_public.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/blake2.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/camellia.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/chacha.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/chacha20_poly1305.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/cmac.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/coding.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/cpuid.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/cryptocb.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/curve25519.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/curve448.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/des3.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/dh.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/dsa.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/ecc.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/ed25519.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/ed448.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/error-crypt.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/fe_operations.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/fips_test.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/hash.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/hmac.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/hpke.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/kdf.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/libwolfssl_sources.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/logging.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/md2.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/md4.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/md5.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/mem_track.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/memory.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/misc.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/oid_sum.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/pkcs12.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/pkcs7.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/poly1305.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/pwdbased.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/random.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/rc2.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/ripemd.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/rsa.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/settings.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/sha.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/sha256.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/sha3.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/sha512.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/signature.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/siphash.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/sp_int.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/srp.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/types.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/user_settings.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/visibility.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/wc_encrypt.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/wc_port.h \ - include/bitcoin/ssl/wolfssl/wolfcrypt/wolfmath.h +include_bitcoin_network_ssl_openssldir = ${includedir}/bitcoin/network/ssl/openssl +include_bitcoin_network_ssl_openssl_HEADERS = \ + 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_wolfssldir = ${includedir}/bitcoin/network/ssl/wolfssl +include_bitcoin_network_ssl_wolfssl_HEADERS = \ + 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_openssldir = ${includedir}/bitcoin/network/ssl/wolfssl/openssl +include_bitcoin_network_ssl_wolfssl_openssl_HEADERS = \ + 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_wolfcryptdir = ${includedir}/bitcoin/network/ssl/wolfssl/wolfcrypt +include_bitcoin_network_ssl_wolfssl_wolfcrypt_HEADERS = \ + 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 diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt index 91e836500..8cf4ca289 100644 --- a/builds/cmake/CMakeLists.txt +++ b/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. diff --git a/builds/msvc/vs2022/libbitcoin-network.import.props b/builds/msvc/vs2022/libbitcoin-network.import.props index 2f5c4fee0..fda00c043 100644 --- a/builds/msvc/vs2022/libbitcoin-network.import.props +++ b/builds/msvc/vs2022/libbitcoin-network.import.props @@ -30,7 +30,7 @@ $(ProjectDir)..\..\..\..\..\libbitcoin-network\include\;%(AdditionalIncludeDirectories) - $(ProjectDir)..\..\..\..\..\libbitcoin-network\include\bitcoin\ssl\;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\..\..\..\libbitcoin-network\include\bitcoin\network\ssl\;%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) BCT_STATIC;%(PreprocessorDefinitions) WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions) diff --git a/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.props b/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.props index 31159e00a..4818a2181 100644 --- a/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.props +++ b/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.props @@ -26,7 +26,7 @@ $(RepoRoot)include\;%(AdditionalIncludeDirectories) - $(RepoRoot)include\bitcoin\ssl\;%(AdditionalIncludeDirectories) + $(RepoRoot)include\bitcoin\network\ssl\;%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) false BCT_DLL;%(PreprocessorDefinitions) @@ -42,10 +42,10 @@ true - true + true - true + true diff --git a/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj b/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj index 3cde6396d..c014c35fe 100644 --- a/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj +++ b/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj @@ -121,7 +121,7 @@ - + @@ -422,134 +422,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj.filters b/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj.filters index c8a27b68d..b74c477d8 100644 --- a/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj.filters +++ b/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj.filters @@ -17,19 +17,19 @@ {564EB540-D6B6-425C-0000-000000000005} - {564EB540-D6B6-425C-0000-000000000007} + {564EB540-D6B6-425C-0000-000000000006} {564EB540-D6B6-425C-0000-000000000002} - {564EB540-D6B6-425C-0000-000000000008} + {564EB540-D6B6-425C-0000-000000000007} - {564EB540-D6B6-425C-0000-000000000009} + {564EB540-D6B6-425C-0000-000000000008} - {564EB540-D6B6-425C-0000-000000000010} + {564EB540-D6B6-425C-0000-000000000009} {564EB540-D6B6-425C-0000-000000000003} @@ -50,13 +50,13 @@ {564EB540-D6B6-425C-0000-000000000006} - {564EB540-D6B6-425C-0000-0000000000A1} + {564EB540-D6B6-425C-0000-000000000010} - {564EB540-D6B6-425C-0000-0000000000B1} + {564EB540-D6B6-425C-0000-0000000000A1} - {564EB540-D6B6-425C-0000-0000000000C1} + {564EB540-D6B6-425C-0000-0000000000B1} {564EB540-D6B6-425C-0000-000000000009} @@ -80,33 +80,33 @@ {564EB540-D6B6-425C-0000-0000000000D2} - {564EB540-D6B6-425C-0000-0000000000D1} + {564EB540-D6B6-425C-0000-0000000000C1} - {564EB540-D6B6-425C-0000-0000000000E1} + {564EB540-D6B6-425C-0000-0000000000D1} - {564EB540-D6B6-425C-0000-0000000000F1} + {564EB540-D6B6-425C-0000-0000000000E1} - - {564EB540-D6B6-425C-0000-000000000006} + + {564EB540-D6B6-425C-0000-0000000000F1} - + {564EB540-D6B6-425C-0000-0000000000E2} - + {564EB540-D6B6-425C-0000-0000000000F2} - + {564EB540-D6B6-425C-0000-000000000004} - + {564EB540-D6B6-425C-0000-000000000003} - + {564EB540-D6B6-425C-0000-000000000005} - + {564EB540-D6B6-425C-0000-000000000006} @@ -168,8 +168,8 @@ - - include\bitcoin\ssl\wolfcrypt\src + + include\bitcoin\network\ssl\wolfcrypt\src src\async @@ -1031,389 +1031,389 @@ include\bitcoin\network - - include\bitcoin\network + + include\bitcoin\network\ssl\openssl - - include\bitcoin\ssl\openssl + + include\bitcoin\network\ssl\openssl - - include\bitcoin\ssl\openssl + + include\bitcoin\network\ssl\openssl - - include\bitcoin\ssl\openssl + + include\bitcoin\network\ssl\openssl - - include\bitcoin\ssl\openssl + + include\bitcoin\network\ssl\openssl - - include\bitcoin\ssl\openssl + + include\bitcoin\network\ssl\openssl - - include\bitcoin\ssl\openssl + + include\bitcoin\network\ssl\openssl - - include\bitcoin\ssl\openssl + + include\bitcoin\network\ssl\openssl - - include\bitcoin\ssl\openssl + + include\bitcoin\network\ssl\openssl - - include\bitcoin\ssl\openssl + + include\bitcoin\network\ssl\wolfssl - - include\bitcoin\ssl\wolfssl + + include\bitcoin\network\ssl\wolfssl - - include\bitcoin\ssl\wolfssl + + include\bitcoin\network\ssl\wolfssl - - include\bitcoin\ssl\wolfssl + + include\bitcoin\network\ssl\wolfssl - - include\bitcoin\ssl\wolfssl + + include\bitcoin\network\ssl\wolfssl - - include\bitcoin\ssl\wolfssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl\openssl - - include\bitcoin\ssl\wolfssl\openssl + + include\bitcoin\network\ssl\wolfssl - - include\bitcoin\ssl\wolfssl + + include\bitcoin\network\ssl\wolfssl - - include\bitcoin\ssl\wolfssl + + include\bitcoin\network\ssl\wolfssl - - include\bitcoin\ssl\wolfssl + + include\bitcoin\network\ssl\wolfssl - - include\bitcoin\ssl\wolfssl + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl\wolfcrypt - - include\bitcoin\ssl\wolfssl\wolfcrypt + + include\bitcoin\network\ssl\wolfssl - - include\bitcoin\ssl\wolfssl + + include\bitcoin\network\ssl\wolfssl - - include\bitcoin\ssl\wolfssl + + include\bitcoin\network diff --git a/include/bitcoin/network.hpp b/include/bitcoin/network.hpp index 107bca133..02c8b9634 100644 --- a/include/bitcoin/network.hpp +++ b/include/bitcoin/network.hpp @@ -164,5 +164,132 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif diff --git a/include/bitcoin/network/have.hpp b/include/bitcoin/network/have.hpp index e32e4aa99..b7d0ec988 100644 --- a/include/bitcoin/network/have.hpp +++ b/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 diff --git a/include/bitcoin/ssl/openssl/conf.h b/include/bitcoin/network/ssl/openssl/conf.h similarity index 100% rename from include/bitcoin/ssl/openssl/conf.h rename to include/bitcoin/network/ssl/openssl/conf.h diff --git a/include/bitcoin/ssl/openssl/dh.h b/include/bitcoin/network/ssl/openssl/dh.h similarity index 100% rename from include/bitcoin/ssl/openssl/dh.h rename to include/bitcoin/network/ssl/openssl/dh.h diff --git a/include/bitcoin/ssl/openssl/engine.h b/include/bitcoin/network/ssl/openssl/engine.h similarity index 100% rename from include/bitcoin/ssl/openssl/engine.h rename to include/bitcoin/network/ssl/openssl/engine.h diff --git a/include/bitcoin/ssl/openssl/err.h b/include/bitcoin/network/ssl/openssl/err.h similarity index 100% rename from include/bitcoin/ssl/openssl/err.h rename to include/bitcoin/network/ssl/openssl/err.h diff --git a/include/bitcoin/ssl/openssl/openssl.h b/include/bitcoin/network/ssl/openssl/openssl.h similarity index 100% rename from include/bitcoin/ssl/openssl/openssl.h rename to include/bitcoin/network/ssl/openssl/openssl.h diff --git a/include/bitcoin/ssl/openssl/rsa.h b/include/bitcoin/network/ssl/openssl/rsa.h similarity index 100% rename from include/bitcoin/ssl/openssl/rsa.h rename to include/bitcoin/network/ssl/openssl/rsa.h diff --git a/include/bitcoin/ssl/openssl/ssl.h b/include/bitcoin/network/ssl/openssl/ssl.h similarity index 100% rename from include/bitcoin/ssl/openssl/ssl.h rename to include/bitcoin/network/ssl/openssl/ssl.h diff --git a/include/bitcoin/ssl/openssl/x509.h b/include/bitcoin/network/ssl/openssl/x509.h similarity index 100% rename from include/bitcoin/ssl/openssl/x509.h rename to include/bitcoin/network/ssl/openssl/x509.h diff --git a/include/bitcoin/ssl/openssl/x509v3.h b/include/bitcoin/network/ssl/openssl/x509v3.h similarity index 100% rename from include/bitcoin/ssl/openssl/x509v3.h rename to include/bitcoin/network/ssl/openssl/x509v3.h diff --git a/include/bitcoin/ssl/wolfcrypt/src/misc.c b/include/bitcoin/network/ssl/wolfcrypt/src/misc.c similarity index 100% rename from include/bitcoin/ssl/wolfcrypt/src/misc.c rename to include/bitcoin/network/ssl/wolfcrypt/src/misc.c diff --git a/include/bitcoin/ssl/wolfssl/callbacks.h b/include/bitcoin/network/ssl/wolfssl/callbacks.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/callbacks.h rename to include/bitcoin/network/ssl/wolfssl/callbacks.h diff --git a/include/bitcoin/ssl/wolfssl/certs_test.h b/include/bitcoin/network/ssl/wolfssl/certs_test.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/certs_test.h rename to include/bitcoin/network/ssl/wolfssl/certs_test.h diff --git a/include/bitcoin/ssl/wolfssl/error-ssl.h b/include/bitcoin/network/ssl/wolfssl/error-ssl.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/error-ssl.h rename to include/bitcoin/network/ssl/wolfssl/error-ssl.h diff --git a/include/bitcoin/ssl/wolfssl/internal.h b/include/bitcoin/network/ssl/wolfssl/internal.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/internal.h rename to include/bitcoin/network/ssl/wolfssl/internal.h diff --git a/include/bitcoin/ssl/wolfssl/ocsp.h b/include/bitcoin/network/ssl/wolfssl/ocsp.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/ocsp.h rename to include/bitcoin/network/ssl/wolfssl/ocsp.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/aes.h b/include/bitcoin/network/ssl/wolfssl/openssl/aes.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/aes.h rename to include/bitcoin/network/ssl/wolfssl/openssl/aes.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/asn1.h b/include/bitcoin/network/ssl/wolfssl/openssl/asn1.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/asn1.h rename to include/bitcoin/network/ssl/wolfssl/openssl/asn1.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/bio.h b/include/bitcoin/network/ssl/wolfssl/openssl/bio.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/bio.h rename to include/bitcoin/network/ssl/wolfssl/openssl/bio.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/bn.h b/include/bitcoin/network/ssl/wolfssl/openssl/bn.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/bn.h rename to include/bitcoin/network/ssl/wolfssl/openssl/bn.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/buffer.h b/include/bitcoin/network/ssl/wolfssl/openssl/buffer.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/buffer.h rename to include/bitcoin/network/ssl/wolfssl/openssl/buffer.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/cmac.h b/include/bitcoin/network/ssl/wolfssl/openssl/cmac.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/cmac.h rename to include/bitcoin/network/ssl/wolfssl/openssl/cmac.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/compat_types.h b/include/bitcoin/network/ssl/wolfssl/openssl/compat_types.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/compat_types.h rename to include/bitcoin/network/ssl/wolfssl/openssl/compat_types.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/conf.h b/include/bitcoin/network/ssl/wolfssl/openssl/conf.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/conf.h rename to include/bitcoin/network/ssl/wolfssl/openssl/conf.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/crypto.h b/include/bitcoin/network/ssl/wolfssl/openssl/crypto.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/crypto.h rename to include/bitcoin/network/ssl/wolfssl/openssl/crypto.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/des.h b/include/bitcoin/network/ssl/wolfssl/openssl/des.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/des.h rename to include/bitcoin/network/ssl/wolfssl/openssl/des.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/dh.h b/include/bitcoin/network/ssl/wolfssl/openssl/dh.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/dh.h rename to include/bitcoin/network/ssl/wolfssl/openssl/dh.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/dsa.h b/include/bitcoin/network/ssl/wolfssl/openssl/dsa.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/dsa.h rename to include/bitcoin/network/ssl/wolfssl/openssl/dsa.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/ec.h b/include/bitcoin/network/ssl/wolfssl/openssl/ec.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/ec.h rename to include/bitcoin/network/ssl/wolfssl/openssl/ec.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/ec25519.h b/include/bitcoin/network/ssl/wolfssl/openssl/ec25519.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/ec25519.h rename to include/bitcoin/network/ssl/wolfssl/openssl/ec25519.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/ec448.h b/include/bitcoin/network/ssl/wolfssl/openssl/ec448.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/ec448.h rename to include/bitcoin/network/ssl/wolfssl/openssl/ec448.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/ecdh.h b/include/bitcoin/network/ssl/wolfssl/openssl/ecdh.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/ecdh.h rename to include/bitcoin/network/ssl/wolfssl/openssl/ecdh.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/ecdsa.h b/include/bitcoin/network/ssl/wolfssl/openssl/ecdsa.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/ecdsa.h rename to include/bitcoin/network/ssl/wolfssl/openssl/ecdsa.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/ed25519.h b/include/bitcoin/network/ssl/wolfssl/openssl/ed25519.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/ed25519.h rename to include/bitcoin/network/ssl/wolfssl/openssl/ed25519.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/ed448.h b/include/bitcoin/network/ssl/wolfssl/openssl/ed448.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/ed448.h rename to include/bitcoin/network/ssl/wolfssl/openssl/ed448.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/engine.h b/include/bitcoin/network/ssl/wolfssl/openssl/engine.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/engine.h rename to include/bitcoin/network/ssl/wolfssl/openssl/engine.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/err.h b/include/bitcoin/network/ssl/wolfssl/openssl/err.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/err.h rename to include/bitcoin/network/ssl/wolfssl/openssl/err.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/evp.h b/include/bitcoin/network/ssl/wolfssl/openssl/evp.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/evp.h rename to include/bitcoin/network/ssl/wolfssl/openssl/evp.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/fips_rand.h b/include/bitcoin/network/ssl/wolfssl/openssl/fips_rand.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/fips_rand.h rename to include/bitcoin/network/ssl/wolfssl/openssl/fips_rand.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/hmac.h b/include/bitcoin/network/ssl/wolfssl/openssl/hmac.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/hmac.h rename to include/bitcoin/network/ssl/wolfssl/openssl/hmac.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/kdf.h b/include/bitcoin/network/ssl/wolfssl/openssl/kdf.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/kdf.h rename to include/bitcoin/network/ssl/wolfssl/openssl/kdf.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/lhash.h b/include/bitcoin/network/ssl/wolfssl/openssl/lhash.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/lhash.h rename to include/bitcoin/network/ssl/wolfssl/openssl/lhash.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/md4.h b/include/bitcoin/network/ssl/wolfssl/openssl/md4.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/md4.h rename to include/bitcoin/network/ssl/wolfssl/openssl/md4.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/md5.h b/include/bitcoin/network/ssl/wolfssl/openssl/md5.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/md5.h rename to include/bitcoin/network/ssl/wolfssl/openssl/md5.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/modes.h b/include/bitcoin/network/ssl/wolfssl/openssl/modes.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/modes.h rename to include/bitcoin/network/ssl/wolfssl/openssl/modes.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/obj_mac.h b/include/bitcoin/network/ssl/wolfssl/openssl/obj_mac.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/obj_mac.h rename to include/bitcoin/network/ssl/wolfssl/openssl/obj_mac.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/objects.h b/include/bitcoin/network/ssl/wolfssl/openssl/objects.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/objects.h rename to include/bitcoin/network/ssl/wolfssl/openssl/objects.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/opensslv.h b/include/bitcoin/network/ssl/wolfssl/openssl/opensslv.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/opensslv.h rename to include/bitcoin/network/ssl/wolfssl/openssl/opensslv.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/pem.h b/include/bitcoin/network/ssl/wolfssl/openssl/pem.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/pem.h rename to include/bitcoin/network/ssl/wolfssl/openssl/pem.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/pkcs12.h b/include/bitcoin/network/ssl/wolfssl/openssl/pkcs12.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/pkcs12.h rename to include/bitcoin/network/ssl/wolfssl/openssl/pkcs12.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/pkcs7.h b/include/bitcoin/network/ssl/wolfssl/openssl/pkcs7.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/pkcs7.h rename to include/bitcoin/network/ssl/wolfssl/openssl/pkcs7.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/rand.h b/include/bitcoin/network/ssl/wolfssl/openssl/rand.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/rand.h rename to include/bitcoin/network/ssl/wolfssl/openssl/rand.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/rc4.h b/include/bitcoin/network/ssl/wolfssl/openssl/rc4.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/rc4.h rename to include/bitcoin/network/ssl/wolfssl/openssl/rc4.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/ripemd.h b/include/bitcoin/network/ssl/wolfssl/openssl/ripemd.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/ripemd.h rename to include/bitcoin/network/ssl/wolfssl/openssl/ripemd.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/rsa.h b/include/bitcoin/network/ssl/wolfssl/openssl/rsa.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/rsa.h rename to include/bitcoin/network/ssl/wolfssl/openssl/rsa.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/sha.h b/include/bitcoin/network/ssl/wolfssl/openssl/sha.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/sha.h rename to include/bitcoin/network/ssl/wolfssl/openssl/sha.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/sha3.h b/include/bitcoin/network/ssl/wolfssl/openssl/sha3.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/sha3.h rename to include/bitcoin/network/ssl/wolfssl/openssl/sha3.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/ssl.h b/include/bitcoin/network/ssl/wolfssl/openssl/ssl.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/ssl.h rename to include/bitcoin/network/ssl/wolfssl/openssl/ssl.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/stack.h b/include/bitcoin/network/ssl/wolfssl/openssl/stack.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/stack.h rename to include/bitcoin/network/ssl/wolfssl/openssl/stack.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/tls1.h b/include/bitcoin/network/ssl/wolfssl/openssl/tls1.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/tls1.h rename to include/bitcoin/network/ssl/wolfssl/openssl/tls1.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/x509.h b/include/bitcoin/network/ssl/wolfssl/openssl/x509.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/x509.h rename to include/bitcoin/network/ssl/wolfssl/openssl/x509.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/x509_vfy.h b/include/bitcoin/network/ssl/wolfssl/openssl/x509_vfy.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/x509_vfy.h rename to include/bitcoin/network/ssl/wolfssl/openssl/x509_vfy.h diff --git a/include/bitcoin/ssl/wolfssl/openssl/x509v3.h b/include/bitcoin/network/ssl/wolfssl/openssl/x509v3.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/openssl/x509v3.h rename to include/bitcoin/network/ssl/wolfssl/openssl/x509v3.h diff --git a/include/bitcoin/ssl/wolfssl/options.h b/include/bitcoin/network/ssl/wolfssl/options.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/options.h rename to include/bitcoin/network/ssl/wolfssl/options.h diff --git a/include/bitcoin/ssl/wolfssl/ssl.h b/include/bitcoin/network/ssl/wolfssl/ssl.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/ssl.h rename to include/bitcoin/network/ssl/wolfssl/ssl.h diff --git a/include/bitcoin/ssl/wolfssl/test.h b/include/bitcoin/network/ssl/wolfssl/test.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/test.h rename to include/bitcoin/network/ssl/wolfssl/test.h diff --git a/include/bitcoin/ssl/wolfssl/version.h b/include/bitcoin/network/ssl/wolfssl/version.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/version.h rename to include/bitcoin/network/ssl/wolfssl/version.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/aes.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/aes.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/aes.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/aes.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/arc4.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/arc4.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/arc4.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/arc4.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/ascon.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/ascon.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/ascon.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/ascon.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/asn.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/asn.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/asn.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/asn.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/asn_public.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/asn_public.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/asn_public.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/asn_public.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/blake2.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/blake2.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/blake2.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/blake2.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/camellia.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/camellia.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/camellia.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/camellia.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/chacha.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/chacha.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/chacha.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/chacha.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/chacha20_poly1305.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/chacha20_poly1305.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/chacha20_poly1305.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/chacha20_poly1305.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/cmac.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/cmac.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/cmac.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/cmac.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/coding.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/coding.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/coding.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/coding.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/cpuid.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/cpuid.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/cpuid.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/cpuid.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/cryptocb.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/cryptocb.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/cryptocb.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/cryptocb.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/curve25519.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/curve25519.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/curve25519.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/curve25519.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/curve448.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/curve448.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/curve448.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/curve448.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/des3.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/des3.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/des3.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/des3.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/dh.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/dh.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/dh.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/dh.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/dsa.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/dsa.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/dsa.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/dsa.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/ecc.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/ecc.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/ecc.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/ecc.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/ed25519.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/ed25519.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/ed25519.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/ed25519.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/ed448.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/ed448.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/ed448.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/ed448.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/error-crypt.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/error-crypt.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/error-crypt.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/error-crypt.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/fe_operations.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/fe_operations.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/fe_operations.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/fe_operations.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/fips_test.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/fips_test.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/fips_test.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/fips_test.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/hash.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/hash.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/hash.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/hash.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/hmac.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/hmac.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/hmac.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/hmac.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/hpke.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/hpke.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/hpke.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/hpke.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/kdf.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/kdf.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/kdf.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/kdf.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/libwolfssl_sources.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/libwolfssl_sources.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/libwolfssl_sources.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/libwolfssl_sources.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/logging.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/logging.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/logging.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/logging.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/md2.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/md2.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/md2.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/md2.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/md4.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/md4.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/md4.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/md4.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/md5.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/md5.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/md5.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/md5.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/mem_track.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/mem_track.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/mem_track.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/mem_track.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/memory.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/memory.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/memory.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/memory.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/misc.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/misc.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/misc.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/misc.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/oid_sum.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/oid_sum.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/oid_sum.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/oid_sum.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/pkcs12.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/pkcs12.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/pkcs12.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/pkcs12.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/pkcs7.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/pkcs7.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/pkcs7.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/pkcs7.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/poly1305.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/poly1305.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/poly1305.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/poly1305.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/pwdbased.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/pwdbased.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/pwdbased.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/pwdbased.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/random.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/random.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/random.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/random.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/rc2.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/rc2.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/rc2.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/rc2.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/ripemd.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/ripemd.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/ripemd.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/ripemd.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/rsa.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/rsa.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/rsa.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/rsa.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/settings.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/settings.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/settings.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/settings.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/sha.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/sha.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/sha.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/sha.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/sha256.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/sha256.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/sha256.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/sha256.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/sha3.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/sha3.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/sha3.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/sha3.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/sha512.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/sha512.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/sha512.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/sha512.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/signature.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/signature.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/signature.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/signature.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/siphash.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/siphash.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/siphash.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/siphash.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/sp_int.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/sp_int.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/sp_int.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/sp_int.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/srp.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/srp.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/srp.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/srp.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/types.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/types.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/types.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/types.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/user_settings.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/user_settings.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/user_settings.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/user_settings.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/visibility.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/visibility.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/visibility.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/visibility.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/wc_encrypt.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/wc_encrypt.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/wc_encrypt.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/wc_encrypt.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/wc_port.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/wc_port.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/wc_port.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/wc_port.h diff --git a/include/bitcoin/ssl/wolfssl/wolfcrypt/wolfmath.h b/include/bitcoin/network/ssl/wolfssl/wolfcrypt/wolfmath.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfcrypt/wolfmath.h rename to include/bitcoin/network/ssl/wolfssl/wolfcrypt/wolfmath.h diff --git a/include/bitcoin/ssl/wolfssl/wolfio.h b/include/bitcoin/network/ssl/wolfssl/wolfio.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfio.h rename to include/bitcoin/network/ssl/wolfssl/wolfio.h diff --git a/include/bitcoin/ssl/wolfssl/wolfssl.h b/include/bitcoin/network/ssl/wolfssl/wolfssl.h similarity index 100% rename from include/bitcoin/ssl/wolfssl/wolfssl.h rename to include/bitcoin/network/ssl/wolfssl/wolfssl.h diff --git a/test/messages/peer/detail/alert.cpp b/test/messages/peer/detail/alert.cpp index 325cf7e3e..bdd7e9686 100644 --- a/test/messages/peer/detail/alert.cpp +++ b/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)