aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/extra
diff options
context:
space:
mode:
authorGravatar Sadie Powell2022-01-25 13:59:42 +0000
committerGravatar Sadie Powell2022-01-25 14:02:36 +0000
commitd79147e7afe2eca34780c607f78b11f8b3dd017d (patch)
treea3f9a145dd53f9c1c268ac9b521ac907b802eab0 /src/modules/extra
parentFix a few Doxygen comment errors. (diff)
Abolish the infernal space before accessibility keywords.
Diffstat (limited to 'src/modules/extra')
-rw-r--r--src/modules/extra/m_argon2.cpp12
-rw-r--r--src/modules/extra/m_geo_maxmind.cpp8
-rw-r--r--src/modules/extra/m_ldap.cpp26
-rw-r--r--src/modules/extra/m_mysql.cpp12
-rw-r--r--src/modules/extra/m_pgsql.cpp10
-rw-r--r--src/modules/extra/m_regex_pcre.cpp8
-rw-r--r--src/modules/extra/m_regex_posix.cpp8
-rw-r--r--src/modules/extra/m_regex_re2.cpp8
-rw-r--r--src/modules/extra/m_sqlite3.cpp8
-rw-r--r--src/modules/extra/m_ssl_gnutls.cpp42
-rw-r--r--src/modules/extra/m_ssl_mbedtls.cpp36
-rw-r--r--src/modules/extra/m_ssl_openssl.cpp16
-rw-r--r--src/modules/extra/m_sslrehashsignal.cpp4
13 files changed, 99 insertions, 99 deletions
diff --git a/src/modules/extra/m_argon2.cpp b/src/modules/extra/m_argon2.cpp
index 80289286e..3df31664c 100644
--- a/src/modules/extra/m_argon2.cpp
+++ b/src/modules/extra/m_argon2.cpp
@@ -33,7 +33,7 @@
class ProviderConfig final
{
- private:
+private:
static Argon2_version SanitizeArgon2Version(unsigned long version)
{
// Note, 10 is 0x10, and 13 is 0x13. Referring to it as
@@ -52,7 +52,7 @@ class ProviderConfig final
return ARGON2_VERSION_13;
}
- public:
+public:
uint32_t iterations;
uint32_t lanes;
uint32_t memory;
@@ -96,10 +96,10 @@ class ProviderConfig final
class HashArgon2 final
: public HashProvider
{
- private:
+private:
const Argon2_type argon2Type;
- public:
+public:
ProviderConfig config;
bool Compare(const std::string& input, const std::string& hash) override
@@ -170,12 +170,12 @@ class HashArgon2 final
class ModuleArgon2 final
: public Module
{
- private:
+private:
HashArgon2 argon2i;
HashArgon2 argon2d;
HashArgon2 argon2id;
- public:
+public:
ModuleArgon2()
: Module(VF_VENDOR, "Allows other modules to generate Argon2 hashes.")
, argon2i(this, "argon2i", Argon2_i)
diff --git a/src/modules/extra/m_geo_maxmind.cpp b/src/modules/extra/m_geo_maxmind.cpp
index bff8c4b78..abaa22bad 100644
--- a/src/modules/extra/m_geo_maxmind.cpp
+++ b/src/modules/extra/m_geo_maxmind.cpp
@@ -38,7 +38,7 @@
class GeolocationExtItem final
: public ExtensionItem
{
- public:
+public:
GeolocationExtItem(Module* parent)
: ExtensionItem(parent, "geolocation", ExtensionType::USER)
{
@@ -79,7 +79,7 @@ typedef insp::flat_map<std::string, Geolocation::Location*> LocationMap;
class GeolocationAPIImpl final
: public Geolocation::APIBase
{
- public:
+public:
GeolocationExtItem ext;
LocationMap locations;
MMDB_s mmdb;
@@ -148,10 +148,10 @@ class GeolocationAPIImpl final
class ModuleGeoMaxMind final
: public Module
{
- private:
+private:
GeolocationAPIImpl geoapi;
- public:
+public:
ModuleGeoMaxMind()
: Module(VF_VENDOR, "Allows the server to perform geolocation lookups on both IP addresses and users.")
, geoapi(this)
diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp
index bce1b446f..123ef2626 100644
--- a/src/modules/extra/m_ldap.cpp
+++ b/src/modules/extra/m_ldap.cpp
@@ -56,7 +56,7 @@ class LDAPService;
class LDAPRequest
{
- public:
+public:
LDAPService* service;
LDAPInterface* inter;
LDAPMessage* message = nullptr; /* message returned by ldap_ */
@@ -91,7 +91,7 @@ class LDAPBind final
{
std::string who, pass;
- public:
+public:
LDAPBind(LDAPService* s, LDAPInterface* i, const std::string& w, const std::string& p)
: LDAPRequest(s, i, LDAP_SUCCESS)
, who(w)
@@ -111,7 +111,7 @@ class LDAPSearch final
int searchscope;
std::string filter;
- public:
+public:
LDAPSearch(LDAPService* s, LDAPInterface* i, const std::string& b, int se, const std::string& f)
: LDAPRequest(s, i, LDAP_SUCCESS)
, base(b)
@@ -131,7 +131,7 @@ class LDAPAdd final
std::string dn;
LDAPMods attributes;
- public:
+public:
LDAPAdd(LDAPService* s, LDAPInterface* i, const std::string& d, const LDAPMods& attr)
: LDAPRequest(s, i, LDAP_SUCCESS)
, dn(d)
@@ -149,7 +149,7 @@ class LDAPDel final
{
std::string dn;
- public:
+public:
LDAPDel(LDAPService* s, LDAPInterface* i, const std::string& d)
: LDAPRequest(s, i, LDAP_SUCCESS)
, dn(d)
@@ -167,7 +167,7 @@ class LDAPModify final
std::string base;
LDAPMods attributes;
- public:
+public:
LDAPModify(LDAPService* s, LDAPInterface* i, const std::string& b, const LDAPMods& attr)
: LDAPRequest(s, i, LDAP_SUCCESS)
, base(b)
@@ -185,7 +185,7 @@ class LDAPCompare final
{
std::string dn, attr, val;
- public:
+public:
LDAPCompare(LDAPService* s, LDAPInterface* i, const std::string& d, const std::string& a, const std::string& v)
: LDAPRequest(s, i, LDAP_COMPARE_TRUE)
, dn(d)
@@ -209,7 +209,7 @@ class LDAPService final
int searchscope;
time_t timeout;
- public:
+public:
static LDAPMod** BuildMods(const LDAPMods& attributes)
{
LDAPMod** mods = new LDAPMod*[attributes.size() + 1];
@@ -258,7 +258,7 @@ class LDAPService final
delete[] mods;
}
- private:
+private:
void Reconnect()
{
// Only try one connect a minute. It is an expensive blocking operation
@@ -288,7 +288,7 @@ class LDAPService final
this->UnlockQueueWakeup();
}
- public:
+public:
typedef std::vector<LDAPRequest*> query_queue;
query_queue queries, results;
std::mutex process_mutex; /* held when processing requests not in either queue */
@@ -408,7 +408,7 @@ class LDAPService final
QueueRequest(comp);
}
- private:
+private:
void BuildReply(int res, LDAPRequest* req)
{
LDAPResult* ldap_result = req->result = new LDAPResult();
@@ -507,7 +507,7 @@ class LDAPService final
process_mutex.unlock();
}
- public:
+public:
void OnStart() override
{
while (!this->IsStopping())
@@ -556,7 +556,7 @@ class ModuleLDAP final
typedef insp::flat_map<std::string, LDAPService*> ServiceMap;
ServiceMap LDAPServices;
- public:
+public:
void ReadConfig(ConfigStatus& status) override
{
ServiceMap conns;
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 23bbdce3d..62d411f7a 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -126,7 +126,7 @@ typedef std::deque<ResultQueueItem> ResultQueue;
class ModuleSQL final
: public Module
{
- public:
+public:
DispatcherThread* Dispatcher = nullptr;
QueryQueue qq; // MUST HOLD MUTEX
ResultQueue rq; // MUST HOLD MUTEX
@@ -142,9 +142,9 @@ class ModuleSQL final
class DispatcherThread final
: public SocketThread
{
- private:
+private:
ModuleSQL* const Parent;
- public:
+public:
DispatcherThread(ModuleSQL* CreatorModule) : Parent(CreatorModule) { }
void OnStart() override;
void OnNotify() override;
@@ -155,7 +155,7 @@ class DispatcherThread final
class MySQLresult final
: public SQL::Result
{
- public:
+public:
SQL::Error err;
int currentrow = 0;
int rows = 0;
@@ -265,7 +265,7 @@ class MySQLresult final
class SQLConnection final
: public SQL::Provider
{
- private:
+private:
bool EscapeString(SQL::Query* query, const std::string& in, std::string& out)
{
// In the worst case each character may need to be encoded as using two bytes and one
@@ -290,7 +290,7 @@ class SQLConnection final
return true;
}
- public:
+public:
std::shared_ptr<ConfigTag> config;
MYSQL* connection = nullptr;
std::mutex lock;
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 998c25630..81ae07c06 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -76,9 +76,9 @@ enum SQLstatus
class ReconnectTimer final
: public Timer
{
- private:
+private:
ModulePgSQL* mod;
- public:
+public:
ReconnectTimer(ModulePgSQL* m) : Timer(5, false), mod(m)
{
}
@@ -115,7 +115,7 @@ class PgSQLresult final
colnames[i] = PQfname(res, i);
}
}
- public:
+public:
PgSQLresult(PGresult* result)
: res(result)
{
@@ -188,7 +188,7 @@ class SQLConn final
: public SQL::Provider
, public EventHandler
{
- public:
+public:
std::shared_ptr<ConfigTag> conf; /* The <database> entry */
std::deque<QueueItem> queue;
PGconn* sql = nullptr; /* PgSQL database connection handle */
@@ -528,7 +528,7 @@ restart:
class ModulePgSQL final
: public Module
{
- public:
+public:
ConnMap connections;
ReconnectTimer* retimer = nullptr;
diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp
index 681dd4021..24015faae 100644
--- a/src/modules/extra/m_regex_pcre.cpp
+++ b/src/modules/extra/m_regex_pcre.cpp
@@ -39,10 +39,10 @@
class PCREPattern final
: public Regex::Pattern
{
- private:
+private:
pcre2_code* regex;
- public:
+public:
PCREPattern(const Module* mod, const std::string& pattern, uint8_t options)
: Regex::Pattern(pattern, options)
{
@@ -78,10 +78,10 @@ class PCREPattern final
class ModuleRegexPCRE final
: public Module
{
- private:
+private:
Regex::SimpleEngine<PCREPattern> regex;
- public:
+public:
ModuleRegexPCRE()
: Module(VF_VENDOR, "Provides the pcre regular expression engine which uses the PCRE library.")
, regex(this, "pcre")
diff --git a/src/modules/extra/m_regex_posix.cpp b/src/modules/extra/m_regex_posix.cpp
index bbde6ab35..a65bf1f1b 100644
--- a/src/modules/extra/m_regex_posix.cpp
+++ b/src/modules/extra/m_regex_posix.cpp
@@ -31,10 +31,10 @@
class POSIXPattern final
: public Regex::Pattern
{
- private:
+private:
regex_t regex;
- public:
+public:
POSIXPattern(const Module* mod, const std::string& pattern, uint8_t options)
: Regex::Pattern(pattern, options)
{
@@ -71,10 +71,10 @@ class POSIXPattern final
class ModuleRegexPOSIX final
: public Module
{
- private:
+private:
Regex::SimpleEngine<POSIXPattern> regex;
- public:
+public:
ModuleRegexPOSIX()
: Module(VF_VENDOR, "Provides the posix regular expression engine which uses the POSIX.2 regular expression matching system.")
, regex(this, "posix")
diff --git a/src/modules/extra/m_regex_re2.cpp b/src/modules/extra/m_regex_re2.cpp
index fc94a61c2..0ac7704a9 100644
--- a/src/modules/extra/m_regex_re2.cpp
+++ b/src/modules/extra/m_regex_re2.cpp
@@ -34,7 +34,7 @@
class RE2Pattern final
: public Regex::Pattern
{
- private:
+private:
RE2 regex;
RE2::Options BuildOptions(uint8_t options)
@@ -45,7 +45,7 @@ class RE2Pattern final
return re2options;
}
- public:
+public:
RE2Pattern(const Module* mod, const std::string& pattern, uint8_t options)
: Regex::Pattern(pattern, options)
, regex(pattern, BuildOptions(options))
@@ -63,10 +63,10 @@ class RE2Pattern final
class ModuleRegexRE2 final
: public Module
{
- private:
+private:
Regex::SimpleEngine<RE2Pattern> regex;
- public:
+public:
ModuleRegexRE2()
: Module(VF_VENDOR, "Provides the re2 regular expression engine which uses the RE2 library.")
, regex(this, "re2")
diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index 879585e2e..9459a84cf 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -49,7 +49,7 @@ typedef insp::flat_map<std::string, SQLConn*> ConnMap;
class SQLite3Result final
: public SQL::Result
{
- public:
+public:
int currentrow = 0;
int rows = 0;
std::vector<std::string> columns;
@@ -100,7 +100,7 @@ class SQLConn final
sqlite3* conn;
std::shared_ptr<ConfigTag> config;
- public:
+public:
SQLConn(Module* Parent, std::shared_ptr<ConfigTag> tag)
: SQL::Provider(Parent, tag->getString("id"))
, config(tag)
@@ -231,10 +231,10 @@ class SQLConn final
class ModuleSQLite3 final
: public Module
{
- private:
+private:
ConnMap conns;
- public:
+public:
ModuleSQLite3()
: Module(VF_VENDOR, "Provides the ability for SQL modules to query a SQLite 3 database.")
{
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index c6237c574..4d9f9475b 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -76,7 +76,7 @@ namespace GnuTLS
class Init final
{
- public:
+ public:
Init() { gnutls_global_init(); }
~Init() { gnutls_global_deinit(); }
};
@@ -84,7 +84,7 @@ namespace GnuTLS
class Exception final
: public ModuleException
{
- public:
+ public:
Exception(const std::string& msg)
: ModuleException(thismod, msg)
{
@@ -107,7 +107,7 @@ namespace GnuTLS
{
gnutls_datum_t datum;
- public:
+ public:
Datum(const std::string& dat)
{
datum.data = (unsigned char*)dat.data();
@@ -121,7 +121,7 @@ namespace GnuTLS
{
gnutls_digest_algorithm_t hash;
- public:
+ public:
// Nothing to deallocate, constructor may throw freely
Hash(const std::string& hashname)
{
@@ -151,7 +151,7 @@ namespace GnuTLS
ThrowOnError(gnutls_dh_params_init(&dh_params), "gnutls_dh_params_init() failed");
}
- public:
+ public:
/** Import */
static std::shared_ptr<DHParams> Import(const std::string& dhstr)
{
@@ -176,7 +176,7 @@ namespace GnuTLS
*/
class RAIIKey final
{
- public:
+ public:
gnutls_x509_privkey_t key;
RAIIKey()
@@ -190,7 +190,7 @@ namespace GnuTLS
}
} key;
- public:
+ public:
/** Import */
X509Key(const std::string& keystr)
{
@@ -205,7 +205,7 @@ namespace GnuTLS
{
std::vector<gnutls_x509_crt_t> certs;
- public:
+ public:
/** Import */
X509CertList(const std::string& certstr)
{
@@ -243,7 +243,7 @@ namespace GnuTLS
{
class RAIICRL final
{
- public:
+ public:
gnutls_x509_crl_t crl;
RAIICRL()
@@ -257,7 +257,7 @@ namespace GnuTLS
}
} crl;
- public:
+ public:
/** Import */
X509CRL(const std::string& crlstr)
{
@@ -272,7 +272,7 @@ namespace GnuTLS
{
gnutls_priority_t priority;
- public:
+ public:
Priority(const std::string& priorities)
{
// Try to set the priorities for ciphers, kex methods etc. to the user supplied string
@@ -341,10 +341,10 @@ namespace GnuTLS
std::shared_ptr<DHParams> dh;
#endif
- protected:
+ protected:
gnutls_certificate_credentials_t cred;
- public:
+ public:
CertCredentials()
{
ThrowOnError(gnutls_certificate_allocate_credentials(&cred), "Cannot allocate certificate credentials");
@@ -394,7 +394,7 @@ namespace GnuTLS
static int cert_callback(gnutls_session_t session, const gnutls_datum_t* req_ca_rdn, int nreqs, const gnutls_pk_algorithm_t* sign_algos, int sign_algos_length, gnutls_retr2_st* st);
- public:
+ public:
X509Credentials(const std::string& certstr, const std::string& keystr)
: key(keystr)
, certs(certstr)
@@ -435,7 +435,7 @@ namespace GnuTLS
#ifdef INSPIRCD_GNUTLS_HAS_RECV_PACKET
gnutls_packet_t packet;
- public:
+ public:
DataReader(gnutls_session_t sess)
{
// Using the packet API avoids the final copy of the data which GnuTLS does if we supply
@@ -456,7 +456,7 @@ namespace GnuTLS
#else
char* const buffer;
- public:
+ public:
DataReader(gnutls_session_t sess)
: buffer(ServerInstance->GetReadBuffer())
{
@@ -538,7 +538,7 @@ namespace GnuTLS
return priostr;
}
- public:
+ public:
struct Config final
{
std::string name;
@@ -628,7 +628,7 @@ namespace GnuTLS
class GnuTLSIOHook final
: public SSLIOHook
{
- private:
+private:
gnutls_session_t sess = nullptr;
#ifdef INSPIRCD_GNUTLS_HAS_CORK
size_t gbuffersize = 0;
@@ -904,7 +904,7 @@ info_done_dealloc:
return ret;
}
- public:
+public:
GnuTLSIOHook(std::shared_ptr<IOHookProvider> hookprov, StreamSocket* sock, unsigned int flags)
: SSLIOHook(hookprov)
{
@@ -1077,7 +1077,7 @@ class GnuTLSIOHookProvider final
{
GnuTLS::Profile profile;
- public:
+public:
GnuTLSIOHookProvider(Module* mod, GnuTLS::Profile::Config& config)
: SSLIOHookProvider(mod, config.name)
, profile(config)
@@ -1165,7 +1165,7 @@ class ModuleSSLGnuTLS final
profiles.swap(newprofiles);
}
- public:
+public:
ModuleSSLGnuTLS()
: Module(VF_VENDOR, "Allows TLS encrypted connections using the GnuTLS library.")
{
diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp
index 385829750..8e4f01086 100644
--- a/src/modules/extra/m_ssl_mbedtls.cpp
+++ b/src/modules/extra/m_ssl_mbedtls.cpp
@@ -58,7 +58,7 @@ namespace mbedTLS
class Exception final
: public ModuleException
{
- public:
+ public:
Exception(const std::string& msg)
: ModuleException(thismod, msg)
{
@@ -87,7 +87,7 @@ namespace mbedTLS
{
T obj;
- public:
+ public:
RAIIObj()
{
init(&obj);
@@ -107,7 +107,7 @@ namespace mbedTLS
class CTRDRBG final
: private RAIIObj<mbedtls_ctr_drbg_context, mbedtls_ctr_drbg_init, mbedtls_ctr_drbg_free>
{
- public:
+ public:
bool Seed(Entropy& entropy)
{
return (mbedtls_ctr_drbg_seed(get(), mbedtls_entropy_func, entropy.get(), NULL, 0) == 0);
@@ -122,7 +122,7 @@ namespace mbedTLS
class DHParams final
: public RAIIObj<mbedtls_dhm_context, mbedtls_dhm_init, mbedtls_dhm_free>
{
- public:
+ public:
void set(const std::string& dhstr)
{
// Last parameter is buffer size, must include the terminating null
@@ -134,7 +134,7 @@ namespace mbedTLS
class X509Key final
: public RAIIObj<mbedtls_pk_context, mbedtls_pk_init, mbedtls_pk_free>
{
- public:
+ public:
/** Import */
X509Key(const std::string& keystr)
{
@@ -153,7 +153,7 @@ namespace mbedTLS
{
std::vector<int> list;
- public:
+ public:
Ciphersuites(const std::string& str)
{
// mbedTLS uses the ciphersuite format "TLS-ECDHE-RSA-WITH-AES-128-GCM-SHA256" internally.
@@ -181,7 +181,7 @@ namespace mbedTLS
{
std::vector<mbedtls_ecp_group_id> list;
- public:
+ public:
Curves(const std::string& str)
{
irc::sepstream ss(str, ':');
@@ -202,7 +202,7 @@ namespace mbedTLS
class X509CertList final
: public RAIIObj<mbedtls_x509_crt, mbedtls_x509_crt_init, mbedtls_x509_crt_free>
{
- public:
+ public:
/** Import or create empty */
X509CertList(const std::string& certstr, bool allowempty = false)
{
@@ -218,7 +218,7 @@ namespace mbedTLS
class X509CRL final
: public RAIIObj<mbedtls_x509_crl, mbedtls_x509_crl_init, mbedtls_x509_crl_free>
{
- public:
+ public:
X509CRL(const std::string& crlstr)
{
if (crlstr.empty())
@@ -238,7 +238,7 @@ namespace mbedTLS
*/
X509CertList certs;
- public:
+ public:
X509Credentials(const std::string& certstr, const std::string& keystr)
: key(keystr)
, certs(certstr)
@@ -282,7 +282,7 @@ namespace mbedTLS
}
#endif
- public:
+ public:
Context(CTRDRBG& ctrdrbg, unsigned int endpoint)
{
mbedtls_ssl_config_init(&conf);
@@ -355,7 +355,7 @@ namespace mbedTLS
*/
mutable std::vector<unsigned char> buf;
- public:
+ public:
Hash(std::string hashstr)
{
std::transform(hashstr.begin(), hashstr.end(), hashstr.begin(), ::toupper);
@@ -406,7 +406,7 @@ namespace mbedTLS
*/
const unsigned int outrecsize;
- public:
+ public:
struct Config final
{
const std::string name;
@@ -534,7 +534,7 @@ namespace mbedTLS
class mbedTLSIOHook final
: public SSLIOHook
{
- private:
+private:
mbedtls_ssl_context sess;
void CloseSession()
@@ -688,7 +688,7 @@ class mbedTLSIOHook final
return int(ret);
}
- public:
+public:
mbedTLSIOHook(std::shared_ptr<IOHookProvider> hookprov, StreamSocket* sock, bool isserver)
: SSLIOHook(hookprov)
{
@@ -834,7 +834,7 @@ class mbedTLSIOHookProvider final
{
mbedTLS::Profile profile;
- public:
+public:
mbedTLSIOHookProvider(Module* mod, mbedTLS::Profile::Config& config)
: SSLIOHookProvider(mod, config.name)
, profile(config)
@@ -868,7 +868,7 @@ mbedTLS::Profile& mbedTLSIOHook::GetProfile()
class ModuleSSLmbedTLS final
: public Module
{
- private:
+private:
typedef std::vector<std::shared_ptr<mbedTLSIOHookProvider>> ProfileList;
mbedTLS::Entropy entropy;
@@ -923,7 +923,7 @@ class ModuleSSLmbedTLS final
profiles.swap(newprofiles);
}
- public:
+public:
ModuleSSLmbedTLS()
: Module(VF_VENDOR, "Allows TLS encrypted connections using the mbedTLS library.")
{
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 9ee81877f..dc196e00d 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -73,7 +73,7 @@ namespace OpenSSL
class Exception final
: public ModuleException
{
- public:
+ public:
Exception(const std::string& msg)
: ModuleException(thismod, msg)
{
@@ -85,7 +85,7 @@ namespace OpenSSL
{
DH* dh;
- public:
+ public:
DHParams(const std::string& filename)
{
BIO* dhpfile = BIO_new_file(filename.c_str(), "r");
@@ -116,7 +116,7 @@ namespace OpenSSL
SSL_CTX* const ctx;
long ctx_options;
- public:
+ public:
Context(SSL_CTX* context)
: ctx(context)
{
@@ -358,7 +358,7 @@ namespace OpenSSL
ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "%s %s context options: %ld", name.c_str(), ctxname.c_str(), final);
}
- public:
+ public:
Profile(const std::string& profilename, std::shared_ptr<ConfigTag> tag)
: name(profilename)
#ifndef INSPIRCD_OPENSSL_AUTO_DH
@@ -516,7 +516,7 @@ static int OnVerify(int preverify_ok, X509_STORE_CTX *ctx)
class OpenSSLIOHook final
: public SSLIOHook
{
- private:
+private:
SSL* sess;
bool data_to_write = false;
@@ -681,7 +681,7 @@ class OpenSSLIOHook final
// Calls our private SSLInfoCallback()
friend void StaticSSLInfoCallback(const SSL* ssl, int where, int rc);
- public:
+public:
OpenSSLIOHook(std::shared_ptr<IOHookProvider> hookprov, StreamSocket* sock, SSL* session)
: SSLIOHook(hookprov)
, sess(session)
@@ -904,7 +904,7 @@ class OpenSSLIOHookProvider final
{
OpenSSL::Profile profile;
- public:
+public:
OpenSSLIOHookProvider(Module* mod, const std::string& profilename, std::shared_ptr<ConfigTag> tag)
: SSLIOHookProvider(mod, profilename)
, profile(profilename, tag)
@@ -983,7 +983,7 @@ class ModuleSSLOpenSSL final
profiles.swap(newprofiles);
}
- public:
+public:
ModuleSSLOpenSSL()
: Module(VF_VENDOR, "Allows TLS encrypted connections using the OpenSSL library.")
{
diff --git a/src/modules/extra/m_sslrehashsignal.cpp b/src/modules/extra/m_sslrehashsignal.cpp
index d975be453..3f90bf86d 100644
--- a/src/modules/extra/m_sslrehashsignal.cpp
+++ b/src/modules/extra/m_sslrehashsignal.cpp
@@ -25,13 +25,13 @@ static volatile sig_atomic_t signaled;
class ModuleSSLRehashSignal final
: public Module
{
- private:
+private:
static void SignalHandler(int)
{
signaled = 1;
}
- public:
+public:
ModuleSSLRehashSignal()
: Module(VF_VENDOR, "Allows the SIGUSR1 signal to be sent to the server to reload TLS certificates.")
{