3 files changed, 154 insertions, 0 deletions
diff --git a/src/lib/pubkey/mceies/info.txt b/src/lib/pubkey/mceies/info.txt
new file mode 100644
index 000000000..b4a25329e
--- /dev/null
+++ b/src/lib/pubkey/mceies/info.txt
@@ -0,0 +1,5 @@
+
+<requires>
+mce
+ocb
+</requires>
diff --git a/src/lib/pubkey/mceies/mceies.cpp b/src/lib/pubkey/mceies/mceies.cpp
new file mode 100644
index 000000000..0ceda2dda
--- /dev/null
+++ b/src/lib/pubkey/mceies/mceies.cpp
@@ -0,0 +1,106 @@
+/*
+* McEliece Integrated Encryption System
+* (C) 2014,2015 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#include <botan/mceies.h>
+#include <botan/aead.h>
+#include <botan/mceliece.h>
+#include <botan/mce_kem.h>
+
+namespace Botan {
+
+namespace {
+
+secure_vector<byte> aead_key(const secure_vector<byte>& mk,
+                             const AEAD_Mode& aead)
+   {
+   // Fold the key as required for the AEAD mode in use
+   if(aead.valid_keylength(mk.size()))
+      return mk;
+
+   secure_vector<byte> r(aead.key_spec().maximum_keylength());
+   for(size_t i = 0; i != mk.size(); ++i)
+      r[i % r.size()] ^= mk[i];
+   return r;
+   }
+
+}
+
+secure_vector<byte>
+mceies_encrypt(const McEliece_PublicKey& pubkey,
+               const secure_vector<byte>& pt,
+               byte ad[], size_t ad_len,
+               RandomNumberGenerator& rng)
+   {
+   McEliece_KEM_Encryptor kem_op(pubkey);
+
+   const std::pair<secure_vector<byte>,secure_vector<byte>> mce_ciphertext__key = kem_op.encrypt(rng);
+   const secure_vector<byte>& mce_ciphertext = mce_ciphertext__key.first;
+   const secure_vector<byte>& mce_key = mce_ciphertext__key.second;
+
+   const size_t mce_code_bytes = (pubkey.get_code_length() + 7) / 8;
+
+   BOTAN_ASSERT(mce_ciphertext.size() == mce_code_bytes, "Unexpected size");
+
+   std::unique_ptr<AEAD_Mode> aead(get_aead("AES-256/OCB", ENCRYPTION));
+   if(!aead)
+      throw std::runtime_error("mce_encrypt unable to create AEAD instance");
+
+   const size_t nonce_len = aead->default_nonce_length();
+
+   aead->set_key(aead_key(mce_key, *aead));
+   aead->set_associated_data(ad, ad_len);
+
+   const secure_vector<byte> nonce = rng.random_vec(nonce_len);
+
+   secure_vector<byte> msg(mce_ciphertext.size() + nonce.size() + pt.size());
+   copy_mem(&msg[0], &mce_ciphertext[0], mce_ciphertext.size());
+   copy_mem(&msg[mce_ciphertext.size()], &nonce[0], nonce.size());
+   copy_mem(&msg[mce_ciphertext.size() + nonce.size()], &pt[0], pt.size());
+
+   aead->start(nonce);
+   aead->finish(msg, mce_ciphertext.size() + nonce.size());
+   return msg;
+   }
+
+secure_vector<byte>
+mceies_decrypt(const McEliece_PrivateKey& privkey,
+               const secure_vector<byte>& ct,
+               byte ad[], size_t ad_len)
+   {
+   try
+      {
+      McEliece_KEM_Decryptor kem_op(privkey);
+
+      const size_t mce_code_bytes = (privkey.get_code_length() + 7) / 8;
+
+      std::unique_ptr<AEAD_Mode> aead(get_aead("AES-256/OCB", DECRYPTION));
+      if(!aead)
+         throw std::runtime_error("Unable to create AEAD instance");
+
+      const size_t nonce_len = aead->default_nonce_length();
+
+      if(ct.size() < mce_code_bytes + nonce_len + aead->tag_size())
+         throw std::runtime_error("Input message too small to be valid");
+
+      const secure_vector<byte> mce_key = kem_op.decrypt(&ct[0], mce_code_bytes);
+
+      aead->set_key(aead_key(mce_key, *aead));
+      aead->set_associated_data(ad, ad_len);
+
+      secure_vector<byte> pt(&ct[mce_code_bytes + nonce_len], &ct[ct.size()]);
+
+      aead->start(&ct[mce_code_bytes], nonce_len);
+      aead->finish(pt, 0);
+      return pt;
+      }
+   catch(std::exception& e)
+      {
+      throw std::runtime_error("mce_decrypt failed: " + std::string(e.what()));
+      }
+   }
+
+}
diff --git a/src/lib/pubkey/mceies/mceies.h b/src/lib/pubkey/mceies/mceies.h
new file mode 100644
index 000000000..7a03ca580
--- /dev/null
+++ b/src/lib/pubkey/mceies/mceies.h
@@ -0,0 +1,43 @@
+/*
+* McEliece Integrated Encryption System
+* (C) 2014,2015 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#ifndef BOTAN_MCEIES_H__
+#define BOTAN_MCEIES_H__
+
+#include <botan/secmem.h>
+#include <botan/rng.h>
+
+namespace Botan {
+
+class McEliece_PublicKey;
+class McEliece_PrivateKey;
+
+/**
+* McEliece Integrated Encryption System
+* Derive a shared key using MCE KEM and encrypt/authenticate the
+* plaintext and AD using AES-256 in OCB mode.
+*/
+secure_vector<byte>
+BOTAN_DLL mceies_encrypt(const McEliece_PublicKey& pubkey,
+                         const secure_vector<byte>& pt,
+                         byte ad[], size_t ad_len,
+                         RandomNumberGenerator& rng);
+
+/**
+* McEliece Integrated Encryption System
+* Derive a shared key using MCE KEM and decrypt/authenticate the
+* ciphertext and AD using AES-256 in OCB mode.
+*/
+secure_vector<byte>
+BOTAN_DLL mceies_decrypt(const McEliece_PrivateKey& privkey,
+                         const secure_vector<byte>& ct,
+                         byte ad[], size_t ad_len);
+
+
+}
+
+#endif