paillier 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f63285c7920e05242437975a03efa519083e7eed
-  data.tar.gz: dd8ac8fd45845371b140c96bcba512e4ece04607
+  metadata.gz: 7abfb860227e0f15e0f9f083884469f7615be645
+  data.tar.gz: 8c93d15448f9e6caffb6ad9980ba1c958094facf
 SHA512:
-  metadata.gz: 7951656a310e1b9a1ad402de9b765a51be1a690537cb24390527abfecf67389866921c35bc2b97174097fa65acabeb52686c5c14009af1c1f297bf950442728c
-  data.tar.gz: bbbc5f266370f5f55d87932d5744acf4c518208eae95237f10da1b41f73ed5cfebd048b20bf62ad7520a89b435fa46e5057d6ee7bef78e834c025fd73045ce6b
+  metadata.gz: e364613ba383aca3761cf242834d473f8f0704c8723c8072dc8ae9b14f8a0aab9bd61f5c8f530b660446145f0fda94ea81a100d196f7391dd3b167933d6c717e
+  data.tar.gz: e429ec57015496f0767cdb28360702435efd75ffc6e39d6264b7a4c81ac6e3dcbb3101c7187677b3a4c9afac4011cd8615e8ea73e9b7105d00442fde2f3fc15f

data/lib/paillier.rb

@@ -11,8 +11,6 @@ require_relative 'paillier/signatures'
 
 module Paillier
 
-	KeySize = 2048
-
 	def self.gcd(u,v) # :nodoc:
 		while(v > 0)
 			u, v = v, u % v
@@ -123,8 +121,11 @@ module Paillier
 	#
 	# Arguments:
 	#	publicKey: (Paillier::PublicKey)
-	#	plaintext: (Int)
+	#	plaintext: (Int, OpenSSL::BN, String)
 	def self.encrypt(publicKey, plaintext)
+		if( plaintext.is_a?(String) )
+			plaintext = OpenSSL::BN.new(plaintext)
+		end
 		return rEncrypt(publicKey, plaintext)[1]
 	end
 
@@ -136,9 +137,15 @@ module Paillier
 	#
 	# Arguments:
 	#	publicKey: (Paillier::PublicKey)
-	#	a: (Int)
-	#	b: (Int)
+	#	a: (Int, OpenSSL::BN, String)
+	#	b: (Int, OpenSSL::BN, String)
 	def self.eAdd(publicKey, a, b)
+		if( a.is_a?(String) )
+			a = OpenSSL::BN.new(a)
+		end
+		if( b.is_a?(String) )
+			b = OpenSSL::BN.new(b)
+		end
 		return a.to_bn.mod_mul(b, publicKey.n_sq)
 	end
 
@@ -150,9 +157,15 @@ module Paillier
 	#
 	# Arguments:
 	#	publicKey: (Paillier::PublicKey)
-	#	a: (Int)
-	#	b: (Int)
+	#	a: (Int, OpenSSL::BN, String)
+	#	n: (Int, OpenSSL::BN, String)
 	def self.eAddConst(publicKey, a, n)
+		if( a.is_a?(String) )
+			a = OpenSSL::BN.new(a)
+		end
+		if( n.is_a?(String) )
+			n = OpenSSL::BN.new(n)
+		end
 		return a.to_bn.mod_mul(modPow(publicKey.g, n, publicKey.n_sq), publicKey.n_sq)
 	end
 
@@ -164,7 +177,15 @@ module Paillier
 	#
 	# Arguments:
 	#	publicKey: (Paillier::PublicKey)
+	#	a: (Int, OpenSSL::BN, String)
+	#	n: (Int, OpenSSL::BN, String)
 	def self.eMulConst(publicKey, a, n)
+		if( a.is_a?(String) )
+			a = OpenSSL::BN.new(a)
+		end
+		if( n.is_a?(String) )
+			n = OpenSSL::BN.new(n)
+		end
 		return modPow(a, n, publicKey.n_sq)
 	end
 
@@ -177,8 +198,11 @@ module Paillier
 	# Arguments:
 	#	privKey: (Paillier::PrivateKey)
 	#	pubKey: (Paillier::PublicKey)
-	#	ciphertext: (Int)
+	#	ciphertext: (Int, OpenSSL::BN, String)
 	def self.decrypt(privKey, pubKey, ciphertext)
+		if( ciphertext.is_a?(String) )
+			ciphertext = OpenSSL::BN.new(ciphertext)
+		end
 		# We want to run: x = ((cipher ** priv.l) % pub.n_sq) - 1
 		# But the numbers are too big, so we'll use openssl
 		x = ciphertext.to_bn.mod_exp(privKey.l, pubKey.n_sq) - 1
@@ -195,8 +219,11 @@ module Paillier
 	# Arguments:
 	#	priv: (Paillier::PrivateKey)
 	#	pub: (Paillier::PublicKey)
-	#	data: (Int)
+	#	data: (Int, OpenSSL::BN, String)
 	def self.sign(priv, pub, data)
+		if( data.is_a?(String) )
+			data = OpenSSL::BN.new(data)
+		end
 		hashData = hash(data)
 		# L(u) = (u-1)/n
 		numerators1 = ((hashData.to_bn.mod_exp(priv.l, pub.n_sq) - 1) / pub.n.to_bn)[0]
@@ -225,9 +252,12 @@ module Paillier
 	#
 	# Arguments:
 	#	pub: (Paillier::PublicKey)
-	#	message: (Int)
+	#	message: (Int, OpenSSL::BN, String)
 	#	sig: (Paillier::Signature)
 	def self.validSignature?(pub, message, sig)
+		if( message.is_a?(String) )
+			message = OpenSSL::BN.new(message)
+		end
 		hash = Digest::SHA256.hexdigest(message.to_s).to_i(16)
 		# We want to run (g ** s1) * (s2 ** n) % (n**2)
 		# But all those numbers are huge, so we approach it in stages

data/lib/paillier/keys.rb

@@ -6,6 +6,31 @@ module Paillier
 			@l = l
 			@m = m
 		end
+
+		# Serialize a private key to string form
+		#
+		# Example:
+		#	>> priv, pub = Paillier.generateKeypair(2048)
+		#	>> priv.to_s
+		#	=> "110107191408889682017277609474037601699496910..."
+		#
+		def to_s
+			return "#{@l},#{@m}"
+		end
+
+		# De-serialize a private key string back into object form
+		#
+		# Example:
+		#	>> s = priv.to_s
+		#	>> newPriv = Paillier::PrivateKey.from_s(s)
+		#	=> #<Paillier::PrivateKey>
+		#
+		# Arguments:
+		#	string (String)
+		def PrivateKey.from_s(string)
+			l,m = string.split(",")
+			return PrivateKey.new(l.to_i, m.to_i)
+		end
 	end
 
 	class PublicKey

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paillier
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Daylighting Society
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-18 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies: []
 description: An implementation of Paillier homomorphic addition public key system
 email: paillier@daylightingsociety.org
@@ -40,7 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Paillier Homomorphic Cryptosystem