vchain_client 1.0.34 → 1.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 893c39ca202c6580ddf340cabde948b5d6d0c4f2
-  data.tar.gz: 8deb77713e871f50dedb10a2bce6fbf80e1f95ca
+  metadata.gz: e923e1b7f09ce1695959a48bc2fb935989b4e6fe
+  data.tar.gz: dd38c906da6bff58071e6879af626f0f65c36388
 SHA512:
-  metadata.gz: e09f53202548e50ddac690ba1c6b87ba7fc346360997dff3f433f8992d8e82bef82602cc193168548e5aec6befcd220932814d1a2053f098f98de98bc9aadfc9
-  data.tar.gz: de4c07dce7135ae1823569730e8c7b976c6c97f9562cd4970eacb47d8c05a512109dc2a422a56d68b9ae846e5ab4e056dd708358a76d630afd156f9d152b0e3b
+  metadata.gz: a640e3c3a874a8008dfc487c6fb7174ff5828b9726e49bd3c6cc71ae5f89c46f01e71e35a6e0e9cfafe608e69639ce8aecfc8445745895aced391ae236abe8f2
+  data.tar.gz: 3729bd6925665b03666ae2837dde05f6ff1e3f72fedc133f495a000aa42e7e52b6a0e9cde0fb56f6288b37a358f75c9483bf01765a3f271ba69932557f68b2ce

data/lib/vchain_client/blockstack_client.rb

@@ -131,10 +131,10 @@ module VChainClient
 	  			return false
 	  		end
 
-	  		signaturesHelper = VChainClient::Signatures.new(@config)
+	  		cryptoHelper = VChainClient::Crypto.new(@config)
 
 	  		if @log.debug?
-	  			@log.debug("[Blockstack.checkBlockstackRecord] Signatures initialized")
+	  			@log.debug("[Blockstack.checkBlockstackRecord] Crypto initialized")
 	  		end
 
 	  		if record != nil
@@ -238,12 +238,17 @@ module VChainClient
   							return false
   						end
 
-						# check client's sig
+						# check client's sig version 1
+						client_sig = record["client_sig"]
+
+						validator_sig = record["validator_sig"]
+
 						client_sig_to_check = record["vchain_id"] + record["vchain_role"] + blockstack_id + record["ecc_pubkey"] + record["sig_version"];
 
 						validator_sig_to_check = record["vchain_id"] + record["vchain_role"] + blockstack_id + record["ecc_pubkey"] + record["sig_version"] + record["validator_vchain_id"] + validator_blockstack_id
 
-						if record["sig_version"] != "1"
+						# client's sig versions 2 && 3
+						if record["sig_version"] == "2" || record["sig_version"] == "3"
 
 							# need to retrieve RSA key
 							if !record.key?("rsa_pubkey")
@@ -256,19 +261,38 @@ module VChainClient
 								return false
 							end
 
-							client_sig_to_check = record["vchain_id"] + record["vchain_role"] + blockstack_id + record["ecc_pubkey"] + record["rsa_pubkey"] + record["sig_version"];
+							if record["sig_version"] == "2"
+								# sig version 2
+
+								client_sig = record["client_sig_v2"]
+
+								validator_sig = record["validator_sig_v2"]
+
+								client_sig_to_check = record["vchain_id"] + record["vchain_role"] + blockstack_id + record["ecc_pubkey"] + record["rsa_pubkey"] + record["sig_version"];
+
+								validator_sig_to_check = record["vchain_id"] + record["vchain_role"] + blockstack_id + record["ecc_pubkey"].gsub(/\n/, "") + record["rsa_pubkey"].gsub(/\n/, "") + record["sig_version"] + record["validator_vchain_id"] + validator_blockstack_id
 
-							validator_sig_to_check = record["vchain_id"] + record["vchain_role"] + blockstack_id + record["ecc_pubkey"].gsub(/\n/, "") + record["rsa_pubkey"].gsub(/\n/, "") + record["sig_version"] + record["validator_vchain_id"] + validator_blockstack_id
+							elsif record["sig_version"] == "3"
+								# sig version 3
+
+								client_sig = record["client_sig_v3"]
+
+								validator_sig = record["validator_sig_v3"]
+
+								client_sig_to_check = record["vchain_id"] + record["vchain_role"] + blockstack_id + record["ecc_pubkey"].gsub(/\n/, "") + record["rsa_pubkey"].gsub(/\n/, "") + record["sig_version"];
+
+								validator_sig_to_check = record["vchain_id"] + record["vchain_role"] + blockstack_id + record["ecc_pubkey"].gsub(/\n/, "") + record["rsa_pubkey"].gsub(/\n/, "") + record["sig_version"] + record["validator_vchain_id"] + validator_blockstack_id
+							end
 						end
 
 						begin
 
-							if signaturesHelper.verifySignature(client_sig_to_check, record["client_sig"], record["ecc_pubkey"])
+							if cryptoHelper.verifySignature(client_sig_to_check, client_sig, record["ecc_pubkey"])
 								
 								# check validator's sig
 								begin
 
-									if signaturesHelper.verifySignature(validator_sig_to_check, record["validator_sig"], validator_ecc_pub_key)
+									if cryptoHelper.verifySignature(validator_sig_to_check, validator_sig, validator_ecc_pub_key)
 										
 										return true;
 
@@ -556,7 +580,7 @@ module VChainClient
 				recs = line.split(" ")
 
 				if recs.size == 3
-					if recs[0] == "A1" || recs[0] == "A2" || recs[0] == "A3" || recs[0] == "A4" || recs[0] == "A5" || recs[0] == "A6" || recs[0] == "A7" || recs[0] == "A8" || recs[0] == "A9"
+					if recs[0] == "A1" || recs[0] == "A2" || recs[0] == "A3" || recs[0] == "A4" || recs[0] == "A5" || recs[0] == "A6" || recs[0] == "A7" || recs[0] == "A8" || recs[0] == "A9" || recs[0] == "A10" || recs[0] == "A11"
 						fz[recs[0]] = recs[2][1..-2]
 					end
 				end
@@ -573,13 +597,13 @@ module VChainClient
 	  			ecc_pubkey = ecc_pubkey_aligned[0..63] +"\n"+ ecc_pubkey_aligned[64..ecc_pubkey_aligned.length]
 
 	  			rsa_pubkey = nil
-	  			if fz["A7"] != "1"
+	  			if fz["A7"] == "2" || fz["A7"] == "3"
+	  				# sig versions 2 && 3
 
 	  				if !fz.key?("A9")
 			  			if @log.error?
 		  					@log.error("[Blockstack.getBlockstackRecord] no 'A9' field, sig ver is >1")
 		  					@log.error("-> blockstack_id: #{blockstack_id}")
-		  					@log.error("--> blockstack_id: #{blockstack_id}")
 		  				end
 
 		  				return nil
@@ -601,6 +625,31 @@ module VChainClient
 					"client_sig"              => Base64.decode64(fz["A8"])
 	  			}
 
