self_crypto 0.0.1 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34537603a575a2b32c468b332dd83e91ba2516c8c09984fb99d8f55910cdb680
-  data.tar.gz: 5e3a683e167fcdb4126bed5de9282d4d4e5c694ef54158d4dacd146b8d180d8e
+  metadata.gz: 73eca72eccdafd451e608539b1b3ca79e344ff359f6b4665ccb400bcd8228a96
+  data.tar.gz: 80b460665fb84005612a6236eca92dc99c640c1750f0cce282c31ff5acdafce9
 SHA512:
-  metadata.gz: d0133166300cd4f784af606550459c670bdc0dde4a6db1a74e70fd0dcba36baae7a1e50604d923d0f0da25b3b59378d4418f0c671dadd1eb931faff780958be4
-  data.tar.gz: 498ad6f393d8683d9250ce56957d09d026283449a3964e3f5193a0ad1512bfce887eb67c75a99a8ded80768de075289b728328b18e494de4e15ac0d0ee248385
+  metadata.gz: 85eeecb3fc6132ce712648f4490513ce4ee03e833c6eeeb6ae90211158bb6d576492c931f3f67f863fdd682f99a02a89709966c5ab4dfd34ea917bf9cc803efc
+  data.tar.gz: 1a6bd6df98128d36ce74225fcb83c17db9e3eb19a315ad0570760a2835248ecbea876e6d4408ecfd5940290829ea2f0c24311514aa7b36e7fd5ee6cf4fc7f4b7

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/self_crypto.c

@@ -30,7 +30,6 @@ static VALUE get_olm_version(VALUE self)
 
 void Init_self_crypto(void)
 {
-    rb_require("openssl");
     rb_require("json");
     rb_require("self_crypto/olm_error");
 
@@ -51,7 +50,24 @@ void raise_olm_error(const char *error)
 
 VALUE get_random(size_t size)
 {
-    return rb_funcall(rb_eval_string("OpenSSL::Random"), rb_intern("random_bytes"), 1, SIZET2NUM(size));
+    VALUE rand;
+    void *ptr;
+
+    if (sodium_init() == -1) {
+        rb_raise(rb_eNoMemError, "%s()", __FUNCTION__);
+    }
+
+    if ((ptr = malloc(size)) == NULL){
+        rb_raise(rb_eNoMemError, "%s()", __FUNCTION__);
+    }
+
+    randombytes_buf(ptr, size);
+
+    rand = rb_str_new(ptr, size);
+
+    free(ptr);
+
+    return rand;
 }
 
 VALUE dup_string(VALUE str)

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.1"
+  VERSION="0.0.6"
 
 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: self_crypto
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.6
 platform: ruby
 authors:
 - Tom Bevan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-10-16 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