diff options
Diffstat (limited to 'src/tests/test_ecdsa.cpp')
| -rw-r--r-- | src/tests/test_ecdsa.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/tests/test_ecdsa.cpp b/src/tests/test_ecdsa.cpp index 331a1dcaf..6464bc7a0 100644 --- a/src/tests/test_ecdsa.cpp +++ b/src/tests/test_ecdsa.cpp @@ -36,9 +36,9 @@ class ECDSA_Verification_Tests final : public PK_Signature_Verification_Test std::unique_ptr<Botan::Public_Key> load_public_key(const VarMap& vars) override { - const std::string group_id = get_req_str(vars, "Group"); - const BigInt px = get_req_bn(vars, "Px"); - const BigInt py = get_req_bn(vars, "Py"); + const std::string group_id = vars.get_req_str("Group"); + const BigInt px = vars.get_req_bn("Px"); + const BigInt py = vars.get_req_bn("Py"); Botan::EC_Group group(Botan::OIDS::lookup(group_id)); const Botan::PointGFp public_point = group.point(px, py); @@ -73,8 +73,8 @@ class ECDSA_Signature_KAT_Tests final : public PK_Signature_Generation_Test std::unique_ptr<Botan::Private_Key> load_private_key(const VarMap& vars) override { - const std::string group_id = get_req_str(vars, "Group"); - const BigInt x = get_req_bn(vars, "X"); + const std::string group_id = vars.get_req_str("Group"); + const BigInt x = vars.get_req_bn("X"); Botan::EC_Group group(Botan::OIDS::lookup(group_id)); std::unique_ptr<Botan::Private_Key> key(new Botan::ECDSA_PrivateKey(Test::rng(), group, x)); @@ -83,7 +83,7 @@ class ECDSA_Signature_KAT_Tests final : public PK_Signature_Generation_Test std::string default_padding(const VarMap& vars) const override { - const std::string hash = get_req_str(vars, "Hash"); + const std::string hash = vars.get_req_str("Hash"); if(hash.substr(0,3) == "Raw") return hash; return "EMSA1(" + hash + ")"; @@ -127,10 +127,10 @@ class ECDSA_Invalid_Key_Tests final : public Text_Based_Test { Test::Result result("ECDSA invalid keys"); - const std::string group_id = get_req_str(vars, "Group"); + const std::string group_id = vars.get_req_str("Group"); Botan::EC_Group group(Botan::OIDS::lookup(group_id)); - const Botan::BigInt x = get_req_bn(vars, "InvalidKeyX"); - const Botan::BigInt y = get_req_bn(vars, "InvalidKeyY"); + const Botan::BigInt x = vars.get_req_bn("InvalidKeyX"); + const Botan::BigInt y = vars.get_req_bn("InvalidKeyY"); std::unique_ptr<Botan::PointGFp> public_point; |