rubythemis 0.9.1 → 0.9.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c533507748e3b83574754d815e8876013636b55b
-  data.tar.gz: c8b9067cbefeeab4d80a4ca4380affda98d21b79
+  metadata.gz: a3bec344fffa5705ed6a25e7efc5db39a8c8f712
+  data.tar.gz: a0981e988e300ef2ccf4cb89837c11efed8ee7b8
 SHA512:
-  metadata.gz: 78a31344f698b9798b403d9c2cbdbf92601f90c20d62e8e97cf69c9dffc9cffbfe9c97c38ee8d4650829bb2d5056d824e855f64a9848e4d81e3f4bf5e99a4964
-  data.tar.gz: 13c1baf7117e3af8ed2496222ca6182e75ee0c709395bfb92042504de8046eb09fba1e45cf86c32636380d74dad9261649074d1833bd18c310ce25516a9ebee7
+  metadata.gz: e45a04401c921f2dc458bd987eb4e34cafe7bdb8aa4ab5303e55b20a61c2b6953593f9591fdd39186ab376e1b8c376cfba78971c027068366410a8494fb124ac
+  data.tar.gz: ed0706d1c8bc948010571639e8604da407b08bbb690913d4a40690b419c068276c63c22769366905801a2fb03bf1d69ca2f34e621ecd3dc1b849f0eb81791b4d

data/lib/rubythemis.rb

@@ -31,7 +31,7 @@ module ThemisImport
 
 
 
-    callback :get_pub_key_by_id_type, 	[:pointer, :int, :pointer, :int, :uint], :int
+    callback :get_pub_key_by_id_type, 	[:pointer, :int, :pointer, :int, :pointer], :int
     callback :send_callback_type,	[:pointer, :int, :uint], :int
     callback :receive_callback_type,	[:pointer, :int, :uint], :int
 
@@ -40,7 +40,7 @@ module ThemisImport
 		:receive_data,		:receive_callback_type,
 		:state_changed,		:pointer,
 		:get_pub_key_for_id,	:get_pub_key_by_id_type,
-		:user_data,		:uint
+		:user_data,		:pointer
     end
 
     attach_function :secure_session_create, [ :pointer, :uint, :pointer, :uint, :pointer], :pointer
@@ -68,6 +68,8 @@ module ThemisImport
 end
 
 module Themis
+    extend ThemisCommon
+    extend ThemisImport
 
     BUFFER_TOO_SMALL = -4
     SUCCESS = 0
@@ -126,8 +128,8 @@ module Themis
 
 	MAPPING = {}
 
-	Get_pub_key_by_id_callback = FFI::Function.new(:int, [:pointer, :int, :pointer, :int, :uint]) do |id_buf, id_length, pubkey_buf, pubkey_length, obj|
-	    pub_key=MAPPING[obj].get_pub_key_by_id(id_buf.get_bytes(0,id_length))
+	Get_pub_key_by_id_callback = FFI::Function.new(:int, [:pointer, :int, :pointer, :int, :pointer]) do |id_buf, id_length, pubkey_buf, pubkey_length, obj|
+	    pub_key=MAPPING[obj.read_uint64].get_pub_key_by_id(id_buf.get_bytes(0,id_length))
 	    if !pub_key
 		-1
 	    end
@@ -141,7 +143,9 @@ module Themis
 		@callbacks = Callbacks_struct.new
 		@callbacks[:get_pub_key_for_id] = Get_pub_key_by_id_callback
 		MAPPING[transport.object_id]=transport
-		@callbacks[:user_data] =transport.object_id
+		@transport_obj_id=transport.object_id
+		@callbacks[:user_data] = FFI::MemoryPointer.new(:uint64)
+		@callbacks[:user_data].write_uint64(@transport_obj_id)
 		@session=secure_session_create(id_buf, id_length, private_key_buf, private_key_length, @callbacks);
 	        raise ThemisError, "secure_session_create error" unless @session
 	end
@@ -223,6 +227,32 @@ module Themis
 	end
     end
 
+    def Ssign(private_key, message)
+	    private_key_, private_key_length_= string_to_pointer_size(private_key)
+	    message_, message_length_=string_to_pointer_size(message)
+	    wrapped_message_length = FFI::MemoryPointer.new(:uint)
+	    res=themis_secure_message_wrap(private_key_, private_key_length_, nil, 0, message_, message_length_, nil, wrapped_message_length)
+	    raise ThemisError, "themis_secure_message_wrap (length determination) error: #{res}" unless res == BUFFER_TOO_SMALL
+	    wrapped_message = FFI::MemoryPointer.new(:char, wrapped_message_length.read_uint)
+	    res=themis_secure_message_wrap(private_key_, private_key_length_, nil, 0, message_, message_length_, wrapped_message, wrapped_message_length)
+	    raise ThemisError, "themis_secure_message_wrap error: #{res}" unless res == SUCCESS
+	    return wrapped_message.get_bytes(0, wrapped_message_length.read_uint);
+    end
+
+    def Sverify(peer_public_key, message)
+	    include ThemisCommon
+	    include ThemisImport
+	    public_key_, public_key_length_= string_to_pointer_size(peer_public_key)
+	    message_, message_length_=string_to_pointer_size(message)
+	    unwrapped_message_length = FFI::MemoryPointer.new(:uint)
+	    res=themis_secure_message_unwrap(nil, 0, public_key_, public_key_length_, message_, message_length_, nil, unwrapped_message_length)
+	    raise ThemisError, "themis_secure_message_unwrap (length determination) error: #{res}" unless res == BUFFER_TOO_SMALL
+	    unwrapped_message = FFI::MemoryPointer.new(:char, unwrapped_message_length.read_uint)
+	    res=themis_secure_message_unwrap(nil, 0, public_key_, public_key_length_, message_, message_length_, unwrapped_message, unwrapped_message_length)
+	    raise ThemisError, "themis_secure_message_unwrap error: #{res}" unless res == SUCCESS
+	    return unwrapped_message.get_bytes(0, unwrapped_message_length.read_uint);
+    end
+
     class Scell
 	include ThemisCommon
 	include ThemisImport
@@ -303,6 +333,9 @@ module Themis
 		raise ThemisError, "themis_secure_cell not supported mode"
 	    end
 	end
-
     end
+
+    module_function :Ssign
+    module_function :Sverify
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubythemis
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.1.1
 platform: ruby
 authors:
 - CossackLabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi