self_crypto 0.0.4 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 379c43395f0d8b1c82233d62684d5aff12bfd1094720e62f6295d2c5c4d23104
-  data.tar.gz: 1763fb0f7609912d3b88e65ba13e4d1c6468c45b1be77fb2076fb36a8f8376ad
+  metadata.gz: 3db3da86cb87d90e72ce0f69a682872a8e2b092b9828e67d1a7641b1952fed59
+  data.tar.gz: e3319c2d1c8f34854500f4f4d723007b89d9c1ac312ae6d271c74d953c22548d
 SHA512:
-  metadata.gz: a3726d64cc6b697724c9df3f18df52d30eb923d77ab42d9cdf032dc5fc22ba62990b80fcd6a459a3a0bf1de5152c26dd4594435592827a9985ca6dda1bf476ca
-  data.tar.gz: af77dbf7af8ecf2a812a0805c400f89952abd8aea84b49096dc531b08a0c409aa8f86e512578713f46d85ce50840ef253c89256c10b6ba6673e95b44e758d731
+  metadata.gz: cb42f2dd7f586324bd638583c89a867b1858ae4d2da836f15392f851eb36e624f59648c71f5f0fff12fce922cca1b18f37fe2e6019bfda72131af60fa855e3b3
+  data.tar.gz: 770c20da2afea5e5dbd1cf8291584640b1ce1db395bbe916a340c67b429aa1998acfb3aa0d0f56f0f0e05bcd13bd27ef995fcf6866bebb8917c1e80051fcff79

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

@@ -1,3 +1,5 @@
+// Copyright 2020 Self Group Ltd. All Rights Reserved.
+
 #include "sodium.h"
 #include "self_olm/olm.h"
 #include "self_omemo.h"

data/ext/self_crypto/utility.c

@@ -24,6 +24,117 @@ static VALUE ed25519_verify(VALUE self, VALUE data, VALUE key, VALUE signature)
     return retval;
 }
 
+static VALUE random_bytes(VALUE self, VALUE size)
+{
+    void *nonce;
+
+    if((nonce = malloc(NUM2SIZET(size))) == NULL){
+        rb_raise(rb_eNoMemError, "%s()", __FUNCTION__);
+    }
+
+    randombytes_buf(nonce, NUM2SIZET(size));
+
+    VALUE n = rb_str_new(nonce, NUM2SIZET(size));
+
+    free(nonce);
+
+    return n;
+}
+
+static VALUE aead_xchacha20poly1305_ietf_nonce(VALUE self)
+{
+    void *nonce;
+
+    if((nonce = malloc(crypto_aead_xchacha20poly1305_ietf_NPUBBYTES)) == NULL){
+        rb_raise(rb_eNoMemError, "%s()", __FUNCTION__);
+    }
+
+    randombytes_buf(nonce, crypto_aead_xchacha20poly1305_ietf_NPUBBYTES);
+
+    VALUE n = rb_str_new(nonce, crypto_aead_xchacha20poly1305_ietf_NPUBBYTES);
+
+    free(nonce);
+
+    return n;
+}
+
+static VALUE aead_xchacha20poly1305_ietf_keygen(VALUE self)
+{
+    void *key;
+
+    if((key = malloc(crypto_aead_xchacha20poly1305_ietf_KEYBYTES)) == NULL){
+        rb_raise(rb_eNoMemError, "%s()", __FUNCTION__);
+    }
+
+    crypto_aead_xchacha20poly1305_ietf_keygen(key);
+
+    VALUE k = rb_str_new(key, crypto_aead_xchacha20poly1305_ietf_KEYBYTES);
+
+    free(key);
+
+    return k;
+}
+
+static VALUE aead_xchacha20poly1305_ietf_encrypt(VALUE self, VALUE key, VALUE nonce, VALUE plaintext)
+{
+    void *ciphertext;
+    unsigned long long ciphertext_len;
+
+    if((ciphertext = malloc(RSTRING_LEN(plaintext) + crypto_aead_xchacha20poly1305_ietf_ABYTES)) == NULL){
+        rb_raise(rb_eNoMemError, "%s()", __FUNCTION__);
+    }
+
+    crypto_aead_xchacha20poly1305_ietf_encrypt(
+        ciphertext,
+        &ciphertext_len,
+        RSTRING_PTR(plaintext),
+        RSTRING_LEN(plaintext),
+        NULL,
+        0,
+        NULL,
+        RSTRING_PTR(nonce),
+        RSTRING_PTR(key)
+    );
+
+    VALUE ct = rb_str_new(ciphertext, ciphertext_len);
+
+    free(ciphertext);
+
+    return ct;
+}
+
+static VALUE aead_xchacha20poly1305_ietf_decrypt(VALUE self, VALUE key, VALUE nonce, VALUE ciphertext)
+{
+    void *plaintext;
+    unsigned long long plaintext_len;
+
+    if((plaintext = malloc(RSTRING_LEN(ciphertext))) == NULL){
+        rb_raise(rb_eNoMemError, "%s()", __FUNCTION__);
+    }
+
+    int status = crypto_aead_xchacha20poly1305_ietf_decrypt(
+        plaintext,
+        &plaintext_len,
+        NULL,
+        RSTRING_PTR(ciphertext),
+        RSTRING_LEN(ciphertext),
+        NULL,
+        0,
+        RSTRING_PTR(nonce),
+        RSTRING_PTR(key)
+    );
+
+    if (status != 0) {
+        rb_raise(rb_eStandardError, "could not authenticate encrypted message");
+    }
+
+    VALUE pt = rb_str_new(plaintext, plaintext_len);
+
+    free(plaintext);
+
+    return pt;
+}
+
 static VALUE ed25519_pk_to_curve25519(VALUE self, VALUE ed25519_pk)
 {
     VALUE curve25519_sk;
@@ -48,12 +159,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 +199,7 @@ static VALUE ed25519_pk_to_curve25519(VALUE self, VALUE ed25519_pk)
 
     free(pk_ptr);
 
-    curve25519_sk = rb_str_new(enc_ptr, 44);
+    curve25519_sk = rb_str_new_cstr(enc_ptr);
 
     free(enc_ptr);
 
@@ -140,4 +251,9 @@ void utility_init(void)
     rb_define_method(cUtility, "sha256", sha256, 1);
     rb_define_method(cUtility, "ed25519_verify", ed25519_verify, 3);
     rb_define_module_function(cUtil, "ed25519_pk_to_curve25519", ed25519_pk_to_curve25519, 1);
+    rb_define_module_function(cUtil, "random_bytes", random_bytes, 1);
+    rb_define_module_function(cUtil, "aead_xchacha20poly1305_ietf_keygen", aead_xchacha20poly1305_ietf_keygen, 0);
+    rb_define_module_function(cUtil, "aead_xchacha20poly1305_ietf_nonce", aead_xchacha20poly1305_ietf_nonce, 0);
+    rb_define_module_function(cUtil, "aead_xchacha20poly1305_ietf_encrypt", aead_xchacha20poly1305_ietf_encrypt, 3);
+    rb_define_module_function(cUtil, "aead_xchacha20poly1305_ietf_decrypt", aead_xchacha20poly1305_ietf_decrypt, 3);
 }

