vchain_client 1.0.18 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7d72dd4d8efef4ca8c04acc00a13d5aaec09920
-  data.tar.gz: 2e1ec1456efbbbe2cf056f1fc252f38ec44c3d68
+  metadata.gz: 10de221cf0aacee3a81893294d59c0130a9a15a2
+  data.tar.gz: 70d5234b7a43295a03cd48ef89d43613fd6710f9
 SHA512:
-  metadata.gz: ba2b70834743cf078d751dfc6334f6a73af53d78b1942e8496875f393b9fa2d047127bd562bc14633bfdf4ad61c46b5f27636cf9174cc5d07e9bc982113738f3
-  data.tar.gz: 0a8705fe2e25bc638cf5e5c41746c4adc7ca99c96e750d6e4e8140da0a8b0736641dbe3a352e3164a5238f622eff183f478e9026c18a6b872d0a5cdfd8d26913
+  metadata.gz: 24db1ae389d4221c1ba41ca9fa591d8c4f4b343b210e092ac5defe17c00da6e71bf045fc63ee8a505611b2182fcef42a6364ae3bf213cf78e87f9af6726263c0
+  data.tar.gz: a4c9c63f6dca6323f45a80738d72145cc693b9fc9467f0516246de5d5349e9961dbf3cc9a490160f2df52cec45c0aa38408575ff0a798c08dfb1984ebf32af87

data/lib/vchain_client/signatures.rb

@@ -215,7 +215,7 @@ module VChainClient
 			end
 	  	end
 
-	  	def signDataPoint(point_type, data, doc_hash, weight, timestamp)
+	  	def signDataPoint(point_type, data, doc_hash, credentials_hash, weight, timestamp)
 
 	  		OpenSSL::PKey::EC.send(:alias_method, :private?, :private_key?)
 
@@ -226,6 +226,7 @@ module VChainClient
 				@log.debug("[Signatures.signDataPoint] input:")
 				@log.debug("-> this_client_id: #{this_client_id}")
 				@log.debug("-> doc_hash: #{doc_hash}")
+				@log.debug("-> credentials_hash: #{credentials_hash}")
 				@log.debug("-> weight: "+ weight.to_s)
 				@log.debug("-> timestamp: "+ timestamp.to_s)
 				@log.debug("-> point_type: #{point_type}")
@@ -246,6 +247,7 @@ module VChainClient
 					@log.error("#{e.class}, #{e.message}")
 					@log.error("-> this_client_id: #{this_client_id}")
 					@log.error("-> doc_hash: #{doc_hash}")
+					@log.error("-> credentials_hash: #{credentials_hash}")
 					@log.error("-> weight: "+ weight.to_s)
 					@log.error("-> timestamp: "+ timestamp.to_s)
 					@log.error("-> point_type: #{point_type}")
@@ -263,6 +265,7 @@ module VChainClient
 					@log.error("[Signatures.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}")
 					@log.error("-> weight: "+ weight.to_s)
 					@log.error("-> timestamp: "+ timestamp.to_s)
 					@log.error("-> point_type: #{point_type}")
@@ -298,10 +301,12 @@ module VChainClient
 	  				what_to_sign = field_hash
 	  				what_to_sign += value_hash
 	  				what_to_sign += Digest::SHA512.hexdigest(doc_hash)
+	  				what_to_sign += Digest::SHA512.hexdigest(credentials_hash)
 	  				what_to_sign += point_type
 	  				what_to_sign += weight.to_s
 	  				what_to_sign += timestamp.to_s
 	  				what_to_sign += this_client_id
+	  				what_to_sign += VChainClient::Client::DATA_POINT_VERSION
 
 		  			if @log.debug?
 		  				@log.debug("[Signatures.signDataPoint] field_hash: #{field_hash}")
@@ -320,6 +325,7 @@ module VChainClient
 							@log.error("#{e.class}, #{e.message}")
 							@log.error("-> this_client_id: #{this_client_id}")
 							@log.error("-> doc_hash: #{doc_hash}")
+							@log.error("-> credentials_hash: #{credentials_hash}")
 							@log.error("-> weight: "+ weight.to_s)
 							@log.error("-> timestamp: "+ timestamp.to_s)
 							@log.error("-> point_type: #{point_type}")
@@ -337,6 +343,7 @@ module VChainClient
 							@log.error("[Signatures.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}")
 							@log.error("-> weight: "+ weight.to_s)
 							@log.error("-> timestamp: "+ timestamp.to_s)
 							@log.error("-> point_type: #{point_type}")
