tweetnacl 0.0.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bad39ace9be8f8a7eb1d0663e4408afafbf1380
-  data.tar.gz: aa4d5a4dbbe7c17a22bceb16f04b46761cc1daf9
+  metadata.gz: deaf1ed99efeefb3138a1b0c78e43e7cb1c1699e
+  data.tar.gz: 73a15e0587d64171ef60723f879ed0f7e65631e8
 SHA512:
-  metadata.gz: 7efecffbd00db486ba676dc8c9f41d7e0a6c81e8573b55b8ad83ad008e96e42352838ae8b1230b3b747a8edee9c2a70f51db48133a364a70adb05a75f0d25284
-  data.tar.gz: d250ea717d974607a11a6baffcfadc84c81564c69fdd33f1f5fdabf2dec6f6d5f6e7005a68cf20c533e641e6c765cf61707fe8318c273696619d8cc71c7057f5
+  metadata.gz: 048804948082736c35a551cfe6c54a1756330f8603ac2bc4eef8f9c31fdf3c42b2a7a2c48775132a4a99d0e899136aa5ce8ba44e23718183f61d847f7d28e4bc
+  data.tar.gz: 378798dffd4d8761e4f43447379ae7a2c14acc26f1d01efded7cddd50c99dd97c283c5d934d8862a8a659e2cbbcd03ce1991bb277003da92a609c7c55b215e1d

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Releases
+
+## UNRELEASED
+
+## 0.2.0 
+
+* Implemented the crypto\_box\_curve25519xsalsa20poly1305 functions
+* Added a CHANGELOG file
+
+## 0.0.1
+
+* Initial release
+* Implemented the crypto\_box functions

data/README.md

@@ -1,13 +1,13 @@
 # TweetNaCl for Ruby
 
