summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-01-13 11:46:26 -0300
committerTomás Touceda <chiiph@leap.se>2014-01-13 11:46:26 -0300
commit2d77a64c7cf3e70070e25af4ef75af7de7a3a5b1 (patch)
tree07730927b313b239944aadb2090538eba5df96b6 /src
parentd70911505e63402b26657c11a74cf7e15ecce381 (diff)
parentcf231b4536652fadfe03169c97688a0c76606dca (diff)
Merge remote-tracking branch 'refs/remotes/kali/bug/do-not-fail-if-no-content-type' into develop
Diffstat (limited to 'src')
-rw-r--r--src/leap/mail/walk.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/leap/mail/walk.py b/src/leap/mail/walk.py
index 1871752..dd3b745 100644
--- a/src/leap/mail/walk.py
+++ b/src/leap/mail/walk.py
@@ -57,13 +57,12 @@ get_payloads = lambda msg: ((x.get_payload(),
get_body_phash_simple = lambda payloads: first(
[get_hash(payload) for payload, headers in payloads
- if payloads
- and "text/plain" in headers.get('content-type')])
+ if payloads])
get_body_phash_multi = lambda payloads: (first(
[get_hash(payload) for payload, headers in payloads
if payloads
- and "text/plain" in headers.get('content-type')])
+ and "text/plain" in headers.get('content-type', '')])
or get_body_phash_simple(payloads))
"""