ruby_olm 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17da5166e2138afc190196d6edf41f5e9e7c9f3b00f7924112fa6490c87f955e
-  data.tar.gz: 0c5b08a346d82fcfa3f6388b6ba208a7a42d83fe9949b3ae4ced863aceaa28bc
+  metadata.gz: 343a748fd94cf6a9ba9da585f648e914899776d4ac4d134e177654003cefb6e5
+  data.tar.gz: ee4c37d996fad9269e6631872af88eba4e86b86adfa900b27bec2a941f1a122e
 SHA512:
-  metadata.gz: 679c54ffda79d6b8639fa3e0a18e25b2c514ccc26879c0981539d794f0bcafec7e54b8477e9621452e47d16eec27ed0b151843923e60278988f6556468c34e76
-  data.tar.gz: 3866781b6aae4957b6cd5fd7d3c30c35a7af5dafb55b94fbc359d6122581adc65310c6f6f7de776edcaaf7272fba3f77b984a4e775888d32d2f962bbdaed6123
+  metadata.gz: 30cbfddf91af001b34daaa17b2718967acf52e452a83ad2a4288fa135e8c1551da172818b960ce0ea520ad45bd5305b82a7ebfdda2c5e73aa555d4db7ede2601
+  data.tar.gz: c8cd801bed9193b4fc00cb912dd083c09d6c0f403dcc2533c7f53b8af0df936aa709656ba092155003c39290d8b7b549d05abb5cc2790406d2c5def05579864b

data/ext/ruby_olm/ext_lib_olm/staging/session.cpp

@@ -213,6 +213,7 @@ std::size_t olm::Session::session_id(
     return session_id_length();
 }
 