data/lib/self_crypto/group_message.rb

@@ -1,3 +1,5 @@
+# Copyright 2020 Self Group Ltd. All Rights Reserved.
+
 require 'base64'
 
 module SelfCrypto

data/lib/self_crypto/group_session.rb

@@ -1,3 +1,5 @@
+# Copyright 2020 Self Group Ltd. All Rights Reserved.
+
 require 'base64'
 
 module SelfCrypto

data/lib/self_crypto/utility.rb

@@ -1,3 +1,5 @@
+# Copyright 2020 Self Group Ltd. All Rights Reserved.
+
 module SelfCrypto
 
   module Util

data/lib/self_crypto/version.rb

@@ -1,5 +1,7 @@
+# Copyright 2020 Self Group Ltd. All Rights Reserved.
+
 module SelfCrypto
 
-  VERSION="0.0.4"
+  VERSION="0.0.8"
 
 end

data/lib/self_crypto.rb

@@ -1,3 +1,5 @@
+# Copyright 2020 Self Group Ltd. All Rights Reserved.
+
 require 'self_crypto/version'
 require 'self_crypto/self_crypto'
 require 'self_crypto/account'

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,29 @@
+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
+
+  describe "xchacha20_poly1305_itef" do
+    message = "something"
+
+    key = SelfCrypto::Util.aead_xchacha20poly1305_ietf_keygen
+    nonce = SelfCrypto::Util.aead_xchacha20poly1305_ietf_nonce
+
+    ct = SelfCrypto::Util.aead_xchacha20poly1305_ietf_encrypt(key, nonce, message)
+    pt = SelfCrypto::Util.aead_xchacha20poly1305_ietf_decrypt(key, nonce, ct)
+
+    it('should decrypt'){ _(pt).must_equal message}
+  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.4
+  version: 0.0.8
 platform: ruby
 authors:
 - Tom Bevan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2022-01-12 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:
@@ -123,12 +124,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Group end to end encryption for self
 test_files:
 - test/unit/test_account_methods.rb
-- test/examples/test_exchange.rb
 - test/examples/test_bob_no_answer.rb
+- test/examples/test_exchange.rb
 - test/spec/test_account.rb
+- test/spec/test_util.rb