diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-08-07 09:52:58 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-08-08 10:48:55 -0300 |
commit | 7fc2243e5d95e775babe1898760e4db4f1ee841a (patch) | |
tree | a21ac3bd47f339e9ef55b42ad5faa41518ed97ce | |
parent | ba304610e14f5054ec7143151b52b4bf5473d5f1 (diff) |
Check for str or unicode for the cert/key fields
-rw-r--r-- | mail/src/leap/mail/smtp/smtprelay.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mail/src/leap/mail/smtp/smtprelay.py b/mail/src/leap/mail/smtp/smtprelay.py index e5a56146..773bae0a 100644 --- a/mail/src/leap/mail/smtp/smtprelay.py +++ b/mail/src/leap/mail/smtp/smtprelay.py @@ -86,9 +86,9 @@ def assert_config_structure(config): leap_assert(PORT_KEY in config) leap_assert_type(config[PORT_KEY], int) leap_assert(CERT_KEY in config) - leap_assert_type(config[CERT_KEY], str) + leap_assert_type(config[CERT_KEY], (str, unicode)) leap_assert(KEY_KEY in config) - leap_assert_type(config[KEY_KEY], str) + leap_assert_type(config[KEY_KEY], (str, unicode)) leap_assert(ENCRYPTED_ONLY_KEY in config) leap_assert_type(config[ENCRYPTED_ONLY_KEY], bool) # assert received params are not empty |