diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-08-01 19:47:22 +0100 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-08-01 19:50:15 +0100 |
| commit | b60b8dd64513411f945da5af5f4f6eaa4330827b (patch) | |
| tree | 9da74f7b7b1c1e7ddd82dd7a783b6581b4f577d7 /tests/utils.py | |
| parent | fcd7d707feba6f02b89fa2d2c9eb3b8a0df5e7f4 (diff) | |
| download | cryptography-b60b8dd64513411f945da5af5f4f6eaa4330827b.tar.gz cryptography-b60b8dd64513411f945da5af5f4f6eaa4330827b.tar.bz2 cryptography-b60b8dd64513411f945da5af5f4f6eaa4330827b.zip | |
remove some more branching in the vector loaders
Diffstat (limited to 'tests/utils.py')
| -rw-r--r-- | tests/utils.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tests/utils.py b/tests/utils.py index 5083d48c..7e7abdf1 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -539,8 +539,8 @@ def load_fips_ecdsa_key_pair_vectors(vector_data): elif line.startswith("Qy = "): key_data["y"] = int(line.split("=")[1], 16) - if key_data is not None: - vectors.append(key_data) + assert key_data is not None + vectors.append(key_data) return vectors @@ -559,9 +559,6 @@ def load_fips_ecdsa_signing_vectors(vector_data): for line in vector_data: line = line.strip() - if not line or line.startswith("#"): - continue - curve_match = curve_rx.match(line) if curve_match: curve_name = _ECDSA_CURVE_NAMES[curve_match.group("curve")] @@ -593,8 +590,8 @@ def load_fips_ecdsa_signing_vectors(vector_data): elif line.startswith("Result = "): data["fail"] = line.split("=")[1].strip()[0] == "F" - if data is not None: - vectors.append(data) + assert data is not None + vectors.append(data) return vectors |