Add ECKAEG tests from InSiTo, by Manuel Hartl

3 files changed, 299 insertions, 0 deletions

diff --git a/checks/eckaeg.cpp b/checks/eckaeg.cpp
new file mode 100644
index 000000000..4de9fa64e
--- /dev/null
+++ b/checks/eckaeg.cpp
@@ -0,0 +1,296 @@
+/******************************************************
+* ECKAEG tests                                        *
+*                                                     *
+* (C) 2007 Manuel Hartl                               *
+*          [email protected]                        *
+*     2008 Jack Lloyd                                 *
+******************************************************/
+
+#include <botan/build.h>
+
+#include "validate.h"
+#include "common.h"
+
+#if defined(BOTAN_HAS_ECKAEG)
+
+#include <iostream>
+#include <fstream>
+
+#include <botan/dh.h>
+#include <botan/eckaeg.h>
+#include <botan/x509self.h>
+#include <botan/der_enc.h>
+
+#include <botan/point_gfp.h>
+#include <botan/curve_gfp.h>
+#include <botan/gfp_element.h>
+
+using namespace Botan;
+
+#define CHECK_MESSAGE(expr, print) try { if(!(expr)) std::cout << print << "\n"; } catch(std::exception& e) { std::cout << __FUNCTION__ << ": " << e.what() << "\n"; }
+#define CHECK(expr) try { if(!(expr)) std::cout << #expr << "\n"; } catch(std::exception& e) { std::cout << __FUNCTION__ << ": " << e.what() << "\n"; }
+
+namespace {
+
+void test_eckaeg_normal_derivation(RandomNumberGenerator& rng)
+   {
+   std::cout << "." << std::flush;
+
+   /*
+   std::string p_secp = "ffffffffffffffffffffffffffffffff7fffffff";
+   std::string a_secp = "ffffffffffffffffffffffffffffffff7ffffffc";
+   std::string b_secp = "1c97befc54bd7a8b65acf89f81d4d4adc565fa45";
+   std::string G_secp_comp = "024a96b5688ef573284664698968c38bb913cbfc82";
+   ::Botan::SecureVector<byte> sv_p_secp = decode_hex(p_secp);
+   ::Botan::SecureVector<byte> sv_a_secp = decode_hex(a_secp);
+   ::Botan::SecureVector<byte> sv_b_secp = decode_hex(b_secp);
+   ::Botan::SecureVector<byte> sv_G_secp_comp = decode_hex(G_secp_comp);
+   BigInt bi_p_secp = BigInt::decode(sv_p_secp.begin(), sv_p_secp.size());
+   BigInt bi_a_secp = BigInt::decode(sv_a_secp.begin(), sv_a_secp.size());
+   BigInt bi_b_secp = BigInt::decode(sv_b_secp.begin(), sv_b_secp.size());
+   CurveGFp secp160r1(GFpElement(bi_p_secp,bi_a_secp), GFpElement(bi_p_secp, bi_b_secp), bi_p_secp);
+   */
+
+   std::string g_secp("024a96b5688ef573284664698968c38bb913cbfc82");
+   Botan::SecureVector<Botan::byte> sv_g_secp = decode_hex(g_secp);
+   BigInt bi_p_secp("0xffffffffffffffffffffffffffffffff7fffffff");
+   BigInt bi_a_secp("0xffffffffffffffffffffffffffffffff7ffffffc");
+   BigInt bi_b_secp("0x1c97befc54bd7a8b65acf89f81d4d4adc565fa45");
+   BigInt order = BigInt("0x0100000000000000000001f4c8f927aed3ca752257");
+   CurveGFp curve(GFpElement(bi_p_secp,bi_a_secp), GFpElement(bi_p_secp, bi_b_secp), bi_p_secp);
+
+   BigInt cofactor = BigInt(1);
+   PointGFp p_G = OS2ECP ( sv_g_secp, curve );
+   Botan::EC_Domain_Params dom_pars = Botan::EC_Domain_Params(curve, p_G, order, cofactor);
+
+   /**
+   * begin ECKAEG
+   */
+   // alices key (a key constructed by domain parameters IS an ephimeral key!)
+   Botan::ECKAEG_PrivateKey private_a(rng, dom_pars);
+   Botan::ECKAEG_PublicKey public_a = private_a; // Bob gets this
+
+   // Bob creates a key with a matching group
+   Botan::ECKAEG_PrivateKey private_b(rng, dom_pars); //public_a.getCurve()
+
+   // Bob sends the key back to Alice
+   Botan::ECKAEG_PublicKey public_b = private_b; // Alice gets this
+
+   // Both of them create a key using their private key and the other's
+   // public key
+   Botan::SymmetricKey alice_key = private_a.derive_key(public_b);
+   Botan::SymmetricKey bob_key = private_b.derive_key(public_a);
+
+   CHECK_MESSAGE(alice_key == bob_key, "different keys - " << "Alice's key was: " << alice_key.as_string() << ", Bob's key was: " << bob_key.as_string());
+   //cout << "key: " << alice_key.as_string() << endl;
+   /*
+   if(alice_key == bob_key)
+   {
+   std::cout << "The two keys matched, everything worked\n";
+   std::cout << "bit length " << alice_key.length() << endl;
+   std::cout << "The shared key was: " << alice_key.as_string() << "\n";
+   }
+
+   else
+   {
+   std::cout << "The two keys didn't match!\n";
+   std::cout << "Alice's key was: " << alice_key.as_string() << "\n";
+   std::cout << "Bob's key was: " << bob_key.as_string() << "\n";
+   }
+   */
+   // Now Alice and Bob hash the key and use it for something
+   }
+
+void test_eckaeg_some_dp(RandomNumberGenerator& rng)
+   {
+   std::vector<std::string> oids;
+   oids.push_back("1.2.840.10045.3.1.7");
+   oids.push_back("1.3.132.0.8");
+   oids.push_back("1.2.840.10045.3.1.1");
+   for(Botan::u32bit i = 0; i< oids.size(); i++)
+      {
+      std::cout << "." << std::flush;
+      Botan::EC_Domain_Params dom_pars(Botan::get_EC_Dom_Pars_by_oid(oids[i]));
+      Botan::ECKAEG_PrivateKey private_a(rng, dom_pars);
+      Botan::ECKAEG_PublicKey public_a = private_a;
+      /*auto_ptr<Botan::X509_Encoder> x509_key_enc = public_a.x509_encoder();
+      Botan::MemoryVector<Botan::byte> enc_key_a = Botan::DER_Encoder()
+      .start_cons(Botan::SEQUENCE)
+      .encode(x509_key_enc->alg_id())
+      .encode(x509_key_enc->key_bits(), Botan::BIT_STRING)
+      .end_cons()
+      .get_contents();*/
+
+      Botan::ECKAEG_PrivateKey private_b(rng, dom_pars);
+      Botan::ECKAEG_PublicKey public_b = private_b;
+      // to test the equivalence, we
+      // use the direct derivation method here
+
+      Botan::SymmetricKey alice_key = private_a.derive_key(public_b);
+
+      //cout << "encoded key = " << hex_encode(enc_key_a.begin(), enc_key_a.size()) << endl;
+
+      Botan::SymmetricKey bob_key = private_b.derive_key(public_a);
+      CHECK_MESSAGE(alice_key == bob_key, "different keys - " << "Alice's key was: " << alice_key.as_string() << ", Bob's key was: " << bob_key.as_string());
+      //cout << "key: " << alice_key.as_string() << endl;
+      }
+
+   }
+
+void test_eckaeg_der_derivation(RandomNumberGenerator& rng)
+   {
+   std::vector<std::string> oids;
+   oids.push_back("1.2.840.10045.3.1.7");
+   oids.push_back("1.3.132.0.8");
+   oids.push_back("1.2.840.10045.3.1.1");
+
+   for(Botan::u32bit i = 0; i< oids.size(); i++)
+      {
+      Botan::EC_Domain_Params dom_pars(Botan::get_EC_Dom_Pars_by_oid(oids[i]));
+
+      Botan::ECKAEG_PrivateKey private_a(rng, dom_pars);
+      Botan::ECKAEG_PublicKey public_a = private_a;
+
+      Botan::ECKAEG_PrivateKey private_b(rng, dom_pars);
+      Botan::ECKAEG_PublicKey public_b = private_b;
+
+      Botan::MemoryVector<Botan::byte> key_der_a = private_a.public_value();
+      Botan::MemoryVector<Botan::byte> key_der_b = private_b.public_value();
+      Botan::SymmetricKey alice_key = private_a.derive_key(key_der_b.begin(), key_der_b.size());
+      Botan::SymmetricKey bob_key = private_b.derive_key(key_der_a.begin(), key_der_a.size());
+      CHECK_MESSAGE(alice_key == bob_key, "different keys - " << "Alice's key was: " << alice_key.as_string() << ", Bob's key was: " << bob_key.as_string());
+      //cout << "key: " << alice_key.as_string() << endl;
+      }
+   }
+
+/**
+* The following test tests the copy ctors and and copy-assignment operators
+*/
+void test_eckaeg_cp_ctor_as_op(RandomNumberGenerator& rng)
+   {
+   std::cout << "." << std::flush;
+
+   std::string g_secp("024a96b5688ef573284664698968c38bb913cbfc82");
+   Botan::SecureVector<Botan::byte> sv_g_secp = decode_hex(g_secp);
+   BigInt bi_p_secp("0xffffffffffffffffffffffffffffffff7fffffff");
+   BigInt bi_a_secp("0xffffffffffffffffffffffffffffffff7ffffffc");
+   BigInt bi_b_secp("0x1c97befc54bd7a8b65acf89f81d4d4adc565fa45");
+   BigInt order = BigInt("0x0100000000000000000001f4c8f927aed3ca752257");
+   CurveGFp curve(GFpElement(bi_p_secp,bi_a_secp), GFpElement(bi_p_secp, bi_b_secp), bi_p_secp);
+   BigInt cofactor = BigInt(1);
+   PointGFp p_G = OS2ECP ( sv_g_secp, curve );
+   Botan::EC_Domain_Params dom_pars = Botan::EC_Domain_Params(curve, p_G, order, cofactor);
+
+   /**
+   * begin ECKAEG
+   */
+   // alices key (a key constructed by domain parameters IS an ephimeral key!)
+   Botan::ECKAEG_PrivateKey private_a(rng, dom_pars);
+   Botan::ECKAEG_PrivateKey private_a2(private_a);
+   Botan::ECKAEG_PrivateKey private_a3;
+   private_a3 = private_a2;
+
+   Botan::DH_PrivateKey dh_pr_empty;
+   Botan::DH_PublicKey dh_pub_empty;
+
+   Botan::ECKAEG_PublicKey public_a = private_a; // Bob gets this
+   Botan::ECKAEG_PublicKey public_a2(public_a);
+   Botan::ECKAEG_PublicKey public_a3;
+   public_a3 = public_a;
+   // Bob creates a key with a matching group
+   Botan::ECKAEG_PrivateKey private_b(rng, dom_pars); //public_a.getCurve()
+
+   // Bob sends the key back to Alice
+   Botan::ECKAEG_PublicKey public_b = private_b; // Alice gets this
+
+   // Both of them create a key using their private key and the other's
+   // public key
+   Botan::SymmetricKey alice_key = private_a.derive_key(public_b);
+   Botan::SymmetricKey alice_key_2 = private_a2.derive_key(public_b);
+   Botan::SymmetricKey alice_key_3 = private_a3.derive_key(public_b);
+
+   Botan::SymmetricKey bob_key = private_b.derive_key(public_a);
+   Botan::SymmetricKey bob_key_2 = private_b.derive_key(public_a2);
+   Botan::SymmetricKey bob_key_3 = private_b.derive_key(public_a3);
+
+   CHECK_MESSAGE(alice_key == bob_key, "different keys - " << "Alice's key was: " << alice_key.as_string() << ", Bob's key was: " << bob_key.as_string());
+   CHECK_MESSAGE(alice_key_2 == bob_key_2, "different keys - " << "Alice's key was: " << alice_key.as_string() << ", Bob's key was: " << bob_key.as_string());
+   CHECK_MESSAGE(alice_key_3 == bob_key_3, "different keys - " << "Alice's key was: " << alice_key.as_string() << ", Bob's key was: " << bob_key.as_string());
+   CHECK_MESSAGE(alice_key == bob_key_2, "different keys - " << "Alice's key was: " << alice_key.as_string() << ", Bob's key was: " << bob_key.as_string());
+   CHECK_MESSAGE(alice_key_2 == bob_key_3, "different keys - " << "Alice's key was: " << alice_key.as_string() << ", Bob's key was: " << bob_key.as_string());
+   }
+
+/**
+* The following test tests whether ECKAEG keys exhibit correct behaviour when it is
+* attempted to use them in an uninitialized state
+*/
+void test_non_init_eckaeg_keys(RandomNumberGenerator& rng)
+   {
+   std::cout << "." << std::flush;
+
+   // set up dom pars
+   std::string g_secp("024a96b5688ef573284664698968c38bb913cbfc82");
+   Botan::SecureVector<Botan::byte> sv_g_secp = decode_hex(g_secp);
+   BigInt bi_p_secp("0xffffffffffffffffffffffffffffffff7fffffff");
+   BigInt bi_a_secp("0xffffffffffffffffffffffffffffffff7ffffffc");
+   BigInt bi_b_secp("0x1c97befc54bd7a8b65acf89f81d4d4adc565fa45");
+   BigInt order = BigInt("0x0100000000000000000001f4c8f927aed3ca752257");
+   CurveGFp curve(GFpElement(bi_p_secp,bi_a_secp), GFpElement(bi_p_secp, bi_b_secp), bi_p_secp);
+   BigInt cofactor = BigInt(1);
+   PointGFp p_G = OS2ECP ( sv_g_secp, curve );
+   Botan::EC_Domain_Params dom_pars = Botan::EC_Domain_Params(curve, p_G, order, cofactor);
+
+   // alices key (a key constructed by domain parameters IS an emphemeral key!)
+   Botan::ECKAEG_PrivateKey private_a(rng, dom_pars);
+   Botan::ECKAEG_PrivateKey private_b(rng, dom_pars);
+
+   Botan::ECKAEG_PublicKey public_b;
+
+   Botan::ECKAEG_PrivateKey private_empty;
+   Botan::ECKAEG_PublicKey public_empty;
+
+   bool exc1 = false;
+   try
+      {
+      Botan::SymmetricKey void_key = private_empty.derive_key(public_b);
+      }
+   catch (Botan::Exception e)
+      {
+      exc1 = true;
+      }
+
+   CHECK_MESSAGE(exc1, "there was no exception thrown when attempting to use an uninitialized ECKAEG key");
+
+   bool exc2 = false;
+   try
+      {
+      Botan::SymmetricKey void_key = private_a.derive_key(public_empty);
+      }
+   catch (Botan::Exception e)
+      {
+      exc2 = true;
+      }
+
+   CHECK_MESSAGE(exc2, "there was no exception thrown when attempting to use an uninitialized ECKAEG key");
+   }
+
+}
+
+u32bit do_eckaeg_tests(Botan::RandomNumberGenerator& rng)
+   {
+   std::cout << "Testing ECKAEG (InSiTo unit tests): ";
+
+   test_eckaeg_normal_derivation(rng);
+   test_eckaeg_some_dp(rng);
+   test_eckaeg_der_derivation(rng);
+   test_eckaeg_cp_ctor_as_op(rng);
+   test_non_init_eckaeg_keys(rng);
+
+   std::cout << std::endl;
+
+   return 0;
+   }
+
+#else
+u32bit do_eckaeg_tests(Botan::RandomNumberGenerator&) { return 0; }
+#endif
diff --git a/checks/pk.cpp b/checks/pk.cpp
index f43dc2b08..bafbc57d2 100644
--- a/checks/pk.cpp
+++ b/checks/pk.cpp
@@ -756,6 +756,7 @@ u32bit do_pk_validation_tests(const std::string& filename,
    std::cout << std::endl;
 
    errors += do_ecdsa_tests(rng);
+   errors += do_eckaeg_tests(rng);
    do_pk_keygen_tests(rng);
    do_x509_tests(rng);
 
diff --git a/checks/validate.h b/checks/validate.h
index 939731914..6917d4fbe 100644
--- a/checks/validate.h
+++ b/checks/validate.h
@@ -22,6 +22,8 @@ u32bit do_pk_validation_tests(const std::string&,
                               Botan::RandomNumberGenerator&);
 
 u32bit do_ecdsa_tests(Botan::RandomNumberGenerator& rng);
+u32bit do_eckaeg_tests(Botan::RandomNumberGenerator& rng);
+
 void do_x509_tests(Botan::RandomNumberGenerator&);
 
 #endif