+	  			if fz["A7"] == "2" || fz["A7"] == "3"
+	  				# sig versions 2 && 3
+
+	  				output["client_sig_v2"]    = Base64.decode64(fz["A8"])
+	  				output["validator_sig_v2"] = Base64.decode64(fz["A3"])
+
+	  				if fz["A7"] == "3"
+	  					# sig version 3
+
+		  				if !fz.key?("A10") || !fz.key?("A11")
+				  			if @log.error?
+			  					@log.error("[Blockstack.getBlockstackRecord] no 'A10' or 'A11' fields, sig ver = 3")
+			  					@log.error("-> blockstack_id: #{blockstack_id}")
+			  				end
+
+			  				return nil
+		  				end
+
+		  				output["client_sig_v3"]    = Base64.decode64(fz["A10"])
+		  				output["validator_sig_v3"] = Base64.decode64(fz["A11"])
+
+	  				end
+
+	  			end
+
 		  		if @log.debug?
 		  			@log.debug("[Blockstack.getBlockstackRecord] output:")
 		  			@log.debug(output)

data/lib/vchain_client/{signatures.rb → crypto.rb}

@@ -1,12 +1,17 @@
 module VChainClient
 
-	class Signatures
+	class Crypto
 
 		@config = nil
 		@log = nil
 
-		@@priv_key = nil
-		@@ec_priv = nil
+		@@ecc_private_key = nil
+		@@ec_ecc_private = nil
+
+		@@rsa_private_key = nil
+		@@ec_rsa_private = nil
+
+		@@vchain_rsa_public_key = nil
 
 	    def initialize(config)
 	    	@config = config
@@ -14,28 +19,193 @@ module VChainClient
 	    	@log = Log4r::Logger["vchain_client"]
 	    end 
 
+	    def getVChainPublicKeyRSA()
+
+			if @@vchain_rsa_public_key != nil
+				return @@vchain_rsa_public_key
+			end
+
+			blockstackClient = VChainClient::BlockstackClient.new(@config)
+
+			vchain_public_key_body = nil
+
+			begin
+
+				vchain_public_key_body = blockstackClient.getPublicKeyRSA("vchain_core_01.id")
+
+			rescue => e
+				if @log.error?
+				  @log.error("[check] failed to retrieve vchain public RSA key from Blockstack")
+				  @log.error("#{e.class}, #{e.message}")
+				end
+
+				raise e
+			end
+
+			if vchain_public_key_body == nil
+				if @log.error?
+				  @log.error("[check] failed to retrieve vchain public RSA key from Blockstack")
+				end
+
+				return false
+			end
+
+			vchain_public_key_str = "-----BEGIN PUBLIC KEY-----\n"
+			vchain_public_key_str += vchain_public_key_body
+			vchain_public_key_str += "\n-----END PUBLIC KEY-----"
+
+			@@vchain_rsa_public_key = OpenSSL::PKey::RSA.new(vchain_public_key_str)
+
+			return @@vchain_rsa_public_key
+	    end
+
+	    def encodeRSA(payload)
+	    	vchain_public_key = self.getVChainPublicKeyRSA()
+
+	    	return vchain_public_key.public_encrypt(payload, OpenSSL::PKey::RSA::PKCS1_OAEP_PADDING)
+	    end
+
+	    def decodeRSA(encoded_data)
+
+			priv_key_path = @config["rsa_private_key_location"]
+
+			if @log.debug?
+				@log.debug("[Crypto.decodeRSA] input:")
+				@log.debug("-> key path: #{priv_key_path}")
+				@log.debug("-> input:")
+				@log.debug(encoded_data)
+			end
+
+			if @@rsa_private_key == nil
+
+				begin
+
+					@@rsa_private_key = File.read(priv_key_path)
+
+				rescue => e
+					if @log.error?
+						@log.error("[Crypto.decodeRSA] File.read raised exception:")
+						@log.error("#{e.class}, #{e.message}")
+						@log.error("--> priv_key_path: #{priv_key_path}")
+						@log.error("-> input:")
+						@log.error(encoded_data)
+					end
+
+					raise e
+				end
+
+				if @log.debug?
+					@log.debug("[Crypto.decodeRSA] priv key is loaded")
+				end
+
+			end
+
+			if @@rsa_private_key == nil
+				if @log.error?
+					@log.error("[Crypto.decodeRSA] failed to load private key")
+					@log.error("--> priv_key_path: #{priv_key_path}")
+					@log.error("-> input:")
+					@log.error(encoded_data)
+				end
+
+				return nil
+			end
+
+			if @@ec_rsa_private == nil
+
+				begin
+					
+					@@ec_rsa_private = OpenSSL::PKey::RSA.new(@@rsa_private_key)
+
+				rescue => e
+					if @log.error?
+						@log.error("[Crypto.decodeRSA] OpenSSL::PKey::EC.new raised exception:")
+						@log.error("#{e.class}, #{e.message}")
+						@log.error("--> priv_key_path: #{priv_key_path}")
+						@log.error("-> input:")
+						@log.error(encoded_data)
+					end
+
+					raise e
+				end
+
+				if @log.debug?
+					@log.debug("[Crypto.decodeRSA] key initialized")
+				end
+
+			end
+
+			if @@ec_rsa_private == nil
+				if @log.error?
+					@log.error("[Crypto.decodeRSA] failed init EC key")
+					@log.error("--> priv_key_path: #{priv_key_path}")
+					@log.error("-> input:")
+					@log.error(encoded_data)
+				end
+
+				return nil
+			end
+
+	        return @@ec_rsa_private.private_decrypt(encoded_data, OpenSSL::PKey::RSA::PKCS1_OAEP_PADDING)
+	    end
+
+	    def decodeCypher(encoded_payload, key, iv)
+
+			cifd = OpenSSL::Cipher.new('AES-256-CBC')
+
+			#cifd.padding = 0
+
+			cifd.decrypt
+
+			cifd.key = key
+			cifd.iv  = iv
+
+			decoded = ''
+			decoded << cifd.update(encoded_payload)
+			decoded << cifd.final
+
+			return decoded
+	    end
+
+	    def encodeCypher(document)
+			cif = OpenSSL::Cipher.new('AES-256-CBC')
+
+			cif.encrypt
+
+			cif.key = key = cif.random_key
+			cif.iv  = iv  = cif.random_iv
+
+			out = {
+				"payload" => (cif.update(document) + cif.final),
+				"key" => key,
+				"iv" => iv
+			}
+
+			return out
+	    end
+
 	    def signBatchRequest(batch, timestamp)
 			OpenSSL::PKey::EC.send(:alias_method, :private?, :private_key?)
 
 			priv_key_path = @config["ecc_private_key_location"]
 
 			if @log.debug?
-				@log.debug("[Signatures.signBatchRequest] input:")
+				@log.debug("[Crypto.signBatchRequest] input:")
 				@log.debug("-> timestamp: "+ timestamp.to_s)
 				@log.debug("-> key path: #{priv_key_path}")
 				@log.debug("-> input:")
 				@log.debug(batch)
 			end
 