-# SUMMARY
+## SUMMARY
 
 TweetNaCl is a C-extension for Ruby built on top of the official TweetNacl
 distribution. It exposes the basic functions using Ruby objects.
 
 For a detailed explanation of TweetNaCl, [here's the research paper associated with it][paper]
 
-# INSTALL
+## INSTALL
 
     gem install tweetnacl
 
@@ -16,6 +16,8 @@ For a detailed explanation of TweetNaCl, [here's the research paper associated w
     input = "<text to cipher>"
     nonce = "<a 24-char string>"
 
+    @t = TweetNaCl.new
+
     pk, sk = @t.crypto_box_keypair # This generates a pair of public and secret keys
 
     cipher = @t.crypto_box(input, nonce, pk, sk) # Encrypt !
@@ -43,6 +45,9 @@ Decrypt and verify the signature of the ciphered message given the other paramet
 * [x] crypto_box_keypair
 * [x] crypto_box
 * [x] crypto_box_open
+* [x] crypto_box_curve25519xsalsa20poly1305_keypair
+* [x] crypto_box_curve25519xsalsa20poly1305
+* [x] crypto_box_curve25519xsalsa20poly1305_open
 * [ ] All the other functions !
 * [ ] Use high-level objects
 

data/ext/tweetnacl/rbext.c

@@ -76,7 +76,62 @@ VALUE m_crypto_box_open(VALUE self, VALUE _c, VALUE _n, VALUE _pk, VALUE _sk) {
   char * message = calloc(padded_mlen, sizeof(char));
 
   int res = crypto_box_open(message, c, padded_mlen, nonce, pk, sk);
-  if (0 != res) { rb_raise(rb_eRuntimeError, "la putain"); }
+  if (0 != res) { rb_raise(rb_eRuntimeError, "crypto_box_open did not work"); }
+
+  return rb_str_new2(message + PADDING_LEN);
+}
+
+VALUE m_crypto_box_curve25519xsalsa20poly1305_keypair(VALUE self) {
+  VALUE ary = rb_ary_new2(2);
+  char *pk = calloc(crypto_box_curve25519xsalsa20poly1305_tweet_PUBLICKEYBYTES, sizeof(unsigned char));
+  char *sk = calloc(crypto_box_curve25519xsalsa20poly1305_tweet_SECRETKEYBYTES, sizeof(unsigned char));
+  int res = crypto_box_curve25519xsalsa20poly1305_keypair(pk, sk);
+  pk[crypto_box_curve25519xsalsa20poly1305_tweet_PUBLICKEYBYTES] = 0;
+  sk[crypto_box_curve25519xsalsa20poly1305_tweet_SECRETKEYBYTES] = 0;
+  rb_ary_store(ary, 0, rb_str_new(pk, crypto_box_curve25519xsalsa20poly1305_tweet_PUBLICKEYBYTES));
+  rb_ary_store(ary, 1, rb_str_new(sk, crypto_box_curve25519xsalsa20poly1305_tweet_SECRETKEYBYTES));
+  return ary;
+}
+
+VALUE m_crypto_box_curve25519xsalsa20poly1305(VALUE self, VALUE _m, VALUE _n, VALUE _pk, VALUE _sk) {
+  if(_m == Qnil) { rb_raise(rb_eArgError, "A message should have been given"); }
+  if(_pk == Qnil) { rb_raise(rb_eArgError, "Public key should have been given"); }
+  if(_sk == Qnil) { rb_raise(rb_eArgError, "Secret key should have been given"); }
+  if (RSTRING_LEN(_n)  != 24) { rb_raise(rb_eArgError, "nonce should be 24-byte long"); }
+  if (RSTRING_LEN(_pk) != 32) { rb_raise(rb_eArgError, "public key should be 24-byte long"); }
+  if (RSTRING_LEN(_sk) != 32) { rb_raise(rb_eArgError, "secret key should be 24-byte long"); }
+
+  char * message = RSTRING_PTR(_m);
+  char * nonce = RSTRING_PTR(_n);
+  char * pk = RSTRING_PTR(_pk);
+  char * sk = RSTRING_PTR(_sk);
+  int len = strlen(message);
+  char * padded_message = (char*)calloc(sizeof(char), len + PADDING_LEN);
+  memcpy(padded_message + PADDING_LEN, message, strlen(message));
+  char * c = malloc(strlen(message) + PADDING_LEN);
+  int res = crypto_box_curve25519xsalsa20poly1305(c, padded_message, len + PADDING_LEN, nonce, pk, sk);
+  if (0 != res) { fprintf(stderr, "Something went wrong\n"); exit(res); }
+  VALUE ret = rb_str_new(c, len + PADDING_LEN);
+  return ret;
+}
+
+VALUE m_crypto_box_curve25519xsalsa20poly1305_open(VALUE self, VALUE _c, VALUE _n, VALUE _pk, VALUE _sk) {
+  if(_c == Qnil) { rb_raise(rb_eArgError, "A cipher should have been given"); }
+  if(_pk == Qnil) { rb_raise(rb_eArgError, "Public key should have been given"); }
+  if(_sk == Qnil) { rb_raise(rb_eArgError, "Secret key should have been given"); }
+  if (RSTRING_LEN(_n)  != 24) { rb_raise(rb_eArgError, "nonce should be 24-byte long"); }
+  if (RSTRING_LEN(_pk) != 32) { rb_raise(rb_eArgError, "public key should be 24-byte long"); }
+  if (RSTRING_LEN(_sk) != 32) { rb_raise(rb_eArgError, "secret key should be 24-byte long"); }
+
+  unsigned char * c = RSTRING_PTR(_c);
+  char * nonce = RSTRING_PTR(_n);
+  char * pk = RSTRING_PTR(_pk);
+  char * sk = RSTRING_PTR(_sk);
+  int padded_mlen = rb_str_strlen(_c);
+  char * message = calloc(padded_mlen, sizeof(char));
+
+  int res = crypto_box_curve25519xsalsa20poly1305_open(message, c, padded_mlen, nonce, pk, sk);
+  if (0 != res) { rb_raise(rb_eRuntimeError, "crypto_box_open did not work"); }
 
   return rb_str_new2(message + PADDING_LEN);
 }
@@ -89,4 +144,7 @@ void Init_tweetnacl() {
   rb_define_method(c, "crypto_box_keypair", RUBY_METHOD_FUNC(m_crypto_box_keypair), 0);
   rb_define_method(c, "crypto_box", RUBY_METHOD_FUNC(m_crypto_box), 4);
   rb_define_method(c, "crypto_box_open", RUBY_METHOD_FUNC(m_crypto_box_open), 4);
+  rb_define_method(c, "crypto_box_curve25519xsalsa20poly1305_keypair", RUBY_METHOD_FUNC(m_crypto_box_curve25519xsalsa20poly1305_keypair), 0);
+  rb_define_method(c, "crypto_box_curve25519xsalsa20poly1305", RUBY_METHOD_FUNC(m_crypto_box_curve25519xsalsa20poly1305), 4);
+  rb_define_method(c, "crypto_box_curve25519xsalsa20poly1305_open", RUBY_METHOD_FUNC(m_crypto_box_curve25519xsalsa20poly1305_open), 4);
 }

data/ext/tweetnacl/tweetnacl.c

@@ -235,8 +235,6 @@ int crypto_onetimeauth(u8 *out,const u8 *m,u64 n,const u8 *k)
   return 0;
 }
 
-#include <stdio.h>
-extern void hexdump(char*,int);
 int crypto_onetimeauth_verify(const u8 *h,const u8 *m,u64 n,const u8 *k)
 {
   u8 x[16];

data/test/tweetnacl_crypto_box_curve25519xsalsa20poly1305_keypair_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class TweetNaClCryptoBoxCurve25519XSalsa20Poly1305KeyPairTest < MiniTest::Test
+  def setup
+    @t = TweetNaCl.new
+  end
+
+  def teardown; end
+
+  def test_generate_a_keypair
+    pk, sk = @t.crypto_box_curve25519xsalsa20poly1305_keypair
+
+    assert_equal 32, pk.length
+    assert_equal 32, sk.length
+  end
+end

data/test/tweetnacl_crypto_box_curve25519xsalsa20poly1305_open_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class TweetNaClCryptoBoxCurve25519XSalsa20Poly1305OpenTest < MiniTest::Test
+  def setup
+    @t = TweetNaCl.new
+  end
+
+  def teardown; end
+
+  def test_crypto_box_curve25519xsalsa20poly1305_open_require_cipher_to_decrypt
+    set = false
+    begin
+      @t.crypto_box_curve25519xsalsa20poly1305_open(nil, nil, nil, nil)
+    rescue Exception => e
+      set = true
+    end
+    assert set, "A cipher is required"
+  end
+
+  def test_crypto_box_curve25519xsalsa20poly1305_open_require_public_key
+    set = false
+    begin
+      @t.crypto_box_curve25519xsalsa20poly1305_open("foo", nil, "foo", nil)
+    rescue ArgumentError => e
+      set = true
+    end
+    assert set, "A public key is required"
+  end
+
+  def test_crypto_box_curve25519xsalsa20poly1305_open_require_secret_key
+    set = false
+    begin
+      @t.crypto_box_curve25519xsalsa20poly1305_open("foo", "foo", "foo", nil)
+    rescue ArgumentError => e
+      set = true
+    end
+    assert set, "A secret key is required"
+  end
+
+  def test_crypto_box_curve25519xsalsa20poly1305_open_nonce_not_correct_length
+    set = false
+    begin
+      @t.crypto_box_curve25519xsalsa20poly1305_open("foo", "bar", "pk", "sk")
+    rescue ArgumentError => e
+      set = true
+    end
+    assert set, "Incorrect nonce length should have raised ArgumentError"
+  end
+end

data/test/tweetnacl_crypto_box_curve25519xsalsa20poly1305_test.rb

@@ -0,0 +1,64 @@
+require 'test_helper'
+
+class TweetNaClCryptoBoxCurve25519XSalsa20Poly1305Test < MiniTest::Test
+  def setup
+    @t = TweetNaCl.new
+  end
+
+  def teardown; end
+
+  def test_crypto_box_curve25519xsalsa20poly1305
+    input = "hello world"
+    nonce = "*" * 24
+    expected_cipher = "0000000000000000FBC937C3F136E09FA8A45C58C15E801394F5BB74CE8D538FE3D726"
+    pk = "\x60\xF0\x23\x07\xDF\xB6\x8B\xBB\x15\xE2\x92\x59\x05\x1B\x2D\xF8\xC8\x59\xDB\x5B\xDE\x97\xFA\xE8\x9B\x5F\xE5\x62\x63\x11\xD6\x56"
+    sk = "\xBE\x38\x7C\x59\xD1\x81\x0B\xCC\x8E\xD8\x90\xDB\x3D\xF9\x80\x63\x9E\xD2\x54\x44\xFB\x4D\xD1\x92\xB6\xC6\x75\x53\xF9\x76\x9F\xCF"
+
+    cipher = @t.crypto_box_curve25519xsalsa20poly1305(input, nonce, pk, sk)
+
+    output = @t.crypto_box_curve25519xsalsa20poly1305_open(cipher, nonce, pk, sk)
+
+    assert_equal input, output
+    assert_equal expected_cipher, cipher.hd
+  end
+
+  def test_crypto_box_curve25519xsalsa20poly1305_require_message_to_cipher
+    set = false
+    begin
+      @t.crypto_box_curve25519xsalsa20poly1305(nil, "bar", "pk", "sk")
+    rescue ArgumentError => e
+      set = true
+    end
+    assert set, "A message is required"
+  end
+
+  def test_crypto_box_curve25519xsalsa20poly1305_require_public_key
+    set = false
+    begin
+      @t.crypto_box_curve25519xsalsa20poly1305("foo", "bar", nil, "sk")
+    rescue ArgumentError => e
+      set = true
+    end
+    assert set, "A public key is required"
+  end
+
+  def test_crypto_box_curve25519xsalsa20poly1305_require_secret_key
+    set = false
+    begin
+      @t.crypto_box_curve25519xsalsa20poly1305("foo", "bar", "pk", nil)
+    rescue ArgumentError => e
+      set = true
+    end
+    assert set, "A secret key is required"
+  end
+
+  def test_crypto_box_curve25519xsalsa20poly1305_nonce_not_correct_length
+    set = false
+    begin
+      @t.crypto_box_curve25519xsalsa20poly1305("foo", "bar", "pk", "sk")
+    rescue ArgumentError => e
+      set = true
+    end
+    assert set, "Incorrect nonce length should have raised ArgumentError"
+  end
+end

data/test/tweetnacl_crypto_box_open_test.rb

@@ -7,11 +7,6 @@ class TweetNaClCryptoBoxOpenTest < MiniTest::Test
 
   def teardown; end
 
-  def test_foo
-    assert true
-  end
-
-
   def test_crypto_box_open_require_cipher_to_decrypt
     set = false
     begin

data/tweetnacl.gemspec

@@ -1,20 +1,19 @@
 # coding: utf-8
 $:<< 'lib'
 Gem::Specification.new do |spec|
-  spec.name    = "tweetnacl"
-  spec.version = "0.0.1"
-  spec.authors       = ["Franck Verrot"]
-  spec.email         = ["franck@verrot.fr"]
-  spec.homepage      = "https://github.com/franckverrot/clamav-client"
-  spec.license       = "GPLv3"
+  spec.name     = "tweetnacl"
+  spec.version  = "0.2.0"
+  spec.authors  = ["Franck Verrot"]
+  spec.email    = ["franck@verrot.fr"]
+  spec.homepage = "https://github.com/franckverrot/tweetnacl"
+  spec.license  = "GPLv3"
 
-  spec.summary = "TweetNaCl for Ruby"
+  spec.summary     = "TweetNaCl for Ruby"
   spec.description = "TweetNaCl is a C-extension built on top of the official TweetNaCl distribution"
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files       = `git ls-files -z`.split("\x0")
 
   spec.extensions << "ext/tweetnacl/extconf.rb"
 
-
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tweetnacl
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Franck Verrot
@@ -76,6 +76,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -87,11 +88,14 @@ files:
 - ext/tweetnacl/tweetnacl.c
 - ext/tweetnacl/tweetnacl.h
 - test/test_helper.rb
+- test/tweetnacl_crypto_box_curve25519xsalsa20poly1305_keypair_test.rb
+- test/tweetnacl_crypto_box_curve25519xsalsa20poly1305_open_test.rb
+- test/tweetnacl_crypto_box_curve25519xsalsa20poly1305_test.rb
 - test/tweetnacl_crypto_box_key_pair_test.rb
 - test/tweetnacl_crypto_box_open_test.rb
 - test/tweetnacl_crypto_box_test.rb
 - tweetnacl.gemspec
-homepage: https://github.com/franckverrot/clamav-client
+homepage: https://github.com/franckverrot/tweetnacl
 licenses:
 - GPLv3
 metadata: {}
@@ -117,6 +121,9 @@ specification_version: 4
 summary: TweetNaCl for Ruby
 test_files:
 - test/test_helper.rb
+- test/tweetnacl_crypto_box_curve25519xsalsa20poly1305_keypair_test.rb
+- test/tweetnacl_crypto_box_curve25519xsalsa20poly1305_open_test.rb
+- test/tweetnacl_crypto_box_curve25519xsalsa20poly1305_test.rb
 - test/tweetnacl_crypto_box_key_pair_test.rb
 - test/tweetnacl_crypto_box_open_test.rb
 - test/tweetnacl_crypto_box_test.rb