diff options
| author | kali <kali@leap.se> | 2012-11-14 00:38:20 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-11-14 00:38:20 +0900 |
| commit | 21875404282522a9c83bfb9c85d6a24fa59d20f8 (patch) | |
| tree | ae0409bd742ce3a6f994ae9bb31fc5ab7225f1c6 /src/leap/crypto/leapkeyring.py | |
| parent | f6e900f024074435349eb778a2d89baed55e1e6c (diff) | |
| parent | d24c7328fa845737dbb83d512e4b3f287634c4cc (diff) | |
Merge branch 'feature/generic-wizard' into develop
The generic wizard (big) branch is now stabilised.
A bunch of refactors have gone together with this topic branch:
- client does not have any info included for default service providers.
- user has to run the first-run wizard and manually entry domain for sample provider.
- remove all remains of the older branding strategy for default provider.
- srp registration + authentication are integrated with the signup process.
Diffstat (limited to 'src/leap/crypto/leapkeyring.py')
| -rw-r--r-- | src/leap/crypto/leapkeyring.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/leap/crypto/leapkeyring.py b/src/leap/crypto/leapkeyring.py index bceadc75..d4be7bf9 100644 --- a/src/leap/crypto/leapkeyring.py +++ b/src/leap/crypto/leapkeyring.py @@ -59,6 +59,7 @@ def leap_set_password(key, value, seed="xxx"): def leap_get_password(key, seed="xxx"): keyring.set_keyring(LeapCryptedFileKeyring(seed=seed)) + #import ipdb;ipdb.set_trace() return keyring.get_password('leap', key) |