-			if @@priv_key == nil
+			if @@ecc_private_key == nil
 
 				begin
 
-					@@priv_key = File.read(priv_key_path)
+					@@ecc_private_key = File.read(priv_key_path)
 
 				rescue => e
 					if @log.error?
-						@log.error("[Signatures.signBatchRequest] File.read raised exception:")
+						@log.error("[Crypto.signBatchRequest] File.read raised exception:")
 						@log.error("#{e.class}, #{e.message}")
 						@log.error("-> timestamp: "+ timestamp.to_s)
 						@log.error("--> priv_key_path: #{priv_key_path}")
@@ -47,14 +217,14 @@ module VChainClient
 				end
 
 				if @log.debug?
-					@log.debug("[Signatures.signBatchRequest] priv key is loaded")
+					@log.debug("[Crypto.signBatchRequest] priv key is loaded")
 				end
 
 			end
 
-			if @@priv_key == nil
+			if @@ecc_private_key == nil
 				if @log.error?
-					@log.error("[Signatures.signBatchRequest] failed to load private key")
+					@log.error("[Crypto.signBatchRequest] failed to load private key")
 					@log.error("-> timestamp: "+ timestamp.to_s)
 					@log.error("--> priv_key_path: #{priv_key_path}")
 					@log.error("-> input:")
@@ -64,15 +234,15 @@ module VChainClient
 				return nil
 			end
 
-			if @@ec_priv == nil
+			if @@ec_ecc_private == nil
 
 				begin
 					
-					@@ec_priv = OpenSSL::PKey::EC.new(@@priv_key)
+					@@ec_ecc_private = OpenSSL::PKey::EC.new(@@ecc_private_key)
 
 				rescue => e
 					if @log.error?
-						@log.error("[Signatures.signBatchRequest] OpenSSL::PKey::EC.new raised exception:")
+						@log.error("[Crypto.signBatchRequest] OpenSSL::PKey::EC.new raised exception:")
 						@log.error("#{e.class}, #{e.message}")
 						@log.error("-> timestamp: "+ timestamp.to_s)
 						@log.error("--> priv_key_path: #{priv_key_path}")
@@ -84,14 +254,14 @@ module VChainClient
 				end
 
 				if @log.debug?
-					@log.debug("[Signatures.signBatchRequest] key initialized")
+					@log.debug("[Crypto.signBatchRequest] key initialized")
 				end
 
 			end
 
-			if @@ec_priv == nil
+			if @@ec_ecc_private == nil
 				if @log.error?
-					@log.error("[Signatures.signBatchRequest] failed init EC key")
+					@log.error("[Crypto.signBatchRequest] failed init EC key")
 					@log.error("-> timestamp: "+ timestamp.to_s)
 					@log.error("--> priv_key_path: #{priv_key_path}")
 					@log.error("-> input:")
@@ -113,18 +283,18 @@ module VChainClient
 			}
 
 			if @log.debug?
-				@log.debug("[Signatures.signBatchRequest] whole_to_sign: "+ whole_sign)
+				@log.debug("[Crypto.signBatchRequest] whole_to_sign: "+ whole_sign)
 			end
 
 			whole_signature = nil
 
 			begin
 				
-				whole_signature = @@ec_priv.sign(digest, whole_sign)
+				whole_signature = @@ec_ecc_private.sign(digest, whole_sign)
 
 			rescue => e
 				if @log.error?
-					@log.error("[Signatures.signBatchRequest] ec.sign raised exception:")
+					@log.error("[Crypto.signBatchRequest] ec.sign raised exception:")
 					@log.error("#{e.class}, #{e.message}")
 					@log.error("-> timestamp: "+ timestamp.to_s)
 					@log.error("--> priv_key_path: #{priv_key_path}")
@@ -138,7 +308,7 @@ module VChainClient
 
 			if whole_signature == nil
 				if @log.error?
-					@log.error("[Signatures.signBatchRequest] failed to sign")
+					@log.error("[Crypto.signBatchRequest] failed to sign")
 					@log.error("-> timestamp: "+ timestamp.to_s)
 					@log.error("--> priv_key_path: #{priv_key_path}")
 					@log.error("--> whole_sign: #{whole_sign}")
@@ -150,7 +320,7 @@ module VChainClient
 			end
 
 			if @log.debug?
-				@log.debug("[Signatures.signBatchRequest] whole_signature raw: "+ Base64.encode64(whole_signature))
+				@log.debug("[Crypto.signBatchRequest] whole_signature raw: "+ Base64.encode64(whole_signature))
 			end
 
 			return Base64.encode64(whole_signature).gsub(/\n/, "")
@@ -163,7 +333,7 @@ module VChainClient
 			priv_key_path = @config["ecc_private_key_location"]
 
 			if @log.debug?
-				@log.debug("[Signatures.signRequest] input:")
+				@log.debug("[Crypto.signRequest] input:")
 				@log.debug("-> point_type: "+ point_type)
 				@log.debug("-> weight: "+ weight.to_s)
 				@log.debug("-> timestamp: "+ timestamp.to_s)
@@ -172,15 +342,15 @@ module VChainClient
 				@log.debug(document)
 			end
 
-			if @@priv_key == nil
+			if @@ecc_private_key == nil
 
 				begin
 
-					@@priv_key = File.read(priv_key_path)
+					@@ecc_private_key = File.read(priv_key_path)
 
 				rescue => e
 					if @log.error?
-						@log.error("[Signatures.signRequest] File.read raised exception:")
+						@log.error("[Crypto.signRequest] File.read raised exception:")
 						@log.error("#{e.class}, #{e.message}")
 						@log.error("-> point_type: "+ point_type)
 						@log.error("-> weight: "+ weight.to_s)
@@ -194,14 +364,14 @@ module VChainClient
 				end
 
 				if @log.debug?
-					@log.debug("[Signatures.signRequest] priv key is loaded")
+					@log.debug("[Crypto.signRequest] priv key is loaded")
 				end
 
 			end
 
-			if @@priv_key == nil
+			if @@ecc_private_key == nil
 				if @log.error?
-					@log.error("[Signatures.signRequest] failed to load private key")
+					@log.error("[Crypto.signRequest] failed to load private key")
 					@log.error("-> point_type: "+ point_type)
 					@log.error("-> weight: "+ weight.to_s)
 					@log.error("-> timestamp: "+ timestamp.to_s)
@@ -213,15 +383,15 @@ module VChainClient
 				return nil
 			end
 
-			if @@ec_priv == nil
+			if @@ec_ecc_private == nil
 
 				begin
 					
-					@@ec_priv = OpenSSL::PKey::EC.new(@@priv_key)
+					@@ec_ecc_private = OpenSSL::PKey::EC.new(@@ecc_private_key)
 
 				rescue => e
 					if @log.error?
-						@log.error("[Signatures.signRequest] OpenSSL::PKey::EC.new raised exception:")
+						@log.error("[Crypto.signRequest] OpenSSL::PKey::EC.new raised exception:")
 						@log.error("#{e.class}, #{e.message}")
 						@log.error("-> point_type: "+ point_type)
 						@log.error("-> weight: "+ weight.to_s)
