xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update to the latest sasl

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-04 20:21:14 +01:00
commit 78509e25b1
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -20,7 +20,7 @@ openssl = "0.9.7"
base64 = "0.5.2" base64 = "0.5.2"
minidom = "0.3.0" minidom = "0.3.0"
jid = "0.2.0" jid = "0.2.0"
sasl = "0.3.0" sasl = "0.4.0"
sha-1 = "0.3.2" sha-1 = "0.3.2"
[features] [features]

14
src/client.rs
View file

@ -5,12 +5,10 @@ use ns;
use plugin::{Plugin, PluginProxyBinding}; use plugin::{Plugin, PluginProxyBinding};
use event::AbstractEvent; use event::AbstractEvent;
use connection::{Connection, C2S}; use connection::{Connection, C2S};
use sasl::{ Mechanism as SaslMechanism use sasl::client::Mechanism as SaslMechanism;
, Credentials as SaslCredentials use sasl::client::mechanisms::{Plain, Scram};
, Secret as SaslSecret use sasl::common::{Credentials as SaslCredentials, Identity, Secret, ChannelBinding};
, ChannelBinding use sasl::common::scram::{Sha1, Sha256};
};
use sasl::mechanisms::{Plain, Scram, Sha1, Sha256};
use components::sasl_error::SaslError; use components::sasl_error::SaslError;
use util::FromElement; use util::FromElement;
@ -64,8 +62,8 @@ impl ClientBuilder {
/// Sets the password to use. /// Sets the password to use.
pub fn password<P: Into<String>>(mut self, password: P) -> ClientBuilder { pub fn password<P: Into<String>>(mut self, password: P) -> ClientBuilder {
self.credentials = SaslCredentials { self.credentials = SaslCredentials {
username: Some(self.jid.node.clone().expect("JID has no node")), identity: Identity::Username(self.jid.node.clone().expect("JID has no node")),
secret: SaslSecret::Password(password.into()), secret: Secret::password_plain(password),
channel_binding: ChannelBinding::None, channel_binding: ChannelBinding::None,
}; };
self self

2
src/transport.rs
View file

@ -20,7 +20,7 @@ use error::Error;
#[allow(unused_imports)] #[allow(unused_imports)]
use openssl::ssl::{SslMethod, Ssl, SslContextBuilder, SslStream, SSL_VERIFY_NONE, SslConnectorBuilder}; use openssl::ssl::{SslMethod, Ssl, SslContextBuilder, SslStream, SSL_VERIFY_NONE, SslConnectorBuilder};
use sasl::ChannelBinding; use sasl::common::ChannelBinding;
/// A trait which transports are required to implement. /// A trait which transports are required to implement.
pub trait Transport { pub trait Transport {