diff options
| author | Simo Sorce <simo@redhat.com> | 2015-10-13 14:45:21 -0400 |
|---|---|---|
| committer | Simo Sorce <simo@redhat.com> | 2015-10-13 14:50:17 -0400 |
| commit | 6e3b155bb684bb036fba277756a0ca47ce551443 (patch) | |
| tree | 00162870e409ccefde78b8dad6b1c9e463f62009 | |
| parent | e69b975dd14f2981c288ffadc6d7f9fa225c4d6d (diff) | |
| download | cryptography-6e3b155bb684bb036fba277756a0ca47ce551443.tar.gz cryptography-6e3b155bb684bb036fba277756a0ca47ce551443.tar.bz2 cryptography-6e3b155bb684bb036fba277756a0ca47ce551443.zip | |
Fix load_kasvs_ecdh_vectors() COUNT sourcing
COUNT is a decimal number in test files, but was erroneously read
and converted as if the source was a hexadecimal number.
Fix the loader and test the fix.
Signed-off-by: Simo Sorce <simo@redhat.com>
| -rw-r--r-- | tests/test_utils.py | 4 | ||||
| -rw-r--r-- | tests/utils.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_utils.py b/tests/test_utils.py index 04182a06..72e20725 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -3363,7 +3363,7 @@ def test_load_kasvs_ecdh_kdf_vectors(): [EB - SHA224] - COUNT = 0 + COUNT = 50 dsCAVS = 540904b67b3716823dd621ed72ad3dbc615887b4f56f910b78a57199 QsCAVSx = 28e5f3a72d8f6b8499dd1bcdfceafcecec68a0d715789bcf4b55fe15 QsCAVSy = 8c8006a7da7c1a19f5328d7e865522b0c0dfb9a29b2c46dc96590d2a @@ -3385,7 +3385,7 @@ ffdfa60dd7 expected = [ {'errno': 12, 'fail': True, - 'COUNT': 0, + 'COUNT': 50, 'CAVS': { 'd': int("540904b67b3716823dd621ed72ad3dbc615887b4f56f910b" "78a57199", 16), diff --git a/tests/utils.py b/tests/utils.py index cc3f9fcc..3970109e 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -722,7 +722,7 @@ def load_kasvs_ecdh_vectors(vector_data): if line.startswith("["): tag = line.split()[0][1:] elif line.startswith("COUNT = "): - data["COUNT"] = int(line.split("=")[1], 16) + data["COUNT"] = int(line.split("=")[1]) elif line.startswith("dsCAVS = "): data["CAVS"]["d"] = int(line.split("=")[1], 16) elif line.startswith("QsCAVSx = "): |