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

more API simplifications

Browse source
This commit is contained in:
lumi 2017-03-25 23:45:30 +01:00
commit 97f597d89d
6 changed files with 34 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sasl/src/server/mechanisms/scram.rs
View file

@ -5,7 +5,7 @@ use base64;
use common::scram::{generate_nonce, ScramProvider};
use common::{parse_frame, xor, ChannelBinding, Identity};
use secret;
use secret::Pbkdf2SecretValue;
use secret::Pbkdf2Secret;
use server::{Mechanism, Provider, Response};
enum ScramState {
@ -24,8 +24,8 @@ enum ScramState {
pub struct Scram<S, P>
where
S: ScramProvider,
P: Provider<S::SecretKind>,
<S::SecretKind as secret::SecretKind>::Value: secret::Pbkdf2SecretValue,
P: Provider<S::Secret>,
S::Secret: secret::Pbkdf2Secret,
{
name: String,
state: ScramState,
@ -37,8 +37,8 @@ where
impl<S, P> Scram<S, P>
where
S: ScramProvider,
P: Provider<S::SecretKind>,
<S::SecretKind as secret::SecretKind>::Value: secret::Pbkdf2SecretValue,
P: Provider<S::Secret>,
S::Secret: secret::Pbkdf2Secret,
{
pub fn new(provider: P, channel_binding: ChannelBinding) -> Scram<S, P> {
Scram {
@ -54,8 +54,8 @@ where
impl<S, P> Mechanism for Scram<S, P>
where
S: ScramProvider,
P: Provider<S::SecretKind>,
<S::SecretKind as secret::SecretKind>::Value: secret::Pbkdf2SecretValue,
P: Provider<S::Secret>,
S::Secret: secret::Pbkdf2Secret,
{
fn name(&self) -> &str {
&self.name