diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-03-10 20:23:26 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-03-10 20:23:26 +0200 |
| commit | d281b81962db186fb3e99dcfe56d9463f29b9bbe (patch) | |
| tree | cff7cb18175dcfe648f80499a6176ae22f0481ea /contrib/epee/include/net | |
| parent | Merge pull request #5264 (diff) | |
| parent | Fix startup errors with SSL cert generation (diff) | |
| download | monero-d281b81962db186fb3e99dcfe56d9463f29b9bbe.tar.xz | |
Merge pull request #5257
b8c2e21c Fix startup errors with SSL cert generation (Howard Chu)
Diffstat (limited to 'contrib/epee/include/net')
| -rw-r--r-- | contrib/epee/include/net/net_ssl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/contrib/epee/include/net/net_ssl.h b/contrib/epee/include/net/net_ssl.h index ca53d3667..f7b102164 100644 --- a/contrib/epee/include/net/net_ssl.h +++ b/contrib/epee/include/net/net_ssl.h @@ -59,7 +59,6 @@ namespace net_utils bool is_ssl(const unsigned char *data, size_t len); ssl_context_t create_ssl_context(const std::pair<std::string, std::string> &private_key_and_certificate_path, std::list<std::string> allowed_certificates, std::vector<std::vector<uint8_t>> allowed_fingerprints, bool allow_any_cert); void use_ssl_certificate(ssl_context_t &ssl_context, const std::pair<std::string, std::string> &private_key_and_certificate_path); - bool create_ssl_certificate(std::string &pkey_buffer, std::string &cert_buffer); bool is_certificate_allowed(boost::asio::ssl::verify_context &ctx, const ssl_context_t &ssl_context); bool ssl_handshake(boost::asio::ssl::stream<boost::asio::ip::tcp::socket> &socket, boost::asio::ssl::stream_base::handshake_type type, const epee::net_utils::ssl_context_t &ssl_context); bool ssl_support_from_string(ssl_support_t &ssl, boost::string_ref s); |