@@ -235,14 +405,14 @@ module VChainClient
 				end
 
 				if @log.debug?
-					@log.debug("[Signatures.signRequest] key initialized")
+					@log.debug("[Crypto.signRequest] key initialized")
 				end
 
 			end
 
-			if @@ec_priv == nil
+			if @@ec_ecc_private == nil
 				if @log.error?
-					@log.error("[Signatures.signRequest] failed init EC key")
+					@log.error("[Crypto.signRequest] failed init EC key")
 					@log.error("-> point_type: "+ point_type)
 					@log.error("-> weight: "+ weight.to_s)
 					@log.error("-> timestamp: "+ timestamp.to_s)
@@ -259,18 +429,18 @@ module VChainClient
 			whole_sign = document.to_json + point_type + weight.to_s + timestamp.to_s
 
 			if @log.debug?
-				@log.debug("[Signatures.signRequest] whole_to_sign: "+ whole_sign)
+				@log.debug("[Crypto.signRequest] whole_to_sign: "+ whole_sign)
 			end
 
 			whole_signature = nil
 
 			begin
 				
-				whole_signature = @@ec_priv.sign(digest, whole_sign)
+				whole_signature = @@ec_ecc_private.sign(digest, whole_sign)
 
 			rescue => e
 				if @log.error?
-					@log.error("[Signatures.signRequest] ec.sign raised exception:")
+					@log.error("[Crypto.signRequest] ec.sign raised exception:")
 					@log.error("#{e.class}, #{e.message}")
 					@log.error("-> point_type: "+ point_type)
 					@log.error("-> weight: "+ weight.to_s)
@@ -286,7 +456,7 @@ module VChainClient
 
 			if whole_signature == nil
 				if @log.error?
-					@log.error("[Signatures.signRequest] failed to sign")
+					@log.error("[Crypto.signRequest] failed to sign")
 					@log.error("-> point_type: "+ point_type)
 					@log.error("-> weight: "+ weight.to_s)
 					@log.error("-> timestamp: "+ timestamp.to_s)
@@ -300,7 +470,7 @@ module VChainClient
 			end
 
 			if @log.debug?
-				@log.debug("[Signatures.signRequest] whole_signature raw: "+ Base64.encode64(whole_signature))
+				@log.debug("[Crypto.signRequest] whole_signature raw: "+ Base64.encode64(whole_signature))
 			end
 
 			return Base64.encode64(whole_signature).gsub(/\n/, "")
@@ -319,7 +489,7 @@ module VChainClient
 
 			rescue => e
 				if @log.error?
-					@log.error("[Signatures.verifySignature] OpenSSL::PKey::EC.new raised exception:")
+					@log.error("[Crypto.verifySignature] OpenSSL::PKey::EC.new raised exception:")
 					@log.error("#{e.class}, #{e.message}")
 					@log.error("-> what_to_check: #{what_to_check}")
 					@log.error("-> signature: "+ Base64.encode64(signature))
@@ -333,7 +503,7 @@ module VChainClient
 
 			if ec == nil
 				if @log.error?
-					@log.error("[Signatures.verifySignature] failed init EC key")
+					@log.error("[Crypto.verifySignature] failed init EC key")
 					@log.error("-> what_to_check: #{what_to_check}")
 					@log.error("-> signature: "+ Base64.encode64(signature))
 					@log.error("-> public_key: "+ pub_key)
@@ -351,7 +521,7 @@ module VChainClient
 
 			rescue => e
 				if @log.error?
-					@log.error("[Signatures.verifySignature] ec.verify raised exception:")
+					@log.error("[Crypto.verifySignature] ec.verify raised exception:")
 					@log.error("#{e.class}, #{e.message}")
 					@log.error("-> what_to_check: #{what_to_check}")
 					@log.error("-> signature: "+ Base64.encode64(signature))
@@ -373,7 +543,7 @@ module VChainClient
 	  		priv_key_path = @config["ecc_private_key_location"]
 
 			if @log.debug?
-				@log.debug("[Signatures.signDataPoint] input:")
+				@log.debug("[Crypto.signDataPoint] input:")
 				@log.debug("-> this_client_id: #{this_client_id}")
 				@log.debug("-> doc_hash: #{doc_hash}")
 				@log.debug("-> credentials_hash: #{credentials_hash}")
@@ -385,15 +555,15 @@ module VChainClient
 				@log.debug(data)
 			end
 
-			if @@priv_key == nil
+			if @@ecc_private_key == nil
 
 				begin
 
-					@@priv_key = File.read(priv_key_path)
+					@@ecc_private_key = File.read(priv_key_path)
 
 				rescue => e
 					if @log.error?
-						@log.error("[Signatures.signDataPoint] File.read raised exception:")
+						@log.error("[Crypto.signDataPoint] File.read raised exception:")
 						@log.error("#{e.class}, #{e.message}")
 						@log.error("-> this_client_id: #{this_client_id}")
 						@log.error("-> doc_hash: #{doc_hash}")
@@ -410,14 +580,14 @@ module VChainClient
 				end
 
 				if @log.debug?
-					@log.debug("[Signatures.signDataPoint] priv key loaded")
+					@log.debug("[Crypto.signDataPoint] priv key loaded")
 				end
 
 			end
 
-			if @@priv_key == nil
+			if @@ecc_private_key == nil
 				if @log.error?
-					@log.error("[Signatures.signDataPoint] failed to load private key")
+					@log.error("[Crypto.signDataPoint] failed to load private key")
 					@log.error("-> this_client_id: #{this_client_id}")
 					@log.error("-> doc_hash: #{doc_hash}")
 					@log.error("-> credentials_hash: #{credentials_hash}")
@@ -432,15 +602,15 @@ module VChainClient
 				return nil
 			end
 
-			if @@ec_priv == nil
+			if @@ec_ecc_private == nil
 
 				begin
 					
-					@@ec_priv = OpenSSL::PKey::EC.new(@@priv_key)
+					@@ec_ecc_private = OpenSSL::PKey::EC.new(@@ecc_private_key)
 
 				rescue => e
 					if @log.error?
-						@log.error("[Signatures.signDataPoint] OpenSSL::PKey::EC.new raised exception:")
+						@log.error("[Crypto.signDataPoint] OpenSSL::PKey::EC.new raised exception:")
 						@log.error("#{e.class}, #{e.message}")
 						@log.error("-> this_client_id: #{this_client_id}")
 						@log.error("-> doc_hash: #{doc_hash}")
@@ -458,14 +628,14 @@ module VChainClient
 				end
 
 				if @log.debug?
-					@log.debug("[Signatures.signDataPoint] key created")
+					@log.debug("[Crypto.signDataPoint] key created")
 				end
 
 			end
 
-			if @@ec_priv == nil
+			if @@ec_ecc_private == nil
 				if @log.error?
