From fd5a0c3f4fa532649a54b05ea8c69365c8fff8eb Mon Sep 17 00:00:00 2001
From: ulif <uli@gnufix.de>
Date: Thu, 23 Jul 2015 12:55:09 +0200
Subject: [PATCH] Handle dashes in sigend wordfiles correctly.
As described in RFC 4880, dashes in wordlists might be escaped.
We have to take care of this when extracting wordlists.
---
diceware/wordlist.py | 2 ++
tests/test_wordlist.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/diceware/wordlist.py b/diceware/wordlist.py
index df5e64f..49cd5a8 100644
--- a/diceware/wordlist.py
+++ b/diceware/wordlist.py
@@ -85,6 +85,8 @@ def get_signed_wordlist(file_descriptor):
line = line.strip()
if line == '-----BEGIN PGP SIGNATURE-----':
break
+ if line.startswith('- '):
+ line = line[2:]
result += [line.strip(), ]
file_descriptor.close()
return result
diff --git a/tests/test_wordlist.py b/tests/test_wordlist.py
index 8b4be0e..dd20976 100644
--- a/tests/test_wordlist.py
+++ b/tests/test_wordlist.py
@@ -58,7 +58,7 @@ class Test_GetSignedWordList(object):
os.path.dirname(__file__), "sample_signed_wordlist.asc")
with open(in_path, 'r') as fd:
result = get_signed_wordlist(fd)
- assert ["foo", "bar"] == result
+ assert ["foo", "bar", "-dash-at-start", "baz"] == result
class TestWordlistModule(object):
--
GitLab