aboutsummaryrefslogtreecommitdiff
path: root/libdino
diff options
context:
space:
mode:
authorMarvin W <git@larma.de>2018-08-19 18:56:46 +0100
committerMarvin W <git@larma.de>2018-09-01 13:20:10 +0200
commitbaa3f99ed7aca2394f38f3e637da11d7d51ee689 (patch)
treef6beac88fe0c0e17f6a8a73576fee98f9a911521 /libdino
parent0e41fb3294271fc271ac8d24c1871fbea27e2ba4 (diff)
downloaddino-baa3f99ed7aca2394f38f3e637da11d7d51ee689.tar.gz
dino-baa3f99ed7aca2394f38f3e637da11d7d51ee689.zip
Initial implementation of SCRAM-SHA-1
Diffstat (limited to 'libdino')
-rw-r--r--libdino/src/service/connection_manager.vala2
-rw-r--r--libdino/src/service/module_manager.vala6
2 files changed, 4 insertions, 4 deletions
diff --git a/libdino/src/service/connection_manager.vala b/libdino/src/service/connection_manager.vala
index 4413dfd7..b73cd117 100644
--- a/libdino/src/service/connection_manager.vala
+++ b/libdino/src/service/connection_manager.vala
@@ -162,7 +162,7 @@ public class ConnectionManager {
stream.attached_modules.connect((stream) => {
change_connection_state(account, ConnectionState.CONNECTED);
});
- stream.get_module(PlainSasl.Module.IDENTITY).received_auth_failure.connect((stream, node) => {
+ stream.get_module(Sasl.Module.IDENTITY).received_auth_failure.connect((stream, node) => {
set_connection_error(account, new ConnectionError(ConnectionError.Source.SASL, null));
change_connection_state(account, ConnectionState.DISCONNECTED);
});
diff --git a/libdino/src/service/module_manager.vala b/libdino/src/service/module_manager.vala
index dac5aef2..d16dc935 100644
--- a/libdino/src/service/module_manager.vala
+++ b/libdino/src/service/module_manager.vala
@@ -41,8 +41,8 @@ public class ModuleManager {
foreach (XmppStreamModule module in module_map[account]) {
if (module.get_id() == Bind.Module.IDENTITY.id) {
(module as Bind.Module).requested_resource = resource ?? account.resourcepart;
- } else if (module.get_id() == PlainSasl.Module.IDENTITY.id) {
- (module as PlainSasl.Module).password = account.password;
+ } else if (module.get_id() == Sasl.Module.IDENTITY.id) {
+ (module as Sasl.Module).password = account.password;
}
}
return modules;
@@ -54,7 +54,7 @@ public class ModuleManager {
module_map[account].add(new Iq.Module());
module_map[account].add(new Tls.Module());
module_map[account].add(new Xep.SrvRecordsTls.Module());
- module_map[account].add(new PlainSasl.Module(account.bare_jid.to_string(), account.password));
+ module_map[account].add(new Sasl.Module(account.bare_jid.to_string(), account.password));
module_map[account].add(new Xep.StreamManagement.Module());
module_map[account].add(new Bind.Module(account.resourcepart));
module_map[account].add(new Session.Module());