-					@log.error("[Signatures.signDataPoint] failed init EC key")
+					@log.error("[Crypto.signDataPoint] failed init EC key")
 					@log.error("-> this_client_id: #{this_client_id}")
 					@log.error("-> doc_hash: #{doc_hash}")
 					@log.error("-> credentials_hash: #{credentials_hash}")
@@ -490,7 +660,7 @@ module VChainClient
 	  			value = rec[1]
 
 	  			if @log.debug?
-	  				@log.debug("[Signatures.signDataPoint] field: #{field}, value: #{value}")
+	  				@log.debug("[Crypto.signDataPoint] field: #{field}, value: #{value}")
 	  			end
 
 	  			if field != 'client_id'
@@ -510,19 +680,19 @@ module VChainClient
 	  				what_to_sign += VChainClient::Client::DATA_POINT_VERSION
 
 		  			if @log.debug?
-		  				@log.debug("[Signatures.signDataPoint] field_hash: #{field_hash}")
-		  				@log.debug("[Signatures.signDataPoint] value_hash: #{value_hash}")
+		  				@log.debug("[Crypto.signDataPoint] field_hash: #{field_hash}")
+		  				@log.debug("[Crypto.signDataPoint] value_hash: #{value_hash}")
 		  			end
 
 					signature = nil
 
 					begin
 						
-						signature = @@ec_priv.sign(digest, what_to_sign)
+						signature = @@ec_ecc_private.sign(digest, what_to_sign)
 
 					rescue => e
 						if @log.error?
-							@log.error("[Signatures.signDataPoint] ec.sign raised exception:")
+							@log.error("[Crypto.signDataPoint] ec.sign raised exception:")
 							@log.error("#{e.class}, #{e.message}")
 							@log.error("-> this_client_id: #{this_client_id}")
 							@log.error("-> doc_hash: #{doc_hash}")
@@ -542,7 +712,7 @@ module VChainClient
 
 					if signature == nil
 						if @log.error?
-							@log.error("[Signatures.signDataPoint] failed to sign")
+							@log.error("[Crypto.signDataPoint] failed to sign")
 							@log.error("-> this_client_id: #{this_client_id}")
 							@log.error("-> doc_hash: #{doc_hash}")
 							@log.error("-> credentials_hash: #{credentials_hash}")
@@ -560,7 +730,7 @@ module VChainClient
 					end
 
 					if @log.debug?
-						@log.debug("[Signatures.signDataPoint] signature raw: "+ Base64.encode64(signature))
+						@log.debug("[Crypto.signDataPoint] signature raw: "+ Base64.encode64(signature))
 					end
 
 	  				output[field] = Base64.encode64(signature).gsub(/\n/, "")
@@ -569,7 +739,7 @@ module VChainClient
 	  		}
 
 			if @log.debug?
-				@log.debug("[Signatures.signDataPoint] output:")
+				@log.debug("[Crypto.signDataPoint] output:")
 				@log.debug(output)
 			end
 
@@ -586,7 +756,7 @@ module VChainClient
 		    what_to_check += sig_version
 
 			if @log.debug?
-				@log.debug("[Signatures.checkTreeSignature] input:")
+				@log.debug("[Crypto.checkTreeSignature] input:")
 	    		@log.debug("-> tree_root_hash: #{tree_root_hash}")
 	    		@log.debug("-> blockchain_txid: #{blockchain_txid}")
 	    		@log.debug("-> blockchain_block_hash: #{blockchain_block_hash}")
@@ -603,7 +773,7 @@ module VChainClient
 
 		    rescue => e
 		    	if @log.error?
-		    		@log.error("[Signatures.checkTreeSignature] verifySignature raised exception:")
+		    		@log.error("[Crypto.checkTreeSignature] verifySignature raised exception:")
 		    		@log.error("#{e.class}, #{e.message}")
 		    		@log.error("-> tree_root_hash: #{tree_root_hash}")
 		    		@log.error("-> blockchain_txid: #{blockchain_txid}")
@@ -625,7 +795,7 @@ module VChainClient
 	    def checkVerificationSignature(field_hash, data_hash, doc_hash, credentials_hash, verification_type, weight, timestamp, blockstack_client_id, pubkey, signature, version)
 
 			if @log.debug?
-				@log.debug("[Signatures.checkVerificationSignature] input:")
+				@log.debug("[Crypto.checkVerificationSignature] input:")
 	    		@log.debug("-> field_hash: #{field_hash}")
 	    		@log.debug("-> data_hash: #{data_hash}")
 	    		@log.debug("-> doc_hash: #{doc_hash}")
@@ -654,7 +824,7 @@ module VChainClient
 
 			rescue => e
 		    	if @log.error?
-		    		@log.error("[Signatures.checkVerificationSignature] verifySignature raised exception:")
+		    		@log.error("[Crypto.checkVerificationSignature] verifySignature raised exception:")
 		    		@log.error("#{e.class}, #{e.message}")
 		    		@log.error("-> field_hash: #{field_hash}")
 		    		@log.error("-> data_hash: #{data_hash}")

data/lib/vchain_client.rb

@@ -13,7 +13,7 @@ module VChainClient
     require 'vchain_client/blockcypher_blockchain_adapter'
     require 'vchain_client/blockchain_adapter_factory'
     require 'vchain_client/blockchain_connection'
-    require 'vchain_client/signatures'
+    require 'vchain_client/crypto'
     require 'vchain_client/blockstack_client'
     require 'vchain_client/decision_algos/decision_algorithm.rb'
     require 'vchain_client/decision_algos/vector_based_decision_algorithm.rb'
@@ -26,7 +26,7 @@ module VChainClient
 
     DATA_POINT_VERSION = "1"
 
-    CLIENT_LIB_VERSION = "1.0.32"
+    CLIENT_LIB_VERSION = "1.0.35"
 
     @config = nil
     @log = nil
@@ -176,6 +176,7 @@ module VChainClient
     end
 
   	def self.get_credentials_hash(document)
+
   		if document["type"] == FIELD_TYPE_TRAVEL_DOCUMENT_HASHED
   			what_to_hash = document["type"] + document["number"] + document["given_names"] + document["surname"] + document["birthdate"]
 
@@ -320,7 +321,7 @@ module VChainClient
 
     def add_batch_data_points(input_arr)
 
-      signaturesHelper = VChainClient::Signatures.new(@config)
+      cryptoHelper = VChainClient::Crypto.new(@config)
 
       time = Time.now.getutc
       timestamp = time.to_i
@@ -382,11 +383,11 @@ module VChainClient
 
         begin
 
-          point_signatures = signaturesHelper.signDataPoint(point_type, hashed_document, doc_hash, credentials_hash, weight, timestamp)
+          point_signatures = cryptoHelper.signDataPoint(point_type, hashed_document, doc_hash, credentials_hash, weight, timestamp)
 
         rescue => e
           if @log.error?
-            @log.error("[add_batch_data_points] Signatures.signDataPoint raised exception")
+            @log.error("[add_batch_data_points] Crypto.signDataPoint raised exception")
             @log.error("#{e.class}, #{e.message}")
             @log.error("-> point_type: "+ point_type)
             @log.error("-> weight: "+ weight.to_s)