@@ -367,6 +374,7 @@ module VChainClient
 							@log.error("#{e.class}, #{e.message}")
 							@log.error("-> this_client_id: #{this_client_id}")
 							@log.error("-> doc_hash: #{doc_hash}")
+							@log.error("-> credentials_hash: #{credentials_hash}")
 							@log.error("-> weight: "+ weight.to_s)
 							@log.error("-> timestamp: "+ timestamp.to_s)
 							@log.error("-> point_type: #{point_type}")
@@ -385,6 +393,7 @@ module VChainClient
 							@log.error("[Signatures.signDataPoint] failed to sign")
 							@log.error("-> this_client_id: #{this_client_id}")
 							@log.error("-> doc_hash: #{doc_hash}")
+							@log.error("-> credentials_hash: #{credentials_hash}")
 							@log.error("-> weight: "+ weight.to_s)
 							@log.error("-> timestamp: "+ timestamp.to_s)
 							@log.error("-> point_type: #{point_type}")
@@ -461,13 +470,14 @@ module VChainClient
 		    end
 	    end
 
-	    def checkVerificationSignature(field_hash, data_hash, doc_hash, verification_type, weight, timestamp, blockstack_client_id, pubkey, signature)
+	    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("-> field_hash: #{field_hash}")
 	    		@log.debug("-> data_hash: #{data_hash}")
 	    		@log.debug("-> doc_hash: #{doc_hash}")
+	    		@log.debug("-> credentials_hash: #{credentials_hash}")
 	    		@log.debug("-> type: #{verification_type}")
 	    		@log.debug("-> weight: "+ weight.to_s)
 	    		@log.debug("-> timestamp: "+ timestamp.to_s)
@@ -479,10 +489,12 @@ module VChainClient
 			what_to_check = field_hash
 			what_to_check += data_hash
 			what_to_check += doc_hash
+			what_to_check += credentials_hash
 			what_to_check += verification_type
 			what_to_check += weight.to_s
 			what_to_check += timestamp.to_s
 			what_to_check += blockstack_client_id
+			what_to_check += version
 
 			begin
 			
@@ -495,6 +507,7 @@ module VChainClient
 		    		@log.error("-> field_hash: #{field_hash}")
 		    		@log.error("-> data_hash: #{data_hash}")
 		    		@log.error("-> doc_hash: #{doc_hash}")
+		    		@log.error("-> credentials_hash: #{credentials_hash}")
 		    		@log.error("-> verification_type: #{verification_type}")
 		    		@log.error("-> timestamp: "+ timestamp.to_s)
 		    		@log.error("-> weight: "+ weight.to_s)

data/lib/vchain_client.rb

@@ -22,6 +22,8 @@ module VChainClient
     FIELD_TYPE_TRAVEL_DOCUMENT_HASHED = "fbb6889f44061c2a91e17a411cf168f9457981257a5e0a31fb706cd5cd1e64c263780a42a1fd858ee69429869ab2e2c53b9d94c4a26946f2b0c12f8ce2812d6b"
     FIELD_TYPE_TEST_DOCUMENT_HASHED   = "e061cf61078d74025ab1d136e0a78785097b8ef721107e940cac1ca836ed5fa6af907344b761447274ce0558d95d4126e94e11f04eb70c3885afcc96f9cfe985"
 
+    DATA_POINT_VERSION = "1"
+
     @config = nil
     @log = nil
 
@@ -210,6 +212,8 @@ module VChainClient
 
       doc_hash = self.get_doc_hash(document)
 
+      credentials_hash = self.get_credentials_hash(document)
+
       if weight > 1
       
         weight = 1
@@ -235,11 +239,11 @@ module VChainClient
 
       begin
 
-        point_signatures = signaturesHelper.signDataPoint(point_type, document, doc_hash, weight, timestamp)
+        point_signatures = signaturesHelper.signDataPoint(point_type, document, doc_hash, credentials_hash, weight, timestamp)
 
       rescue => e
         if @log.error?
-          @log.error("[verify] Signatures.signVerification raised exception")
+          @log.error("[verify] Signatures.signDataPoint raised exception")
           @log.error("#{e.class}, #{e.message}")
           @log.error("-> point_type: "+ point_type)
           @log.error("-> weight: "+ weight.to_s)
