aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/depends/packages/cppzmq.mk15
-rw-r--r--contrib/depends/packages/sodium.mk3
-rw-r--r--contrib/depends/patches/sodium/disable-glibc-getrandom-getentropy.patch25
-rw-r--r--contrib/epee/demo/iface/transport_defs.h2
-rw-r--r--contrib/epee/include/console_handler.h10
-rw-r--r--contrib/epee/include/hex.h17
-rw-r--r--contrib/epee/include/net/http_protocol_handler.h2
-rw-r--r--contrib/epee/include/net/levin_protocol_handler_async.h7
-rw-r--r--contrib/epee/include/net/munin_connection_handler.h2
-rw-r--r--contrib/epee/include/storages/parserse_base_utils.h2
-rw-r--r--contrib/epee/include/storages/portable_storage_base.h7
-rw-r--r--contrib/epee/include/string_tools.h43
-rw-r--r--contrib/epee/src/hex.cpp41
-rw-r--r--contrib/epee/src/net_ssl.cpp8
-rw-r--r--contrib/epee/src/wipeable_string.cpp7
-rwxr-xr-xcontrib/gitian/gitian-build.py7
16 files changed, 127 insertions, 71 deletions
diff --git a/contrib/depends/packages/cppzmq.mk b/contrib/depends/packages/cppzmq.mk
deleted file mode 100644
index 33178f445..000000000
--- a/contrib/depends/packages/cppzmq.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-package=cppzmq
-$(package)_version=4.4.1
-$(package)_download_path=https://github.com/zeromq/cppzmq/archive/
-$(package)_file_name=v$($(package)_version).tar.gz
-$(package)_sha256_hash=117fc1ca24d98dbe1a60c072cde13be863d429134907797f8e03f654ce679385
-$(package)_dependencies=zeromq
-
-define $(package)_stage_cmds
- mkdir $($(package)_staging_prefix_dir)/include &&\
- cp zmq.hpp $($(package)_staging_prefix_dir)/include
-endef
-
-define $(package)_postprocess_cmds
- rm -rf bin share
-endef
diff --git a/contrib/depends/packages/sodium.mk b/contrib/depends/packages/sodium.mk
index 462bd2415..e2ce9b349 100644
--- a/contrib/depends/packages/sodium.mk
+++ b/contrib/depends/packages/sodium.mk
@@ -3,7 +3,7 @@ $(package)_version=1.0.18
$(package)_download_path=https://download.libsodium.org/libsodium/releases/
$(package)_file_name=libsodium-$($(package)_version).tar.gz
$(package)_sha256_hash=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1
-$(package)_patches=fix-whitespace.patch
+$(package)_patches=disable-glibc-getrandom-getentropy.patch fix-whitespace.patch
define $(package)_set_vars
$(package)_config_opts=--enable-static --disable-shared
@@ -13,6 +13,7 @@ $(package)_config_opts_darwin=RANLIB="$(host_prefix)/native/bin/x86_64-apple-dar
endef
define $(package)_config_cmds
+ patch -p1 < $($(package)_patch_dir)/disable-glibc-getrandom-getentropy.patch &&\
./autogen.sh &&\
patch -p1 < $($(package)_patch_dir)/fix-whitespace.patch &&\
$($(package)_autoconf) $($(package)_config_opts) AR_FLAGS=$($(package)_arflags)
diff --git a/contrib/depends/patches/sodium/disable-glibc-getrandom-getentropy.patch b/contrib/depends/patches/sodium/disable-glibc-getrandom-getentropy.patch
new file mode 100644
index 000000000..2f07c1057
--- /dev/null
+++ b/contrib/depends/patches/sodium/disable-glibc-getrandom-getentropy.patch
@@ -0,0 +1,25 @@
+diff --git a/configure.ac b/configure.ac
+index 9e2de27c..0fa85c2d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -807,6 +807,10 @@ AS_IF([test "x$EMSCRIPTEN" = "x"],[
+ # include <sys/random.h>
+ #endif
+ ]], [[
++#ifdef __linux__
++# error getrandom() is currently disabled on Linux to support glibc < 2.25
++#endif
++
+ unsigned char buf;
+ (void) getrandom((void *) &buf, 1U, 0U);
+ ]])],
+@@ -825,6 +829,9 @@ unsigned char buf;
+ # include <sys/random.h>
+ #endif
+ ]], [[
++#ifdef __linux__
++# error getentropy() is currently disabled on Linux to support glibc < 2.25
++#endif
+ #ifdef __APPLE__
+ # error getentropy() is currently disabled on Apple operating systems
+ #endif
diff --git a/contrib/epee/demo/iface/transport_defs.h b/contrib/epee/demo/iface/transport_defs.h
index 8638b5db9..61968ed71 100644
--- a/contrib/epee/demo/iface/transport_defs.h
+++ b/contrib/epee/demo/iface/transport_defs.h
@@ -218,7 +218,7 @@ namespace demo
s.m_subobj.m_str = "subszzzzzzzz";
s.m_list_of_self.push_back(s);
- s.m_storage_entry_int = epee::serialization::storage_entry(uint64_t(22222));;
+ s.m_storage_entry_int = epee::serialization::storage_entry(uint64_t(22222));
s.m_storage_entry_string = epee::serialization::storage_entry(std::string("sdsvsdvs"));
return s;
}
diff --git a/contrib/epee/include/console_handler.h b/contrib/epee/include/console_handler.h
index 1b716fca4..a7788aeb8 100644
--- a/contrib/epee/include/console_handler.h
+++ b/contrib/epee/include/console_handler.h
@@ -606,11 +606,15 @@ eof:
async_console_handler m_console_handler;
public:
~console_handlers_binder() {
- stop_handling();
- if (m_console_thread.get() != nullptr)
+ try
{
- m_console_thread->join();
+ stop_handling();
+ if (m_console_thread.get() != nullptr)
+ {
+ m_console_thread->join();
+ }
}
+ catch (const std::exception &e) { /* ignore */ }
}
bool start_handling(std::function<std::string(void)> prompt, const std::string& usage_string = "", std::function<void(void)> exit_handler = NULL)
diff --git a/contrib/epee/include/hex.h b/contrib/epee/include/hex.h
index 4e8f90786..8443cb92f 100644
--- a/contrib/epee/include/hex.h
+++ b/contrib/epee/include/hex.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2019, The Monero Project
+// Copyright (c) 2017-2020, The Monero Project
//
// All rights reserved.
//
@@ -80,9 +80,20 @@ namespace epee
static void buffer_unchecked(char* out, const span<const std::uint8_t> src) noexcept;
};
+ //! Convert hex in UTF8 encoding to binary
struct from_hex
{
- //! \return An std::vector of unsigned integers from the `src`
- static std::vector<uint8_t> vector(boost::string_ref src);
+ static bool to_string(std::string& out, boost::string_ref src);
+
+ static bool to_buffer(span<std::uint8_t> out, boost::string_ref src) noexcept;
+
+ private:
+ static bool to_buffer_unchecked(std::uint8_t* out, boost::string_ref src) noexcept;
+ };
+
+ //! Convert hex in current C locale encoding to binary
+ struct from_hex_locale
+ {
+ static std::vector<uint8_t> to_vector(boost::string_ref src);
};
}
diff --git a/contrib/epee/include/net/http_protocol_handler.h b/contrib/epee/include/net/http_protocol_handler.h
index 1780f2393..a29f141e8 100644
--- a/contrib/epee/include/net/http_protocol_handler.h
+++ b/contrib/epee/include/net/http_protocol_handler.h
@@ -202,7 +202,7 @@ namespace net_utils
virtual bool thread_init()
{
- return m_config.m_phandler->init_server_thread();;
+ return m_config.m_phandler->init_server_thread();
}
virtual bool thread_deinit()
diff --git a/contrib/epee/include/net/levin_protocol_handler_async.h b/contrib/epee/include/net/levin_protocol_handler_async.h
index 5774c0ba7..1341a4ae6 100644
--- a/contrib/epee/include/net/levin_protocol_handler_async.h
+++ b/contrib/epee/include/net/levin_protocol_handler_async.h
@@ -949,7 +949,12 @@ bool async_protocol_handler_config<t_connection_context>::close(boost::uuids::uu
{
CRITICAL_REGION_LOCAL(m_connects_lock);
async_protocol_handler<t_connection_context>* aph = find_connection(connection_id);
- return 0 != aph ? aph->close() : false;
+ if (!aph)
+ return false;
+ if (!aph->close())
+ return false;
+ m_connects.erase(connection_id);
+ return true;
}
//------------------------------------------------------------------------------------------
template<class t_connection_context>
diff --git a/contrib/epee/include/net/munin_connection_handler.h b/contrib/epee/include/net/munin_connection_handler.h
index 62856bec5..20dc38507 100644
--- a/contrib/epee/include/net/munin_connection_handler.h
+++ b/contrib/epee/include/net/munin_connection_handler.h
@@ -237,7 +237,7 @@ namespace net_utils
return send_hook("Unknown command. Try list, nodes, config, fetch, version or quit\n");
}
- return send_hook("Unknown command. Try list, nodes, config, fetch, version or quit\n");;
+ return send_hook("Unknown command. Try list, nodes, config, fetch, version or quit\n");
}
bool handle_list_command()
diff --git a/contrib/epee/include/storages/parserse_base_utils.h b/contrib/epee/include/storages/parserse_base_utils.h
index 8a498130c..2256f6b83 100644
--- a/contrib/epee/include/storages/parserse_base_utils.h
+++ b/contrib/epee/include/storages/parserse_base_utils.h
@@ -31,6 +31,8 @@
#include <algorithm>
#include <boost/utility/string_ref.hpp>
+#include "misc_log_ex.h"
+
#undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "serialization"
diff --git a/contrib/epee/include/storages/portable_storage_base.h b/contrib/epee/include/storages/portable_storage_base.h
index 40c7524fb..1676f41fb 100644
--- a/contrib/epee/include/storages/portable_storage_base.h
+++ b/contrib/epee/include/storages/portable_storage_base.h
@@ -84,6 +84,13 @@ namespace epee
array_entry_t():m_it(m_array.end()){}
array_entry_t(const array_entry_t& other):m_array(other.m_array), m_it(m_array.end()){}
+ array_entry_t& operator=(const array_entry_t& other)
+ {
+ m_array = other.m_array;
+ m_it = m_array.end();
+ return *this;
+ }
+
const t_entry_type* get_first_val() const
{
m_it = m_array.begin();
diff --git a/contrib/epee/include/string_tools.h b/contrib/epee/include/string_tools.h
index 319c0121b..2d9317d60 100644
--- a/contrib/epee/include/string_tools.h
+++ b/contrib/epee/include/string_tools.h
@@ -42,6 +42,7 @@
#include <type_traits>
#include <boost/lexical_cast.hpp>
#include <boost/algorithm/string/predicate.hpp>
+#include <boost/utility/string_ref.hpp>
#include "misc_log_ex.h"
#include "storages/parserse_base_utils.h"
#include "hex.h"
@@ -69,34 +70,9 @@ namespace string_tools
return to_hex::string(to_byte_span(to_span(src)));
}
//----------------------------------------------------------------------------
- inline bool parse_hexstr_to_binbuff(const epee::span<const char> s, epee::span<char>& res)
+ inline bool parse_hexstr_to_binbuff(const boost::string_ref s, std::string& res)
{
- if (s.size() != res.size() * 2)
- return false;
-
- unsigned char *dst = (unsigned char *)&res[0];
- const unsigned char *src = (const unsigned char *)s.data();
- for(size_t i = 0; i < s.size(); i += 2)
- {
- int tmp = *src++;
- tmp = epee::misc_utils::parse::isx[tmp];
- if (tmp == 0xff) return false;
- int t2 = *src++;
- t2 = epee::misc_utils::parse::isx[t2];
- if (t2 == 0xff) return false;
- *dst++ = (tmp << 4) | t2;
- }
-
- return true;
- }
- //----------------------------------------------------------------------------
- inline bool parse_hexstr_to_binbuff(const std::string& s, std::string& res)
- {
- if (s.size() & 1)
- return false;
- res.resize(s.size() / 2);
- epee::span<char> rspan((char*)&res[0], res.size());
- return parse_hexstr_to_binbuff(epee::to_span(s), rspan);
+ return from_hex::to_string(res, s);
}
//----------------------------------------------------------------------------
PUSH_WARNINGS
@@ -303,23 +279,20 @@ POP_WARNINGS
}
//----------------------------------------------------------------------------
template<class t_pod_type>
- bool hex_to_pod(const std::string& hex_str, t_pod_type& s)
+ bool hex_to_pod(const boost::string_ref hex_str, t_pod_type& s)
{
- static_assert(std::is_pod<t_pod_type>::value, "expected pod type");
- if(sizeof(s)*2 != hex_str.size())
- return false;
- epee::span<char> rspan((char*)&s, sizeof(s));
- return parse_hexstr_to_binbuff(epee::to_span(hex_str), rspan);
+ static_assert(std::is_standard_layout<t_pod_type>(), "expected standard layout type");
+ return from_hex::to_buffer(as_mut_byte_span(s), hex_str);
}
//----------------------------------------------------------------------------
template<class t_pod_type>
- bool hex_to_pod(const std::string& hex_str, tools::scrubbed<t_pod_type>& s)
+ bool hex_to_pod(const boost::string_ref hex_str, tools::scrubbed<t_pod_type>& s)
{
return hex_to_pod(hex_str, unwrap(s));
}
//----------------------------------------------------------------------------
template<class t_pod_type>
- bool hex_to_pod(const std::string& hex_str, epee::mlocked<t_pod_type>& s)
+ bool hex_to_pod(const boost::string_ref hex_str, epee::mlocked<t_pod_type>& s)
{
return hex_to_pod(hex_str, unwrap(s));
}
diff --git a/contrib/epee/src/hex.cpp b/contrib/epee/src/hex.cpp
index 558983f7e..b25ce5421 100644
--- a/contrib/epee/src/hex.cpp
+++ b/contrib/epee/src/hex.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2019, The Monero Project
+// Copyright (c) 2017-2020, The Monero Project
//
// All rights reserved.
//
@@ -33,6 +33,8 @@
#include <ostream>
#include <stdexcept>
+#include "storages/parserse_base_utils.h"
+
namespace epee
{
namespace
@@ -84,7 +86,42 @@ namespace epee
return write_hex(out, src);
}
- std::vector<uint8_t> from_hex::vector(boost::string_ref src)
+
+ bool from_hex::to_string(std::string& out, const boost::string_ref src)
+ {
+ out.resize(src.size() / 2);
+ return to_buffer_unchecked(reinterpret_cast<std::uint8_t*>(&out[0]), src);
+ }
+
+ bool from_hex::to_buffer(span<std::uint8_t> out, const boost::string_ref src) noexcept
+ {
+ if (src.size() / 2 != out.size())
+ return false;
+ return to_buffer_unchecked(out.data(), src);
+ }
+
+ bool from_hex::to_buffer_unchecked(std::uint8_t* dst, const boost::string_ref s) noexcept
+ {
+ if (s.size() % 2 != 0)
+ return false;
+
+ const unsigned char *src = (const unsigned char *)s.data();
+ for(size_t i = 0; i < s.size(); i += 2)
+ {
+ int tmp = *src++;
+ tmp = epee::misc_utils::parse::isx[tmp];
+ if (tmp == 0xff) return false;
+ int t2 = *src++;
+ t2 = epee::misc_utils::parse::isx[t2];
+ if (t2 == 0xff) return false;
+ *dst++ = (tmp << 4) | t2;
+ }
+
+ return true;
+ }
+
+
+ std::vector<uint8_t> from_hex_locale::to_vector(const boost::string_ref src)
{
// should we include a specific character
auto include = [](char input) {
diff --git a/contrib/epee/src/net_ssl.cpp b/contrib/epee/src/net_ssl.cpp
index 946499129..2cf9ea2b6 100644
--- a/contrib/epee/src/net_ssl.cpp
+++ b/contrib/epee/src/net_ssl.cpp
@@ -128,7 +128,7 @@ namespace net_utils
// https://stackoverflow.com/questions/256405/programmatically-create-x509-certificate-using-openssl
bool create_rsa_ssl_certificate(EVP_PKEY *&pkey, X509 *&cert)
{
- MGINFO("Generating SSL certificate");
+ MINFO("Generating SSL certificate");
pkey = EVP_PKEY_new();
if (!pkey)
{
@@ -198,7 +198,7 @@ bool create_rsa_ssl_certificate(EVP_PKEY *&pkey, X509 *&cert)
bool create_ec_ssl_certificate(EVP_PKEY *&pkey, X509 *&cert, int type)
{
- MGINFO("Generating SSL certificate");
+ MINFO("Generating SSL certificate");
pkey = EVP_PKEY_new();
if (!pkey)
{
@@ -289,7 +289,9 @@ ssl_options_t::ssl_options_t(std::vector<std::vector<std::uint8_t>> fingerprints
boost::asio::ssl::context ssl_options_t::create_context() const
{
- boost::asio::ssl::context ssl_context{boost::asio::ssl::context::tls};
+ // note: this enables a lot of old and insecure protocols, which we
+ // promptly disable below - if the result is actually used
+ boost::asio::ssl::context ssl_context{boost::asio::ssl::context::sslv23};
if (!bool(*this))
return ssl_context;
diff --git a/contrib/epee/src/wipeable_string.cpp b/contrib/epee/src/wipeable_string.cpp
index 4209b71bf..4928db172 100644
--- a/contrib/epee/src/wipeable_string.cpp
+++ b/contrib/epee/src/wipeable_string.cpp
@@ -188,13 +188,14 @@ void wipeable_string::split(std::vector<wipeable_string> &fields) const
while (len--)
{
const char c = *ptr++;
- if (c != ' ')
+ const bool space_prev = space;
+ space = std::isspace(c);
+ if (!space)
{
- if (space)
+ if (space_prev)
fields.push_back({});
fields.back().push_back(c);
}
- space = c == ' ';
}
}
diff --git a/contrib/gitian/gitian-build.py b/contrib/gitian/gitian-build.py
index 491488efa..a8140a8a6 100755
--- a/contrib/gitian/gitian-build.py
+++ b/contrib/gitian/gitian-build.py
@@ -36,8 +36,11 @@ def setup():
os.chdir('..')
make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
if args.docker:
- if not subprocess.call(['docker', '--help'], shell=False, stdout=subprocess.DEVNULL):
- print("Please install docker first manually")
+ try:
+ subprocess.check_output(['docker', '--help'])
+ except:
+ print("ERROR: Could not find 'docker' command. Ensure this is in your PATH.")
+ sys.exit(1)
make_image_prog += ['--docker']
elif not args.kvm:
make_image_prog += ['--lxc']
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 15:30:02 +0000