@@ -400,7 +401,7 @@ module VChainClient
 
         if point_signatures == nil
           if @log.error?
-            @log.error("[add_batch_data_points] failed to Signatures.signDataPoint")
+            @log.error("[add_batch_data_points] failed to Crypto.signDataPoint")
             @log.error("-> point_type: "+ point_type)
             @log.error("-> weight: "+ weight.to_s)
             @log.error("-> timestamp: "+ timestamp.to_s)
@@ -429,18 +430,18 @@ module VChainClient
       }
 
       client_id = @config["client_id"]
-      api_url = @config["api"]["url"] + "v0.3/batchAddDataPoint/"
+      api_url = @config["api"]["url"] + "v0.4/batchAddDataPoint/"
 
       whole_signature = nil
 
       begin
 
-        whole_signature = signaturesHelper.signBatchRequest(batch, timestamp)
+        whole_signature = cryptoHelper.signBatchRequest(batch, timestamp)
 
       rescue => e
 
         if @log.error?
-          @log.error("[add_batch_data_points] Signatures.signRequest raised exception:")
+          @log.error("[add_batch_data_points] Crypto.signRequest raised exception:")
           @log.error("#{e.class}: #{e.message}")
         end
 
@@ -458,12 +459,11 @@ module VChainClient
         end
 
         if @log.debug?
-          @log.debug("[add_batch_data_points] signaturesHelper.signRequest went well, whole_signature:")
+          @log.debug("[add_batch_data_points] Crypto.signRequest went well, whole_signature:")
           @log.debug(whole_signature)
         end
 
         send_data = {}
-        send_data["client_id"] = client_id
         send_data["signature"] = whole_signature
         send_data["timestamp"] = timestamp.to_s
         
@@ -479,17 +479,32 @@ module VChainClient
 
           send_data["data"].push(send_doc)
         }
+
+        cyphered_data = cryptoHelper.encodeCypher(send_data.to_json)
+
+        encoded_key = cryptoHelper.encodeRSA(cyphered_data["key"])
+
+        encoded_iv = cryptoHelper.encodeRSA(cyphered_data["iv"])
+
+        doc_to_send = {
+          "key"       => Base64.encode64(encoded_key),
+          "iv"        => Base64.encode64(encoded_iv),
+          "payload"   => Base64.encode64(cyphered_data["payload"]),
+          "client_id" => client_id
+        }
         
         if @log.debug?
-          @log.debug("[add_batch_data_points] send_data:")
-          @log.debug(send_data)
+          @log.debug("[add_batch_data_points] raw sent data:")
+          @log.debug(send_data.to_json)
+          @log.debug("[add_batch_data_points] sent data:")
+          @log.debug(doc_to_send)
         end
 
         begin
 
           res = RestClient::Resource.new api_url, :timeout => nil, :open_timeout => nil
 
-          req = res.post send_data.to_json, :content_type => 'application/json'
+          req = res.post doc_to_send.to_json, :content_type => 'application/json'
 
           if req.code != 200
 
@@ -498,8 +513,10 @@ module VChainClient
               @log.error("-> client_id: #{client_id}")
               @log.error("-> api_url: #{api_url}")
               @log.error("-> timestamp: "+ timestamp.to_s)
-              @log.error("-> send_data:")
+              @log.error("-> raw sent data:")
               @log.error(send_data)
+              @log.error("-> sent data:")
+              @log.error(doc_to_send)
             end
 
             return false
@@ -519,8 +536,10 @@ module VChainClient
             @log.error("-> client_id: #{client_id}")
             @log.error("-> api_url: #{api_url}")
             @log.error("-> timestamp: "+ timestamp.to_s)
-            @log.error("-> send_data:")
+            @log.error("-> raw sent data:")
             @log.error(send_data)
+            @log.error("-> sent data:")
+            @log.error(doc_to_send)
           end
 
           raise e
@@ -533,7 +552,7 @@ module VChainClient
   	def add_data_point(point_type, input, weight = 1)
 
     	client_id = @config["client_id"]
-    	api_url = @config["api"]["url"] + "v0.3/addDataPoint/"
+    	api_url = @config["api"]["url"] + "v0.4/addDataPoint/"
 
 	  	time = Time.now.getutc
 	  	timestamp = time.to_i
@@ -603,17 +622,17 @@ module VChainClient
         @log.debug(document)
       end
 
-      signaturesHelper = VChainClient::Signatures.new(@config)
+      cryptoHelper = VChainClient::Crypto.new(@config)
 
       point_signatures = nil
 
       begin
 
-        point_signatures = signaturesHelper.signDataPoint(point_type, document, doc_hash, credentials_hash, weight, timestamp)
+        point_signatures = cryptoHelper.signDataPoint(point_type, document, doc_hash, credentials_hash, weight, timestamp)
 
       rescue => e
         if @log.error?
-          @log.error("[verify] Signatures.signDataPoint raised exception")
+          @log.error("[verify] Crypto.signDataPoint raised exception")
           @log.error("#{e.class}, #{e.message}")
           @log.error("-> point_type: "+ point_type)
           @log.error("-> weight: "+ weight.to_s)
@@ -629,7 +648,7 @@ module VChainClient
 
       if point_signatures == nil
         if @log.error?
-          @log.error("[verify] failed to Signatures.signDataPoint")
+          @log.error("[verify] failed to Crypto.signDataPoint")
           @log.error("-> point_type: "+ point_type)
           @log.error("-> weight: "+ weight.to_s)
           @log.error("-> timestamp: "+ timestamp.to_s)
@@ -658,12 +677,12 @@ module VChainClient
 
       begin
 
-        whole_signature = signaturesHelper.signRequest(document, point_type, weight, timestamp)
+        whole_signature = cryptoHelper.signRequest(document, point_type, weight, timestamp)
 
       rescue => e
 
         if @log.error?
-          @log.error("[verify] Signatures.signRequest raised exception:")
+          @log.error("[verify] Crypto.signRequest raised exception:")
           @log.error("#{e.class}: #{e.message}")
           @log.error("-> point_type: #{point_type}")
           @log.error("-> weight: "+ weight.to_s)
@@ -695,14 +714,13 @@ module VChainClient
         end
 
         if @log.debug?
-          @log.debug("[verify] signaturesHelper.signRequest went well, whole_signature:")
+          @log.debug("[verify] Crypto.signRequest went well, whole_signature:")
           @log.debug(whole_signature)
         end
 
       end
 
 		  send_data = {}
-		  send_data["client_id"] = client_id
 		  send_data["data"] = document
       send_data["weight"] = weight.to_s
 		  send_data["timestamp"] = timestamp.to_s
@@ -710,14 +728,27 @@ module VChainClient
 		  send_data["point_signatures"] = point_signatures
 		  send_data["signature"] = whole_signature
 
