diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2020-04-12 10:58:07 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-12 09:58:07 -0500 |
commit | ebb04592d2286118d3368d939d8a53a4a42be59d (patch) | |
tree | af02b303791e04acad0f6bf7d9f32c0fbb3e0a82 /tests/utils.py | |
parent | b77145a009b232f5b68c5f2f2a76370e793a8c1c (diff) | |
download | cryptography-ebb04592d2286118d3368d939d8a53a4a42be59d.tar.gz cryptography-ebb04592d2286118d3368d939d8a53a4a42be59d.tar.bz2 cryptography-ebb04592d2286118d3368d939d8a53a4a42be59d.zip |
Refs #5075 -- use hkdf_*.json from wycheproof (#5190)
Diffstat (limited to 'tests/utils.py')
-rw-r--r-- | tests/utils.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/utils.py b/tests/utils.py index 7e79830b..401b4e33 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -886,13 +886,17 @@ def load_nist_ccm_vectors(vector_data): class WycheproofTest(object): - def __init__(self, testgroup, testcase): + def __init__(self, testfiledata, testgroup, testcase): + self.testfiledata = testfiledata self.testgroup = testgroup self.testcase = testcase def __repr__(self): - return "<WycheproofTest({!r}, {!r}, tcId={})>".format( - self.testgroup, self.testcase, self.testcase["tcId"], + return "<WycheproofTest({!r}, {!r}, {!r}, tcId={})>".format( + self.testfiledata, + self.testgroup, + self.testcase, + self.testcase["tcId"], ) @property @@ -922,7 +926,7 @@ def load_wycheproof_tests(wycheproof, test_file): path = os.path.join(wycheproof, "testvectors", test_file) with open(path) as f: data = json.load(f) - for group in data["testGroups"]: + for group in data.pop("testGroups"): cases = group.pop("tests") for c in cases: - yield WycheproofTest(group, c) + yield WycheproofTest(data, group, c) |