aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2008-10-01 14:58:42 +0000
committerlloyd <[email protected]>2008-10-01 14:58:42 +0000
commit9da5c08de6bb6a6972a48ee5bb11ab7654c37f63 (patch)
tree2dc07deec10efbd4bb8c0147ad43d050bc14f9a1
parent24eebaf2054b085f7bdaccc8abe83f9cab5cf5c2 (diff)
Report skipped DH tests
-rw-r--r--checks/pk.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/checks/pk.cpp b/checks/pk.cpp
index 9f74f1c22..550135bb3 100644
--- a/checks/pk.cpp
+++ b/checks/pk.cpp
@@ -487,7 +487,6 @@ u32bit validate_dh(const std::string& algo,
if(str.size() != 5 && str.size() != 6)
throw Exception("Invalid input from pk_valid.dat");
- bool failure = false;
#if defined(BOTAN_HAS_DH)
DL_Group domain(to_bigint(str[0]), to_bigint(str[1]));
@@ -503,11 +502,13 @@ u32bit validate_dh(const std::string& algo,
PK_Key_Agreement* kas = get_pk_kas(mykey, kdf);
+ bool failure = false;
validate_kas(kas, algo, otherkey.public_value(),
str[4], keylen, failure);
+ return (failure ? 1 : 0);
#endif
- return (failure ? 1 : 0);
+ return 2;
}
u32bit validate_dlies(const std::string& algo,