diff options
Diffstat (limited to 'src/tests/test_nr.cpp')
| -rw-r--r-- | src/tests/test_nr.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/tests/test_nr.cpp b/src/tests/test_nr.cpp index 982e38bc2..148a527c8 100644 --- a/src/tests/test_nr.cpp +++ b/src/tests/test_nr.cpp @@ -1,12 +1,11 @@ #include "tests.h" #include "test_pubkey.h" -#include <botan/auto_rng.h> -#include <botan/pubkey.h> -#include <botan/dl_group.h> - #if defined(BOTAN_HAS_NYBERG_RUEPPEL) #include <botan/nr.h> + #include <botan/auto_rng.h> + #include <botan/pubkey.h> + #include <botan/dl_group.h> #endif #include <botan/hex.h> @@ -15,6 +14,8 @@ using namespace Botan; +#if defined(BOTAN_HAS_NYBERG_RUEPPEL) + namespace { size_t nr_sig_kat(const std::string& p, @@ -32,7 +33,6 @@ size_t nr_sig_kat(const std::string& p, DL_Group group(p_bn, q_bn, g_bn); -#if defined(BOTAN_HAS_NYBERG_RUEPPEL) NR_PrivateKey privkey(rng, group, x_bn); NR_PublicKey pubkey = privkey; @@ -43,24 +43,24 @@ size_t nr_sig_kat(const std::string& p, PK_Signer sign(privkey, padding); return validate_signature(verify, sign, "nr/" + hash, msg, rng, nonce, signature); -#else - return 1; -#endif } } +#endif size_t test_nr() { - std::ifstream nr_sig(PK_TEST_DATA_DIR "/nr.vec"); - size_t fails = 0; +#if defined(BOTAN_HAS_NYBERG_RUEPPEL) + std::ifstream nr_sig(PK_TEST_DATA_DIR "/nr.vec"); + fails += run_tests_bb(nr_sig, "NR Signature", "Signature", true, [](std::map<std::string, std::string> m) -> size_t { return nr_sig_kat(m["P"], m["Q"], m["G"], m["X"], m["Hash"], m["Msg"], m["Nonce"], m["Signature"]); }); +#endif return fails; } |