Compare commits
No commits in common. "8d544e31ded193a0114bdf07248b082395bb558e" and "a9efb96837b2553218212080108372c83d2fe089" have entirely different histories.
8d544e31de
...
a9efb96837
@ -266,7 +266,6 @@ enum class IrcCommand
|
|||||||
INVITE,
|
INVITE,
|
||||||
JOIN,
|
JOIN,
|
||||||
KICK,
|
KICK,
|
||||||
KILL,
|
|
||||||
MODE,
|
MODE,
|
||||||
NICK,
|
NICK,
|
||||||
NOTICE,
|
NOTICE,
|
||||||
|
@ -268,7 +268,6 @@ ERROR, IrcCommand::ERROR, 1, 1
|
|||||||
INVITE, IrcCommand::INVITE, 2, 2
|
INVITE, IrcCommand::INVITE, 2, 2
|
||||||
JOIN, IrcCommand::JOIN, 1, 3
|
JOIN, IrcCommand::JOIN, 1, 3
|
||||||
KICK, IrcCommand::KICK, 3, 3
|
KICK, IrcCommand::KICK, 3, 3
|
||||||
KILL, IrcCommand::KILL, 2, 2
|
|
||||||
MODE, IrcCommand::MODE, 2, 15
|
MODE, IrcCommand::MODE, 2, 15
|
||||||
NICK, IrcCommand::NICK, 1, 1
|
NICK, IrcCommand::NICK, 1, 1
|
||||||
NOTICE, IrcCommand::NOTICE, 2, 2
|
NOTICE, IrcCommand::NOTICE, 2, 2
|
||||||
|
@ -1,67 +0,0 @@
|
|||||||
#include "openssl_utils.hpp"
|
|
||||||
|
|
||||||
#include "c_callback.hpp"
|
|
||||||
|
|
||||||
#include <openssl/err.h>
|
|
||||||
#include <openssl/pem.h>
|
|
||||||
|
|
||||||
#include <boost/log/trivial.hpp>
|
|
||||||
|
|
||||||
#include <cstdio>
|
|
||||||
|
|
||||||
using namespace std::literals;
|
|
||||||
|
|
||||||
auto log_openssl_errors(const std::string_view prefix) -> void
|
|
||||||
{
|
|
||||||
auto err_cb = [prefix](const char *str, size_t len) -> int {
|
|
||||||
BOOST_LOG_TRIVIAL(error) << prefix << std::string_view{str, len};
|
|
||||||
return 0;
|
|
||||||
};
|
|
||||||
ERR_print_errors_cb(CCallback<decltype(err_cb)>::invoke, &err_cb);
|
|
||||||
}
|
|
||||||
|
|
||||||
auto cert_from_file(const std::string &filename) -> X509_Ref
|
|
||||||
{
|
|
||||||
X509_Ref cert;
|
|
||||||
if (const auto fp = fopen(filename.c_str(), "r"))
|
|
||||||
{
|
|
||||||
cert.reset(PEM_read_X509(fp, nullptr, nullptr, nullptr));
|
|
||||||
if (cert.get() == nullptr)
|
|
||||||
{
|
|
||||||
log_openssl_errors("Reading certificate: "sv);
|
|
||||||
}
|
|
||||||
fclose(fp);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
const auto err = strerror(errno);
|
|
||||||
BOOST_LOG_TRIVIAL(error) << "Opening certificate: " << err;
|
|
||||||
}
|
|
||||||
return cert;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto key_from_file(const std::string &filename, const std::string_view password) -> EVP_PKEY_Ref
|
|
||||||
{
|
|
||||||
EVP_PKEY_Ref key;
|
|
||||||
if (const auto fp = fopen(filename.c_str(), "r"))
|
|
||||||
{
|
|
||||||
auto cb = [password](char * const buf, int const size, int) -> int {
|
|
||||||
if (size < password.size()) { return -1; }
|
|
||||||
std::copy(password.begin(), password.end(), buf);
|
|
||||||
return password.size();
|
|
||||||
};
|
|
||||||
|
|
||||||
key.reset(PEM_read_PrivateKey(fp, nullptr, CCallback<decltype(cb)>::invoke, &cb));
|
|
||||||
if (key.get() == nullptr)
|
|
||||||
{
|
|
||||||
log_openssl_errors("Reading private key: "sv);
|
|
||||||
}
|
|
||||||
fclose(fp);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
const auto err = strerror(errno);
|
|
||||||
BOOST_LOG_TRIVIAL(error) << "Opening private key: " << err;
|
|
||||||
}
|
|
||||||
return key;
|
|
||||||
}
|
|
@ -1,9 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
#include "ref.hpp"
|
|
||||||
|
|
||||||
#include <string_view>
|
|
||||||
|
|
||||||
auto log_openssl_errors(const std::string_view prefix) -> void;
|
|
||||||
auto key_from_file(const std::string &filename, const std::string_view password) -> EVP_PKEY_Ref;
|
|
||||||
auto cert_from_file(const std::string &filename) -> X509_Ref;
|
|
Loading…
x
Reference in New Issue
Block a user