diff options
| author | Peter Powell <petpow@saberuk.com> | 2016-05-23 19:09:47 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2016-09-13 22:33:41 +0100 |
| commit | 3b0f52c92b744836520af4b9915478569f297d39 (patch) | |
| tree | 1816865eccc62fb60a9e546a298dfc74e51504f4 /modules | |
| parent | 164ad71fc36f79efc823b7523de79603f6e0ac27 (diff) | |
Remove Anope::Decrypt now encryption is mandated.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/encryption/none.cpp | 12 | ||||
| -rw-r--r-- | modules/nickserv/register.cpp | 4 | ||||
| -rw-r--r-- | modules/nickserv/set.cpp | 10 |
3 files changed, 2 insertions, 24 deletions
diff --git a/modules/encryption/none.cpp b/modules/encryption/none.cpp index 840ab7b42..3b1f49d33 100644 --- a/modules/encryption/none.cpp +++ b/modules/encryption/none.cpp @@ -21,13 +21,11 @@ class ENone : public Module , public EventHook<Event::Encrypt> - , public EventHook<Event::Decrypt> , public EventHook<Event::CheckAuthentication> { public: ENone(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, ENCRYPTION | VENDOR) , EventHook<Event::Encrypt>(this) - , EventHook<Event::Decrypt>(this) , EventHook<Event::CheckAuthentication>(this) { if (ModuleManager::FindFirstOf(ENCRYPTION) == this) @@ -45,16 +43,6 @@ class ENone : public Module return EVENT_ALLOW; } - EventReturn OnDecrypt(const Anope::string &hashm, const Anope::string &src, Anope::string &dest) override - { - if (!hashm.equals_cs("plain")) - return EVENT_CONTINUE; - size_t pos = src.find(':'); - Anope::string buf = src.substr(pos + 1); - Anope::B64Decode(buf, dest); - return EVENT_ALLOW; - } - void OnCheckAuthentication(User *, NickServ::IdentifyRequest *req) override { NickServ::Nick *na = NickServ::FindNick(req->GetAccount()); diff --git a/modules/nickserv/register.cpp b/modules/nickserv/register.cpp index 41c0e716b..f7e93c9a1 100644 --- a/modules/nickserv/register.cpp +++ b/modules/nickserv/register.cpp @@ -244,10 +244,6 @@ class CommandNSRegister : public Command source.Reply(_("\002{0}\002 has been registered."), u_nick); - Anope::string tmp_pass; - if (Anope::Decrypt(na->GetAccount()->GetPassword(), tmp_pass)) - source.Reply(_("Your password is \002{0}\002 - remember this for later use."), tmp_pass); - if (nsregister.equals_ci("admin")) { nc->SetS<bool>("UNCONFIRMED", true); diff --git a/modules/nickserv/set.cpp b/modules/nickserv/set.cpp index c733f93d2..12086e801 100644 --- a/modules/nickserv/set.cpp +++ b/modules/nickserv/set.cpp @@ -160,10 +160,7 @@ class CommandNSSetPassword : public Command Anope::Encrypt(param, tmp_pass); source.nc->SetPassword(tmp_pass); - if (Anope::Decrypt(source.nc->GetPassword(), tmp_pass)) - source.Reply(_("Password for \002{0}\002 changed to \002{1]\002."), source.nc->GetDisplay(), tmp_pass); - else - source.Reply(_("Password for \002{0}\002 changed."), source.nc->GetDisplay()); + source.Reply(_("Password for \002{0}\002 changed."), source.nc->GetDisplay()); } bool OnHelp(CommandSource &source, const Anope::string &) override @@ -223,10 +220,7 @@ class CommandNSSASetPassword : public Command Anope::string tmp_pass; Anope::Encrypt(params[1], tmp_pass); nc->SetPassword(tmp_pass); - if (Anope::Decrypt(nc->GetPassword(), tmp_pass) == 1) - source.Reply(_("Password for \002{0}\002 changed to \002{1}\002."), nc->GetDisplay(), tmp_pass); - else - source.Reply(_("Password for \002{0}\002 changed."), nc->GetDisplay()); + source.Reply(_("Password for \002{0}\002 changed."), nc->GetDisplay()); } bool OnHelp(CommandSource &source, const Anope::string &) override |