@@ -255,7 +259,7 @@ module VChainClient
 
       if point_signatures == nil
         if @log.error?
-          @log.error("[verify] failed to Signatures.signVerification")
+          @log.error("[verify] failed to Signatures.signDataPoint")
           @log.error("-> point_type: "+ point_type)
           @log.error("-> weight: "+ weight.to_s)
           @log.error("-> timestamp: "+ timestamp.to_s)
@@ -816,7 +820,7 @@ module VChainClient
         end
 
         # 1d. check data_point_hash
-        checksum_to_hash = data_point["field_hash"] + data_point["data_hash"] + data_point["doc_hash"] + data_point["type"] + data_point["issuer_sig"] + data_point["issuer_id"] + data_point["validator_sig"] + data_point["validator_id"] + data_point["weight"] + data_point["timestamp"]
+        checksum_to_hash = data_point["field_hash"] + data_point["data_hash"] + data_point["doc_hash"] + data_point["credentials_hash"] + data_point["type"] + data_point["issuer_sig"] + data_point["issuer_id"] + data_point["validator_sig"] + data_point["validator_id"] + data_point["weight"] + data_point["timestamp"] + data_point["version"]
         checksum = Digest::SHA512.hexdigest(checksum_to_hash)
         if checksum != data_point["data_point_hash"]
           if @log.error?
@@ -1144,12 +1148,13 @@ module VChainClient
 
         begin
 
-          if !signaturesHelper.checkVerificationSignature(data_point["field_hash"], data_point["data_hash"], data_point["doc_hash"], data_point["type"], data_point["weight"], data_point["timestamp"], data_point["issuer_id"], verificator_pubkey, Base64.decode64(data_point["issuer_sig"]))
+          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 @log.error?
               @log.error("[check] not a valid verification - failed to check verificator signature")
               @log.error("--> field_hash: "+ data_point["field_hash"])
               @log.error("--> data_hash: "+ data_point["data_hash"])
               @log.error("--> doc_hash: "+ data_point["doc_hash"])
+              @log.error("--> credentials_hash: "+ data_point["credentials_hash"])
               @log.error("--> type: "+ data_point["type"])
               @log.error("--> weight: "+ data_point["weight"].to_s)
               @log.error("--> timestamp: "+ data_point["timestamp"].to_s)
@@ -1168,6 +1173,7 @@ module VChainClient
             @log.error("--> field_hash: "+ data_point["field_hash"])
             @log.error("--> data_hash: "+ data_point["data_hash"])
             @log.error("--> doc_hash: "+ data_point["doc_hash"])
+            @log.error("--> credentials_hash: "+ data_point["credentials_hash"])
             @log.error("--> type: "+ data_point["type"])
             @log.error("--> weight: "+ data_point["weight"].to_s)
             @log.error("--> timestamp: "+ data_point["timestamp"].to_s)
@@ -1212,12 +1218,13 @@ module VChainClient
 
         begin
 
-          if !signaturesHelper.checkVerificationSignature(data_point["field_hash"], data_point["data_hash"], data_point["doc_hash"], data_point["type"], data_point["weight"], data_point["timestamp"], data_point["validator_id"], validator_pubkey, Base64.decode64(data_point["validator_sig"]))
+          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 @log.error?
               @log.error("[check] not a valid verification - failed to check validator signature")
               @log.error("--> field_hash: "+ data_point["field_hash"])
               @log.error("--> data_hash: "+ data_point["data_hash"])
               @log.error("--> doc_hash: "+ data_point["doc_hash"])
+              @log.error("--> credentials_hash: "+ data_point["credentials_hash"])
               @log.error("--> type: "+ data_point["type"])
               @log.error("--> weight: "+ data_point["weight"].to_s)
               @log.error("--> timestamp: "+ data_point["timestamp"].to_s)
@@ -1236,6 +1243,7 @@ module VChainClient
             @log.error("--> field_hash: "+ data_point["field_hash"])
             @log.error("--> data_hash: "+ data_point["data_hash"])
             @log.error("--> doc_hash: "+ data_point["doc_hash"])
+            @log.error("--> credentials_hash: "+ data_point["credentials_hash"])
             @log.error("--> type: "+ data_point["type"])
             @log.error("--> weight: "+ data_point["weight"].to_s)
             @log.error("--> timestamp: "+ data_point["timestamp"].to_s)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vchain_client
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.19
 platform: ruby
 authors:
 - Aleksandr Gorelik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r