_

3 files changed, 3 insertions, 150 deletions

diff --git a/java/Makefile b/java/Makefile
index 3295f82..fb10814 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -19,7 +19,7 @@ TARGET=../bin/libmcl_elgamal.$(LIB_SUF)
 JAVA_EXE=cd ../bin && LD_LIBRARY_PATH=./:$(LD_LIBRARY_PATH) java -classpath ../java
 all: $(TARGET)
 
-elgamal_wrap.cxx: elgamal.i elgamal.hpp
+elgamal_wrap.cxx: elgamal.i elgamal_impl.hpp
 	$(MKDIR) $(PACKAGE_DIR)
 	swig -java -package $(PACKAGE_NAME) -outdir $(PACKAGE_DIR) -c++ -Wall elgamal.i
 
diff --git a/java/elgamal.hpp b/java/elgamal.hpp
deleted file mode 100644
index dbf2ba6..0000000
--- a/java/elgamal.hpp
+++ /dev/null
@@ -1,147 +0,0 @@
-#pragma once
-//#define MCL_MAX_BIT_SIZE 521
-#include <iostream>
-#include <fstream>
-#include <cybozu/random_generator.hpp>
-#include <cybozu/crypto.hpp>
-#include <mcl/fp.hpp>
-#include <mcl/ecparam.hpp>
-#include <mcl/elgamal.hpp>
-
-typedef mcl::FpT<mcl::FpTag, 521> Fp;
-typedef mcl::FpT<mcl::ZnTag, 521> Zn;
-typedef mcl::EcT<Fp> Ec;
-typedef mcl::ElgamalT<Ec, Zn> Elgamal;
-
-/*
-	init system
-	@param param [in] string such as "ecParamName hashName"
-	@note NOT thread safe because setting global parameters of elliptic curve
-	ex1) "secp192k1 sha256" // 192bit security + sha256
-	ex2) "secp160k1 sha1" // 160bit security + sha1
-	hashName : sha1 sha224 sha256 sha384 sha512
-*/
-void SystemInit(const std::string& param) throw(std::exception)
-{
-	std::istringstream iss(param);
-	std::string ecParamStr;
-	std::string hashNameStr;
-	if (iss >> ecParamStr >> hashNameStr) {
-		Param& p = Param::getParam();
-		p.ecParam = mcl::getEcParam(ecParamStr);
-		Zn::init(p.ecParam->n);
-		Fp::init(p.ecParam->p);
-		Ec::init(p.ecParam->a, p.ecParam->b);
-		p.hashName = cybozu::crypto::Hash::getName(hashNameStr);
-		return;
-	}
-	throw cybozu::Exception("SystemInit:bad param") << param;
-}
-
-class CipherText {
-	Elgamal::CipherText self_;
-	friend class PublicKey;
-	friend class PrivateKey;
-public:
-	std::string toStr() const throw(std::exception) { return self_.toStr(); }
-	std::string toString() const throw(std::exception) { return toStr(); }
-	void fromStr(const std::string& str) throw(std::exception) { self_.fromStr(str); }
-
-	void add(const CipherText& c) throw(std::exception) { self_.add(c.self_); }
-	void mul(int m) throw(std::exception)
-	{
-		self_.mul(m);
-	}
-	void mul(const std::string& str) throw(std::exception)
-	{
-		Zn zn(str);
-		self_.mul(zn);
-	}
-};
-
-class PublicKey {
-	Elgamal::PublicKey self_;
-	friend class PrivateKey;
-public:
-	std::string toStr() const throw(std::exception) { return self_.toStr(); }
-	std::string toString() const throw(std::exception) { return toStr(); }
-	void fromStr(const std::string& str) throw(std::exception) { self_.fromStr(str); }
-
-	void save(const std::string& fileName) const throw(std::exception)
-	{
-		std::ofstream ofs(fileName.c_str(), std::ios::binary);
-		if (!(ofs << self_)) throw cybozu::Exception("PublicKey:save") << fileName;
-	}
-	void load(const std::string& fileName) throw(std::exception)
-	{
-		std::ifstream ifs(fileName.c_str(), std::ios::binary);
-		if (!(ifs >> self_)) throw cybozu::Exception("PublicKey:load") << fileName;
-	}
-	void enc(CipherText& c, int m) const throw(std::exception)
-	{
-		self_.enc(c.self_, m, Param::getParam().rg);
-	}
-	void enc(CipherText& c, const std::string& str) const throw(std::exception)
-	{
-		Zn zn(str);
-		self_.enc(c.self_, zn, Param::getParam().rg);
-	}
-	void rerandomize(CipherText& c) const throw(std::exception)
-	{
-		self_.rerandomize(c.self_, Param::getParam().rg);
-	}
-	void add(CipherText& c, int m) const throw(std::exception)
-	{
-		self_.add(c.self_, m);
-	}
-	void add(CipherText& c, const std::string& str) const throw(std::exception)
-	{
-		Zn zn(str);
-		self_.add(c.self_, zn);
-	}
-};
-
-class PrivateKey {
-	Elgamal::PrivateKey self_;
-public:
-	std::string toStr() const throw(std::exception) { return self_.toStr(); }
-	std::string toString() const throw(std::exception) { return toStr(); }
-	void fromStr(const std::string& str) throw(std::exception) { self_.fromStr(str); }
-
-	void save(const std::string& fileName) const throw(std::exception)
-	{
-		std::ofstream ofs(fileName.c_str(), std::ios::binary);
-		if (!(ofs << self_)) throw cybozu::Exception("PrivateKey:save") << fileName;
-	}
-	void load(const std::string& fileName) throw(std::exception)
-	{
-		std::ifstream ifs(fileName.c_str(), std::ios::binary);
-		if (!(ifs >> self_)) throw cybozu::Exception("PrivateKey:load") << fileName;
-	}
-	void init() throw(std::exception)
-	{
-		Param& p = Param::getParam();
-		const Fp x0(p.ecParam->gx);
-		const Fp y0(p.ecParam->gy);
-		Ec P(x0, y0);
-		self_.init(P, Zn::getBitSize(), p.rg);
-	}
-	PublicKey getPublicKey() const throw(std::exception)
-	{
-		PublicKey ret;
-		ret.self_ = self_.getPublicKey();
-		return ret;
-	}
-	int dec(const CipherText& c, bool *b = 0) const throw(std::exception)
-	{
-		return self_.dec(c.self_, b);
-	}
-	void setCache(int rangeMin, int rangeMax) throw(std::exception)
-	{
-		self_.setCache(rangeMin, rangeMax);
-	}
-	void clearCache() throw(std::exception)
-	{
-		self_.clearCache();
-	}
-};
diff --git a/java/elgamal.i b/java/elgamal.i
index 208a8ab..4107231 100644
--- a/java/elgamal.i
+++ b/java/elgamal.i
@@ -20,9 +20,9 @@ static inline Param& getParam()
 }
 };
 
-#include "elgamal.hpp"
+#include "elgamal_impl.hpp"
 %}
 %include cpointer.i
 %pointer_functions(bool, p_bool);
 
-%include "elgamal.hpp"
+%include "elgamal_impl.hpp"