self_crypto 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd813c17a394c17cdace467370ee2347c24e79792c93a9741e45ba64782df3d7
-  data.tar.gz: 431bf925fcbc3e70b1be2205502d7ea118dd355755379a3169a5d5244579894a
+  metadata.gz: c80522a003146eb903859a9fc2007546dc76ff94e599b3eaceccbe328b753fbb
+  data.tar.gz: a1a7eb743ed6b4c22d0a9b70c33f9aba491d6bf88a02bba32dbbb4659c570621
 SHA512:
-  metadata.gz: 8059470ea5a266b47c68ac7a5264e4c0692b53d5a772c71dbb7f6c2bdb0cb9b51d0f9c332fc695bb543f9823363406374fc23b222f2979141662df7e755d38b4
-  data.tar.gz: 0e7f4d7e773d0259b88675dc14852b606c864cc6f93b599d5661986879de1d88a277c54cbda6f6e8bc51b3d4354116c6ffc1ef9ad0c08dc1e386eff6ba8c050d
+  metadata.gz: c8bf46420a38dda34c0574ecbc9ee785290dd2d3bcd94db3513547e65fe750c9cec0c835da24043224fb3d08bb318b47263e5753ff43d6ab55569cafd8ae4f3b
+  data.tar.gz: 785ee198c7345c1fa6ead3df9211181de418045cc33979c414b2f150d73f43b8303edc0be6469179c3f03e4acbe262d33834be3fcec5ba371fee41fada314ef7

data/ext/self_crypto/account.c

@@ -46,24 +46,17 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
     }
 
     if(pickle != Qnil){
-
         if(olm_unpickle_account(this, RSTRING_PTR(password), RSTRING_LEN(password), RSTRING_PTR(dup_string(pickle)), RSTRING_LEN(pickle)) == olm_error()){
-
             raise_olm_error(olm_account_last_error(this));
         }
-    }
-    if(seed != Qnil){
+    } else if(seed != Qnil){
         if(olm_create_account_derrived_keys(this, RSTRING_PTR(seed), RSTRING_LEN(seed)) == olm_error()){
-
             raise_olm_error(olm_account_last_error(this));
         }
-    }
-    else{
-
+    } else {
         size = olm_create_account_random_length(this);
 
         if(olm_create_account(this, RSTRING_PTR(get_random(size)), size) == olm_error()){
-
             raise_olm_error(olm_account_last_error(this));
         }
     }

data/ext/self_crypto/omemo.c

@@ -48,7 +48,7 @@ static VALUE add_participant(VALUE self, VALUE identity, VALUE session)
     return identity;
 }
 
-static VALUE encrypt(VALUE self, VALUE plaintext)
+static VALUE group_encrypt(VALUE self, VALUE plaintext)
 {
     GroupSession *this;
     VALUE ciphertext;
@@ -91,7 +91,7 @@ static VALUE encrypt(VALUE self, VALUE plaintext)
     return ciphertext;
 }
 
-static VALUE decrypt(VALUE self, VALUE sender, VALUE ciphertext)
+static VALUE group_decrypt(VALUE self, VALUE sender, VALUE ciphertext)
 {
     GroupSession *this;
     VALUE plaintext;
@@ -165,6 +165,6 @@ void group_session_init()
 
     rb_define_method(cGroupSession, "initialize", initialize, -1);
     rb_define_method(cGroupSession, "add_participant", add_participant, 2);
-    rb_define_method(cGroupSession, "encrypt", encrypt, 1);
-    rb_define_method(cGroupSession, "decrypt", decrypt, 2);
+    rb_define_method(cGroupSession, "encrypt", group_encrypt, 1);
+    rb_define_method(cGroupSession, "decrypt", group_decrypt, 2);
 }

data/ext/self_crypto/session.c

@@ -205,7 +205,7 @@ static VALUE message_type(VALUE self)
     return retval;
 }
 
-static VALUE encrypt(VALUE self, VALUE plain)
+static VALUE session_encrypt(VALUE self, VALUE plain)
 {
     size_t cipher_size, random_size;
     void *ptr;
@@ -238,7 +238,7 @@ static VALUE encrypt(VALUE self, VALUE plain)
     return retval;
 }
 