+
 bool olm::Session::matches_inbound_session(
     _olm_curve25519_public_key const * their_identity_key,
     std::uint8_t const * one_time_key_message, std::size_t message_length

data/lib/ruby_olm/account.rb

@@ -9,32 +9,14 @@ module RubyOlm
       Account.new(pickle: pickle, password: password)
     end
     
-    # @param [type] defaults to 'curve25519' 
-    # @return [String]
-    def ik(type='curve25519')
-      raise RangeError unless identity_keys[type]
-      identity_keys[type]
-    end
-    
-    # @param [type] defaults to 'curve25519'
-    # @param [value] return only the key values and not the ids 
-    #
-    # @return [Array<Hash>] if !values
-    # @return [Array<String>] if values
-    def otk(values=true, type='curve25519')
-      if values
-        one_time_keys[type].values
-      else
-        one_time_keys[type]
-      end
-    end
-    
     def gen_otk(number=1)
       generate_one_time_keys(number)
     end
     
+    alias_method :ik,       :identity_keys
+    alias_method :otk,      :one_time_keys
     alias_method :mark_otk, :mark_keys_as_published
-    alias_method :max_otk, :max_number_of_one_time_keys
+    alias_method :max_otk,    :max_number_of_one_time_keys
     alias_method :update_otk, :remove_one_time_keys
     
   end

data/lib/ruby_olm/version.rb

@@ -1,5 +1,5 @@
 module RubyOlm
   
-  VERSION="0.1.1"
+  VERSION="0.1.2"
   
 end

data/test/examples/test_bob_no_answer.rb

@@ -20,7 +20,7 @@ class TestExchange < Minitest::Test
     bob.gen_otk
 
     # Alice must have Bob's identity and one-time-key to make a session
-    alice_session = alice.outbound_session(bob.ik, bob.otk.first)
+    alice_session = alice.outbound_session(bob.ik['curve25519'], bob.otk['curve25519'].values.first)
 
     # Bob marks all one-time-keys as published
     bob.mark_otk

data/test/examples/test_exchange.rb

@@ -19,7 +19,7 @@ class TestExchange < Minitest::Test
     bob.gen_otk
 
     # Alice must have Bob's identity and one-time-key to make a session
-    alice_session = alice.outbound_session(bob.ik, bob.otk.first)
+    alice_session = alice.outbound_session(bob.ik['curve25519'], bob.otk['curve25519'].values.first)
 
     # Bob marks all one-time-keys as published
     bob.mark_otk

data/test/spec/test_account.rb

@@ -5,65 +5,13 @@ describe "Account" do
 
   let(:account){ RubyOlm::Account.new }
 
-  # returns curve2599 identity key
-  #
-  describe "#ik" do
-    
-    let(:rv){ account.ik }
-  
-    it("returns a String"){ rv.must_be_instance_of String }
-
-  end
-
-  describe "#identity_keys" do
-  
-    let(:rv){ account.identity_keys }
-  
-    it("returns a Hash"){ rv.must_be_instance_of Hash }
-  
-  end
-  
-  # returns the maximum number of one-time-keys able to be 
-  # cached by account
-  #
-  describe "#max_otk" do
-    
-    let(:rv){ account.max_otk }
-    
-    it("returns an unsigned integer") do
-      rv.must_be_kind_of Integer
-      rv.must_be :'>=', 0
-    end
-    
-  end
-  
-  # generates zero or more one-time-keys which will then be cached
-  # by account until such time they are:
-  #
-  # - overwritten by future calls to #generate_otk
-  # - removed by session establishment
-  #     
-  describe "#gen_otk" do
-  
-    it("returns self"){ account.gen_otk.must_equal account }
-  
-  end
-  
-  # marks one-time-keys as published
-  #
-  describe "#mark_otk" do
-  
-    it("returns self"){ account.mark_otk.must_equal account }
-  
-  end
-  
   # returns cached one-time-keys which have not yet been marked as published
   #
   describe "#otk" do
   
-    let(:rv){ account.otk }
+    let(:rv){ account.otk['curve25519'] }
   
-    it("returns an Array"){ rv.must_be_kind_of Array }
+    it("returns a Hash"){ rv.must_be_kind_of Hash }
     
     describe "return value" do
     
@@ -125,13 +73,13 @@ describe "Account" do
     
     describe "#outbound_session" do
     
-      it("creates session") { account.outbound_session(remote.ik, remote.otk.first).must_be_kind_of RubyOlm::Session }
+      it("creates session") { account.outbound_session(remote.ik['curve25519'], remote.otk['curve25519'].values.first).must_be_kind_of RubyOlm::Session }
       
     end
     
     describe "#inbound_session" do
       
-      let(:remote_session){ remote.outbound_session(account.ik, account.otk.first) }
+      let(:remote_session){ remote.outbound_session(account.ik['curve25519'], account.otk['curve25519'].values.first) }
       let(:remote_message){ remote_session.encrypt("hello") }
       
       it("creates session") { account.inbound_session(remote_message).must_be_kind_of RubyOlm::Session }
@@ -140,10 +88,10 @@ describe "Account" do
     
     describe "#inbound_session from known remote" do
       
-      let(:remote_session){ remote.outbound_session(account.ik, account.otk.first) }
+      let(:remote_session){ remote.outbound_session(account.ik['curve25519'], account.otk['curve25519'].values.first) }
       let(:remote_message){ remote_session.encrypt("hello") }
       
-      it("creates session") { account.inbound_session(remote_message, remote.ik).must_be_kind_of RubyOlm::Session }
+      it("creates session") { account.inbound_session(remote_message, remote.ik['curve25519']).must_be_kind_of RubyOlm::Session }
       
     end
     

data/test/unit/test_account_methods.rb

@@ -13,27 +13,14 @@ class TestAccount < Minitest::Test
     assert_instance_of Hash, @state.identity_keys
   end
   
-  def test_ik_default
-    assert_equal @state.identity_keys['curve25519'], @state.ik
-  end
-  
   def test_one_time_keys
     assert_instance_of Hash, @state.one_time_keys
   end
   
-  def test_otk_default
-    assert_instance_of Array, @state.otk
-    assert_equal @state.one_time_keys['curve25519'].values, @state.otk
-  end
-  
   def test_generate_one_time_keys
     assert_equal @state, @state.generate_one_time_keys(rand(1..10))
   end
   
-  def test_gen_otk
-    test_generate_one_time_keys
-  end 
-  
   def test_last_error
     assert_equal OlmError::SUCCESS, @state.last_error
   end
@@ -46,18 +33,10 @@ class TestAccount < Minitest::Test
     assert_equal @state, @state.mark_keys_as_published
   end
   
-  def test_mark_otk
-    test_mark_keys_as_published
-  end
-  
   def test_max_number_of_one_time_keys
     assert_kind_of Integer, @state.max_number_of_one_time_keys
   end
   
-  def test_max_otk
-    test_max_number_of_one_time_keys
-  end
-  
   def test_to_pickle
     assert_kind_of String, @state.to_pickle
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_olm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Cameron Harper