+      cyphered_data = cryptoHelper.encodeCypher(send_data.to_json)
+
+      encoded_key = cryptoHelper.encodeRSA(cyphered_data["key"])
+
+      encoded_iv = cryptoHelper.encodeRSA(cyphered_data["iv"])
+
+      doc_to_send = {
+        "key"       => Base64.encode64(encoded_key),
+        "iv"        => Base64.encode64(encoded_iv),
+        "payload"   => Base64.encode64(cyphered_data["payload"]),
+        "client_id" => client_id
+      }
+
       if @log.debug?
         @log.debug("[verify] send_data:")
-        @log.debug(send_data)
+        @log.debug(doc_to_send)
       end
 
       begin
       	req = RestClient.post(api_url, 
-        					            send_data.to_json, 
+        					            doc_to_send.to_json, 
         					            {'Content-Type' => 'application/json'})
 
       	if req.code != 200
@@ -729,8 +760,10 @@ module VChainClient
             @log.error("-> point_type: #{point_type}")
             @log.error("-> weight: "+ weight.to_s)
             @log.error("-> timestamp: "+ timestamp.to_s)
-            @log.error("-> send_data:")
+            @log.error("-> raw sent data:")
             @log.error(send_data)
+            @log.error("-> sent data:")
+            @log.error(doc_to_send)
           end
 
       		return false
@@ -752,8 +785,10 @@ module VChainClient
           @log.error("-> point_type: #{point_type}")
           @log.error("-> weight: "+ weight.to_s)
           @log.error("-> timestamp: "+ timestamp.to_s)
-          @log.error("-> send_data:")
+          @log.error("-> raw sent data:")
           @log.error(send_data)
+          @log.error("-> sent data:")
+          @log.error(doc_to_send)
         end
 
         raise e
@@ -804,11 +839,11 @@ module VChainClient
 
     def check(input, is_already_hashed = false, preffered_decision_algo = nil)
 
-      blockstackClient = VChainClient::BlockstackClient.new(@config)
+      cryptoHelper = VChainClient::Crypto.new(@config)
 
       client_id = @config["client_id"]
 
-      api_url = @config["api"]["url"] + "v0.3/check/";
+      api_url = @config["api"]["url"] + "v0.4/check/";
 
       document = input
 
@@ -840,53 +875,16 @@ module VChainClient
 
       sent_document = document.clone
 
-      vchain_public_key_body = nil
-
-      begin
-        
-        vchain_public_key_body = blockstackClient.getPublicKeyRSA("vchain_core_01.id")
-
-      rescue => e
-        if @log.error?
-          @log.error("[check] failed to retrieve vchain public RSA key from Blockstack")
-          @log.error("#{e.class}, #{e.message}")
-        end
-
-        raise e
-      end
-
-      if vchain_public_key_body == nil
-        if @log.error?
-          @log.error("[check] failed to retrieve vchain public RSA key from Blockstack")
-        end
-
-        return false
-      end
-
-      vchain_public_key_str = "-----BEGIN PUBLIC KEY-----\n"
-      vchain_public_key_str += vchain_public_key_body
-      vchain_public_key_str += "\n-----END PUBLIC KEY-----"
-
-      vchain_public_key = OpenSSL::PKey::RSA.new(vchain_public_key_str)
-
-      cif = OpenSSL::Cipher.new('AES-256-CBC')
-
-      cif.encrypt
+      cyphered_data = cryptoHelper.encodeCypher(document.to_json)
 
-      cif.key = key = cif.random_key
-      cif.iv  = iv  = cif.random_iv
+      encoded_key = cryptoHelper.encodeRSA(cyphered_data["key"])
 
-      encoded_doc = cif.update(document.to_json) +
-                    cif.final
-
-      encoded_key = vchain_public_key.public_encrypt(key, OpenSSL::PKey::RSA::PKCS1_OAEP_PADDING)
-
-      encoded_iv = vchain_public_key.public_encrypt(iv, OpenSSL::PKey::RSA::PKCS1_OAEP_PADDING)
+      encoded_iv = cryptoHelper.encodeRSA(cyphered_data["iv"])
 
       doc_to_send = {
         "key"       => Base64.encode64(encoded_key),
         "iv"        => Base64.encode64(encoded_iv),
-        "payload"   => Base64.encode64(encoded_doc),
+        "payload"   => Base64.encode64(cyphered_data["payload"]),
         "client_id" => client_id
       }
 
@@ -960,6 +958,22 @@ module VChainClient
 
         # success result
 
+        res_key = cryptoHelper.decodeRSA(Base64.decode64(res["key"]))
+
+        res_iv = cryptoHelper.decodeRSA(Base64.decode64(res["iv"]))
+
+        res_docs = cryptoHelper.decodeCypher(Base64.decode64(res["docs"]), res_key, res_iv)
+
+        res_data_points = cryptoHelper.decodeCypher(Base64.decode64(res["data_points"]), res_key, res_iv)
+
+        res_names = cryptoHelper.decodeCypher(Base64.decode64(res["names"]), res_key, res_iv)
+
+        res = {
+          "docs" => JSON.parse(res_docs),
+          "data_points" => JSON.parse(res_data_points),
+          "names" => JSON.parse(res_names)
+        }
+
         validated_data_points = self.validate_data_points(res["data_points"], res["docs"])
 
         if validated_data_points.length == 0
@@ -1013,7 +1027,7 @@ module VChainClient
 
       blockstackClient = VChainClient::BlockstackClient.new(@config)
 
-      signaturesHelper = VChainClient::Signatures.new(@config)
+      cryptoHelper = VChainClient::Crypto.new(@config)
 
       documents_index = {}
 
@@ -1298,7 +1312,7 @@ module VChainClient
 
           begin
 
-            if !signaturesHelper.checkTreeSignature(computed_tree_root_hash, blockchain_txid, blockchain_block_hash, blockchain_timestamp, reciept["federative_server_id"], reciept["federative_server_version"], Base64.decode64(reciept["tree_signature"]), federative_server_pubkey)
+            if !cryptoHelper.checkTreeSignature(computed_tree_root_hash, blockchain_txid, blockchain_block_hash, blockchain_timestamp, reciept["federative_server_id"], reciept["federative_server_version"], Base64.decode64(reciept["tree_signature"]), federative_server_pubkey)
               if @log.error?
                 @log.error("[check] not a valid blockchain reciept - failed to verify tree signature")
                 @log.error(reciept)
@@ -1428,7 +1442,7 @@ module VChainClient
 
         begin
 
-          if !signaturesHelper.checkVerificationSignature(data_point["field_hash"], data_point["data_hash"], data_point["doc_hash"], data_point["credentials_hash"], data_point["type"], data_point["weight"], data_point["timestamp"], data_point["issuer_id"], verificator_pubkey, Base64.decode64(data_point["issuer_sig"]), data_point["version"])
+          if !cryptoHelper.checkVerificationSignature(data_point["field_hash"], data_point["data_hash"], data_point["doc_hash"], data_point["credentials_hash"], data_point["type"], data_point["weight"], data_point["timestamp"], data_point["issuer_id"], verificator_pubkey, Base64.decode64(data_point["issuer_sig"]), data_point["version"])
             if @log.error?
               @log.error("[check] not a valid verification - failed to check verificator signature")
               @log.error("--> field_hash: "+ data_point["field_hash"])
