From 7a9d0d6630c02c5b8e1123300fc7e74a12c24a03 Mon Sep 17 00:00:00 2001
From: René Korthaus <r.korthaus@sirrix.com>
Date: Wed, 13 Apr 2016 17:15:36 +0200
Subject: Add support probabilistic DSA & ECDSA

Adds support for probabilistic, aka the standard, DSA and ECDSA.
Can be enabled by disabling the rfc6979 module.
Includes test vectors from NIST CAVP.
Adds rfc6979 to the list of prohibited modules in BSI policy.
---
 src/tests/test_ecdsa.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'src/tests/test_ecdsa.cpp')

diff --git a/src/tests/test_ecdsa.cpp b/src/tests/test_ecdsa.cpp
index 7140dcbe7..15490f1f8 100644
--- a/src/tests/test_ecdsa.cpp
+++ b/src/tests/test_ecdsa.cpp
@@ -6,6 +6,8 @@
 
 #include "tests.h"
 
+#include "test_rng.h"
+
 #if defined(BOTAN_HAS_ECDSA)
   #include "test_pubkey.h"
   #include <botan/ecdsa.h>
@@ -23,8 +25,13 @@ class ECDSA_Signature_KAT_Tests : public PK_Signature_Generation_Test
    public:
       ECDSA_Signature_KAT_Tests() : PK_Signature_Generation_Test(
          "ECDSA",
-         "pubkey/ecdsa.vec",
+#if defined(BOTAN_HAS_RFC6979_GENERATOR)
+         "pubkey/ecdsa_rfc6979.vec",
          {"Group", "X", "Hash", "Msg", "Signature"})
+#else
+         "pubkey/ecdsa_prob.vec",
+         {"Group", "X", "Hash", "Msg", "Nonce", "Signature"})
+#endif
          {}
 
       bool clear_between_callbacks() const override { return false; }
@@ -43,6 +50,15 @@ class ECDSA_Signature_KAT_Tests : public PK_Signature_Generation_Test
          {
          return "EMSA1(" + get_req_str(vars, "Hash") + ")";
          }
+
+#if !defined(BOTAN_HAS_RFC6979)
+      Botan::RandomNumberGenerator* test_rng(const std::vector<uint8_t>& nonce) const override
+         {
+         // probabilistic ecdsa signature generation extracts more random than just the nonce,
+         // but the nonce is extracted first
+         return new Fixed_Output_Position_RNG(nonce, 1);
+         }
+#endif
    };
 
 class ECDSA_Keygen_Tests : public PK_Key_Generation_Test
-- 
cgit v1.2.3