-static VALUE decrypt(VALUE self, VALUE cipher)
+static VALUE session_decrypt(VALUE self, VALUE cipher)
 {
     size_t plain_size, plain_max, type;
     void *ptr;
@@ -356,8 +356,8 @@ void session_init(void)
     rb_define_method(cSession, "id", get_session_id, 0);
     rb_define_method(cSession, "last_error", last_error, 0);
     rb_define_method(cSession, "has_received_message", has_received_message, 0);
-    rb_define_method(cSession, "encrypt", encrypt, 1);
-    rb_define_method(cSession, "decrypt", decrypt, 1);
+    rb_define_method(cSession, "encrypt", session_encrypt, 1);
+    rb_define_method(cSession, "decrypt", session_decrypt, 1);
     rb_define_method(cSession, "to_pickle", to_pickle, -1);
     rb_define_method(cSession, "will_receive?", will_receive, -1);
 }

data/ext/self_crypto/utility.c

@@ -48,12 +48,12 @@ static VALUE ed25519_pk_to_curve25519(VALUE self, VALUE ed25519_pk)
         NULL,
         &dec_sz,
         NULL,
-        sodium_base64_VARIANT_ORIGINAL_NO_PADDING
+        sodium_base64_VARIANT_URLSAFE_NO_PADDING
     );
 
     if(success != 0) {
         free(dec_ptr);
-        rb_raise(rb_eTypeError, "could not convert ed25519 public key");
+        rb_raise(rb_eTypeError, "could not decode ed25519 public key");
     }
 
     if((pk_ptr = malloc(pk_sz)) == NULL){
@@ -88,7 +88,7 @@ static VALUE ed25519_pk_to_curve25519(VALUE self, VALUE ed25519_pk)
 
     free(pk_ptr);
 
-    curve25519_sk = rb_str_new(enc_ptr, enc_sz);
+    curve25519_sk = rb_str_new_cstr(enc_ptr);
 
     free(enc_ptr);
 

data/lib/self_crypto/version.rb

@@ -1,5 +1,5 @@
 module SelfCrypto
 
-  VERSION="0.0.2"
+  VERSION="0.0.7"
 
 end

data/test/spec/test_account.rb

@@ -95,6 +95,16 @@ describe "Account" do
 
     end
 
+    describe "#inbound_session from pickled account" do
+      
+      let(:remote_session){ remote.outbound_session(account.ik['curve25519'], account.otk['curve25519'].values.first) }
+      let(:remote_message){ remote_session.encrypt("hello") }
+      let(:pickled_account){ account.to_pickle("test") }
+      let(:unpickled_account){ SelfCrypto::Account.from_pickle(pickled_account, "test") }
+      it("creates session") { _(unpickled_account.inbound_session(remote_message, remote.ik['curve25519'])).must_be_kind_of SelfCrypto::Session }
+ 
+    end
+
   end
 
 end

data/test/spec/test_util.rb

@@ -0,0 +1,17 @@
+require 'minitest/autorun'
+require 'minitest/reporters'
+require 'self_crypto'
+
+reporter_options = { color: true }
+Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(reporter_options)]
+
+describe "Util" do
+
+  describe "ed25519_pk_to_curve25519" do
+    account = SelfCrypto::Account.from_seed("pA0H92i1hsp1/egmS/tuEho5PpsAaQYrBd0Tj7bvAPI")
+    ed25519_pk = Base64.urlsafe_encode64(Base64.decode64(account.ik['ed25519']), padding: false)
+    curve25519_pk = SelfCrypto::Util.ed25519_pk_to_curve25519(ed25519_pk)
+    it("should convert"){ _(account.ik['curve25519']).must_equal curve25519_pk }
+  end
+
+end

data/test/unit/test_account_methods.rb

@@ -25,10 +25,6 @@ class TestAccount < Minitest::Test
     assert_equal OlmError::SUCCESS, @state.last_error
   end
 
-  def test_sign
-    assert_instance_of String, @state.sign("hello")
-  end
-
   def test_mark_keys_as_published
     assert_equal @state, @state.mark_keys_as_published
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: self_crypto
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - Tom Bevan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -103,6 +103,7 @@ files:
 - test/examples/test_bob_no_answer.rb
 - test/examples/test_exchange.rb
 - test/spec/test_account.rb
+- test/spec/test_util.rb
 - test/unit/test_account_methods.rb
 homepage: https://github.com/aldgate-ventures/self-crypto-ruby
 licenses:
@@ -131,4 +132,5 @@ test_files:
 - test/unit/test_account_methods.rb
 - test/examples/test_exchange.rb
 - test/examples/test_bob_no_answer.rb
+- test/spec/test_util.rb
 - test/spec/test_account.rb