@@ -1448,7 +1462,7 @@ module VChainClient
 
         rescue => e
           if @log.error?
-            @log.error("[check] Signatures.checkVerificationSignature raised exception:")
+            @log.error("[check] Crypto.checkVerificationSignature raised exception:")
             @log.error("#{e.class}, #{e.message}")
             @log.error("--> field_hash: "+ data_point["field_hash"])
             @log.error("--> data_hash: "+ data_point["data_hash"])
@@ -1498,7 +1512,7 @@ module VChainClient
 
         begin
 
-          if !signaturesHelper.checkVerificationSignature(data_point["field_hash"], data_point["data_hash"], data_point["doc_hash"], data_point["credentials_hash"], data_point["type"], data_point["weight"], data_point["timestamp"], data_point["validator_id"], validator_pubkey, Base64.decode64(data_point["validator_sig"]), data_point["version"])
+          if !cryptoHelper.checkVerificationSignature(data_point["field_hash"], data_point["data_hash"], data_point["doc_hash"], data_point["credentials_hash"], data_point["type"], data_point["weight"], data_point["timestamp"], data_point["validator_id"], validator_pubkey, Base64.decode64(data_point["validator_sig"]), data_point["version"])
             if @log.error?
               @log.error("[check] not a valid verification - failed to check validator signature")
               @log.error("--> field_hash: "+ data_point["field_hash"])
@@ -1518,7 +1532,7 @@ module VChainClient
 
         rescue => e
           if @log.error?
-            @log.error("[check] Signatures.checkVerificationSignature raised exception:")
+            @log.error("[check] Crypto.checkVerificationSignature raised exception:")
             @log.error("#{e.class}, #{e.message}")
             @log.error("--> field_hash: "+ data_point["field_hash"])
             @log.error("--> data_hash: "+ data_point["data_hash"])
@@ -1552,7 +1566,7 @@ module VChainClient
       return output
     end
 
-    def self.generateBlockstackCommand(config, role, validator_sig = nil)
+    def self.generateBlockstackCommand(config, role = "verificator", validator_sig_v2 = nil, validator_sig_v3 = nil)
 
       OpenSSL::PKey::EC.send(:alias_method, :private?, :private_key?)
 
@@ -1570,20 +1584,17 @@ module VChainClient
 
       #A4 validator_vchain_id
       validator_vchain_id = "da93b5f7-2295-4435-a67a-4fc226eca3ac"
-      #validator_vchain_id = "35645858-630d-4873-9a2d-1ea7ec3b6d10"
 
       #A5 validator_blockstack_id
       validator_blockstack_id = "vchain_core_01.id"
-      #validator_blockstack_id = "master"
 
       #A6 vchain_role
       vchain_role = role
 
       #A7 sig_version
-      sig_version = "2"
+      sig_version = "3"
+
 
-      #A8 client_sig
-      client_sig = nil
       priv_key_path = config["ecc_private_key_location"]
       priv_key = File.read(priv_key_path)
 
@@ -1594,16 +1605,24 @@ module VChainClient
       rsa_pub_key.slice! "\n-----END PUBLIC KEY-----\n"
       rsa_pub_key_aligned = rsa_pub_key.gsub(/\n/, "")
       
-      whole_sign = vchain_client_id + vchain_role + blockstack_id + ecc_pub_key + rsa_pub_key + sig_version
+      whole_sign_v2 = vchain_client_id + vchain_role + blockstack_id + ecc_pub_key + rsa_pub_key + "2"
+
+      whole_sign_v3 = vchain_client_id + vchain_role + blockstack_id + ecc_pub_key_aligned + rsa_pub_key_aligned + sig_version
       
       ec = OpenSSL::PKey::EC.new(priv_key)
       digest = OpenSSL::Digest::SHA256.new
       
-      whole_signature = ec.sign(digest, whole_sign)
+      whole_signature_v2 = ec.sign(digest, whole_sign_v2)
+
+      whole_signature_v3 = ec.sign(digest, whole_sign_v3)
       
-      client_sig = Base64.encode64(whole_signature).gsub(/\n/, "") 
+      #A8 client_sig v2
+      client_sig_v2 = Base64.encode64(whole_signature_v2).gsub(/\n/, "") 
+
+      #A10 client_sig v3
+      client_sig_v3 = Base64.encode64(whole_signature_v3).gsub(/\n/, "") 
 
-      if validator_sig == nil
+      if validator_sig_v2 == nil || validator_sig_v3 == nil
 
         puts "blockstack_id = " + blockstack_id
         puts "vchain_client_id = " + vchain_client_id
@@ -1611,20 +1630,23 @@ module VChainClient
         puts "rsa_pub_key = "+ rsa_pub_key_aligned
         puts "validator_vchain_id = "+ validator_vchain_id
         puts "vchain_role = " + vchain_role
-        puts "client_sig = " + client_sig
+        puts "client_sig_v2 = " + client_sig_v2
+        puts "client_sig_v3 = " + client_sig_v3
 
       else
         puts "BLOCKSTACK_DEBUG=1 blockstack update "+ blockstack_id +" '$ORIGIN "+ blockstack_id +"
 $TTL 3600
 A1 TXT \""+ ecc_pub_key_aligned +"\"
 A2 TXT \""+ vchain_client_id +"\"
-A3 TXT \""+ validator_sig +"\"
+A3 TXT \""+ validator_sig_v2 +"\"
 A4 TXT \""+ validator_vchain_id +"\"
 A5 TXT \""+ validator_blockstack_id +"\"
 A6 TXT \""+ vchain_role +"\"
 A7 TXT \""+ sig_version +"\"
-A8 TXT \""+ client_sig +"\"
+A8 TXT \""+ client_sig_v2 +"\"
 A9 TXT \""+ rsa_pub_key_aligned +"\"
+A10 TXT \""+ client_sig_v3 +"\"
+A11 TXT \""+ validator_sig_v3 +"\"
 _tcp._http URI 10 1 \"http://example.com\"
 '"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vchain_client
 version: !ruby/object:Gem::Version
-  version: 1.0.34
+  version: 1.0.35
 platform: ruby
 authors:
 - Aleksandr Gorelik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -84,9 +84,9 @@ files:
 - lib/vchain_client/blockchain_connection.rb
 - lib/vchain_client/blockcypher_blockchain_adapter.rb
 - lib/vchain_client/blockstack_client.rb
+- lib/vchain_client/crypto.rb
 - lib/vchain_client/decision_algos/decision_algorithm.rb
 - lib/vchain_client/decision_algos/vector_based_decision_algorithm.rb
-- lib/vchain_client/signatures.rb
 homepage: http://rubygems.org/gems/vchain_client
 licenses:
 - MIT
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: VChain Platform client written on Ruby