blake2 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cacd5c7a8696d2e3c9bf9ba76e2c8cc54c3a47db
-  data.tar.gz: 19f4df0b42ed8bd82bc9101b7830e7570805e826
+  metadata.gz: 4250cbe6cd64da1a6b5a975ad4723dc257cb08b3
+  data.tar.gz: 06f89ae5b24e3a63536cf7718490c12624e0b05b
 SHA512:
-  metadata.gz: cc5451f87f530f02b6d30cacb31dddf12b1f35216ce49a1c8563aa1c5ff67fe0d660b3b759df15ac47c9449f8ad0c6ad79f5d0ee8b7c711f6e9f6558ae24f895
-  data.tar.gz: 2213fe41d9e0880a8051f8caad57d09958443ad08b64b2e838971b0677dcec765b2dee6e2aaba22c6cbeeb06eaa617256a2c76e5d0f1e7f209b1397ff1a29dac
+  metadata.gz: 6c963fd93b7772aa6c39e476b635568b10d521959b67b8d6ee1019707b2a18e3c66c9b09c2047f009785caf47fac9069ce40669fde646909fbceeac3a564e00a
+  data.tar.gz: 37fefa3f64d105717495ac62c10a12b3f85e551146c8d455be2d0e3577a41e3cc2fdd7d8cc21b27cc80ef8bcd0df71556c2f2a007bb01dc6fa46edf5873adf6b

data/CHANGELOG.md

@@ -1,3 +1,12 @@
 # Releases
 
-## UNRELEASED (0.1.0)
+## UNRELEASED (0.3.0)
+
+## 0.2.0
+
+* Prevent memory leaks
+* Update the gem's certificate
+
+## 0.1.0
+
+* Initial release

data/blake2.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name     = "blake2"
-  spec.version  = "0.1.0"
+  spec.version  = "0.2.0"
   spec.authors  = ["Franck Verrot"]
   spec.email    = ["franck@verrot.fr"]
   spec.homepage = "https://github.com/franckverrot/blake2"

data/certs/franckverrot.pem

@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
 MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ8wDQYDVQQDDAZmcmFu
 Y2sxFjAUBgoJkiaJk/IsZAEZFgZ2ZXJyb3QxEjAQBgoJkiaJk/IsZAEZFgJmcjAe
-Fw0xNDA5MDcwODE4MDRaFw0xNTA5MDcwODE4MDRaMD0xDzANBgNVBAMMBmZyYW5j
+Fw0xNjA1MTMxOTQ3NTlaFw0xNzA1MTMxOTQ3NTlaMD0xDzANBgNVBAMMBmZyYW5j
 azEWMBQGCgmSJomT8ixkARkWBnZlcnJvdDESMBAGCgmSJomT8ixkARkWAmZyMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw8Sqy/b4OzhODXkAqv/Ve7hp
-oH5irjrS20ebbzWqefcHCybwqcmePUs4BtWnGMkGl+fe4Dxfh55m7EXbmbcLBqPJ
-3Q5bqIgXqmkzHU6oBpkY/fdcP0dLyYBTAo8jZsx6XE1NoC5MBFfHQ8GFzEox7ca7
-eoRPETTFkrlOU8fQQvRMZV8cO9XbzX8PFsJ9iE7CSrZ3+78oFBrj+WslkdU/pR5g
-CYU7eNmWPBbJsgWy9T63K4QkwMElJRvlge3dzAZBEktaxdbiPTQeBtLugIZV2nWA
-mNVMXQ9FzDeSFEhm3ICMuSjJdyEsl9/Su6WFFDaRW4ntRzThdh0+Zs5YEz3+swID
-AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUjJzR97Cw
-I8juLYc/MgodFZPIVYkwGwYDVR0RBBQwEoEQZnJhbmNrQHZlcnJvdC5mcjAbBgNV
-HRIEFDASgRBmcmFuY2tAdmVycm90LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAkNGfg
-9ysYJi/jrQ25GWgN3uJuvlscFYGPVmuyyOfsgm2NAkAV5Kn/rbeYxRecIRBU7HcZ
-yVrHFaF36omjo5QIvNDNszHj4b/bwcW30QG0nNqzQlMTvAcsI9kwrDgoAd7qnSmb
-Udf49ZrzniqaFR7OiBia2oXrYynD8Q4mRMzLTMdtdf8oy69DjCrrpzQvEcfHnxML
-MY7zkhoLIwqbZ+/yfSm26+3h91WoEKEdK+caiHotdq1goqlBDIsLSR65siB2yna3
-UeH0jxnbT6lYw622u74Z7Dd6iQfaOy1h+iJxnCQglf70rs9bS665Nr0QvvrbW8Hz
-Vr/YT3S8RkdBsIdM
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA12mvBkBdLx5lIPvd0hJ6Ccer
+t5fnF94UNRqE0zTxow9aAAtBb/G4fE/OkOBe69gq/5SSZRgF5m/qQ+//rZHSOUfR
+f+a1Qqbho0CfFpAurAtDZQS45L5txhz1pRUnz/8bF6nkeKUF0pdLbNNVS9axE3uc
+qBrfjUAP3yYe3K0TANgZym0TYJ3OhSeUV5Y8tuncuILHZI1hShYekjbPk3KLBJG5
+16x3sHS209Y5LbRbzs85+HNBcNaN/Yi42IFl+mgdfyQLmbgSTpMtASPCXfsnAxsl
+6QIiN9pQq9GSvCXA5wH+ZqYtFd6fJqDHVCDAlQ6lYBiCCpC/JV+lZj16c4yDnwID
+AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU7Ygnr1Sx
+42iryVPwtuJC/acw2TAwGwYDVR0RBBQwEoEQZnJhbmNrQHZlcnJvdC5mcjAbBgNV
+HRIEFDASgRBmcmFuY2tAdmVycm90LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBdZVhZ
+dhXujOsiysxAqtixFFXH9wSQNIltYQ8zuRLA/FgwqrNUQq+Qdiib5Kqj5hUK4okl
+rTx4uCkHJszIocIZiKE/Ntk6xooQVTC/L95K/yycDCyss2c8JF2wdg/+q38u7rOS
+fAbV2IGNLTPYWX+M2B08a6lVVRMD386TGrk0/ROjgZIhuHah4dY+ObAUyUv1oiyb
+PEaDVSbqqbtwQAsY87Vam7GUcH/IJnhdLadvNOJlLr8jxW+gm1ZFE9MOlsSmHeGe
+Z7BoH/Mfxw3P4yyir173p9JWvVqLiQE13XBeD13NPA8neoWpLJxm6k03PcTElT/E
+QrOSgKrHAb/fFJma
 -----END CERTIFICATE-----

data/ext/blake2_ext/rbext.c

@@ -4,89 +4,101 @@
 
 typedef struct {
   uint8_t key_length;
-  uint8_t *key;
+  uint8_t *key_bytes;
 
   uint8_t output_length;
   uint8_t *output;
+
+  VALUE to_hex;
+  VALUE to_bytes;
 } Blake2;
 
-void _hexdump(char * data, int len)
-{
-  int i;
-  for (i = 0; i < len; i++) {
-    printf("%02X", (unsigned char)data[i]);
-  }
-  printf("\n");
-}
+VALUE cBlake2;
 
 static void blake2_free(Blake2 *blake2) {
-  rb_gc_mark(blake2->key);
+  if(blake2->key_length > 0) {
+    ruby_xfree(blake2->key_bytes);
+  }
+
+  if(blake2->output_length > 0) {
+    ruby_xfree(blake2->output);
+  }
 }
 
-static VALUE blake2_alloc(VALUE klass) {
-    return Data_Wrap_Struct(klass, NULL, blake2_free, ruby_xmalloc(sizeof(Blake2)));
+VALUE blake2_alloc(VALUE klass) {
+  VALUE blake2_obj = ruby_xmalloc(sizeof(Blake2));
+
+  return Data_Wrap_Struct(klass, NULL, blake2_free, blake2_obj);
 }
 
 VALUE m_blake2_initialize(VALUE self, VALUE _len, VALUE _key) {
-      Blake2 *blake2;
-      Data_Get_Struct(self, Blake2, blake2);
+  Blake2 *blake2;
+  Data_Get_Struct(self, Blake2, blake2);
+  int i;
+
+  ID bytes_method  = rb_intern("bytes");
+  blake2->to_hex   = ID2SYM(rb_intern("to_hex"));
+  blake2->to_bytes = ID2SYM(rb_intern("to_bytes"));
 
-      blake2->key           = _key;
-      blake2->output_length = NUM2INT(_len);
-      blake2->output        = (uint8_t*)ruby_xmalloc(blake2->output_length * sizeof(uint8_t));
+  VALUE key_bytes_ary = rb_funcall(_key, bytes_method, 0);
+  blake2->key_length  = RARRAY_LEN(key_bytes_ary);
+  blake2->key_bytes   = (uint8_t*)ruby_xmalloc(blake2->key_length * sizeof(uint8_t));
 
-      return Qnil;
+  for(i = 0; i < blake2->key_length; i++) {
+    VALUE byte           = rb_ary_entry(key_bytes_ary, i);
+    blake2->key_bytes[i] = NUM2INT(byte);
+  }
+
+  blake2->output_length = NUM2INT(_len);
+  blake2->output        = (uint8_t*)ruby_xmalloc(blake2->output_length * sizeof(uint8_t));
+
+  return Qnil;
 }
 
+
 VALUE m_blake2_digest(VALUE self, VALUE _input, VALUE _representation) {
   Blake2 *blake2;
 
-  VALUE to_hex   = ID2SYM(rb_intern("to_hex"));
-  VALUE to_bytes = ID2SYM(rb_intern("to_bytes"));
-
-  char * input = RSTRING_PTR(_input);
+  char * input     = RSTRING_PTR(_input);
   int input_length = RSTRING_LEN(_input);
   int i;
 
   Data_Get_Struct(self, Blake2, blake2);
 
-  ID bytes_method = rb_intern("bytes");
-  VALUE bytes_ary = rb_funcall(blake2->key, bytes_method, 0);
-  int key_len = RARRAY_LEN(bytes_ary);
-
-  uint8_t * key_bytes = (uint8_t*)ruby_xmalloc(key_len * sizeof(uint8_t));
-
-  for(i = 0; i < key_len; i++) {
-    VALUE byte = rb_ary_entry(bytes_ary, i);
-    key_bytes[i] = NUM2INT(byte);
-  }
+  blake2s(blake2->output, input, blake2->key_bytes,
+      blake2->output_length, input_length, blake2->key_length);
 
-  blake2s(blake2->output, input, key_bytes,
-      blake2->output_length, input_length, key_len);
+  VALUE result;
 
-  if(_representation == to_bytes) {
-    VALUE result = rb_ary_new2(blake2->output_length);
+  if(_representation == blake2->to_bytes) {
+    result = rb_ary_new2(blake2->output_length);
 
     for(i = 0; i < blake2->output_length; i++) {
       rb_ary_push(result, INT2NUM(blake2->output[i]));
     }
 
     return result;
-  } else if(_representation == to_hex) {
+  } else if(_representation == blake2->to_hex) {
     char * c_str = (char*)ruby_xmalloc(blake2->output_length * sizeof(char) * 2);
 
     for(i = 0; i < blake2->output_length; i++) {
       sprintf(c_str + (i * 2), "%02x", blake2->output[i]);
     }
-    return rb_str_new2(c_str);
+
+    result = rb_str_new2(c_str);
+
+    ruby_xfree(c_str);
+
+    return result;
   } else {
     rb_raise(rb_eArgError, "Unknown representation", _representation);
   }
 }
+
 void Init_blake2_ext() {
-  VALUE blake2 = rb_define_class("Blake2", rb_cObject);
-  rb_define_alloc_func(blake2, blake2_alloc);
+  cBlake2 = rb_define_class("Blake2", rb_cObject);
+  rb_define_alloc_func(cBlake2, blake2_alloc);
 
-  rb_define_private_method(blake2 , "initialize", RUBY_METHOD_FUNC(m_blake2_initialize), 2);
-  rb_define_method(blake2 , "digest", RUBY_METHOD_FUNC(m_blake2_digest), 2);
+  rb_define_private_method(cBlake2, "initialize", RUBY_METHOD_FUNC(m_blake2_initialize), 2);
+  rb_define_method(cBlake2, "digest", RUBY_METHOD_FUNC(m_blake2_digest), 2);
 }

data/lib/blake2/key.rb

@@ -9,15 +9,15 @@ class Blake2
     end
 
     def self.from_string(str)
-      new(@bytes = str.bytes)
+      new(str.bytes)
     end
 
     def self.from_hex(hex_str)
-      new(@bytes = [hex_str].pack("H*").bytes)
+      new([hex_str].pack("H*").bytes)
     end
 
     def self.none
-      new(@bytes = [])
+      new([])
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blake2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Franck Verrot
@@ -12,25 +12,25 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ8wDQYDVQQDDAZmcmFu
   Y2sxFjAUBgoJkiaJk/IsZAEZFgZ2ZXJyb3QxEjAQBgoJkiaJk/IsZAEZFgJmcjAe
-  Fw0xNDA5MDcwODE4MDRaFw0xNTA5MDcwODE4MDRaMD0xDzANBgNVBAMMBmZyYW5j
+  Fw0xNjA1MTMxOTQ3NTlaFw0xNzA1MTMxOTQ3NTlaMD0xDzANBgNVBAMMBmZyYW5j
   azEWMBQGCgmSJomT8ixkARkWBnZlcnJvdDESMBAGCgmSJomT8ixkARkWAmZyMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw8Sqy/b4OzhODXkAqv/Ve7hp
-  oH5irjrS20ebbzWqefcHCybwqcmePUs4BtWnGMkGl+fe4Dxfh55m7EXbmbcLBqPJ
-  3Q5bqIgXqmkzHU6oBpkY/fdcP0dLyYBTAo8jZsx6XE1NoC5MBFfHQ8GFzEox7ca7
-  eoRPETTFkrlOU8fQQvRMZV8cO9XbzX8PFsJ9iE7CSrZ3+78oFBrj+WslkdU/pR5g
-  CYU7eNmWPBbJsgWy9T63K4QkwMElJRvlge3dzAZBEktaxdbiPTQeBtLugIZV2nWA
-  mNVMXQ9FzDeSFEhm3ICMuSjJdyEsl9/Su6WFFDaRW4ntRzThdh0+Zs5YEz3+swID
-  AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUjJzR97Cw
-  I8juLYc/MgodFZPIVYkwGwYDVR0RBBQwEoEQZnJhbmNrQHZlcnJvdC5mcjAbBgNV
-  HRIEFDASgRBmcmFuY2tAdmVycm90LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAkNGfg
-  9ysYJi/jrQ25GWgN3uJuvlscFYGPVmuyyOfsgm2NAkAV5Kn/rbeYxRecIRBU7HcZ
-  yVrHFaF36omjo5QIvNDNszHj4b/bwcW30QG0nNqzQlMTvAcsI9kwrDgoAd7qnSmb
-  Udf49ZrzniqaFR7OiBia2oXrYynD8Q4mRMzLTMdtdf8oy69DjCrrpzQvEcfHnxML
-  MY7zkhoLIwqbZ+/yfSm26+3h91WoEKEdK+caiHotdq1goqlBDIsLSR65siB2yna3
-  UeH0jxnbT6lYw622u74Z7Dd6iQfaOy1h+iJxnCQglf70rs9bS665Nr0QvvrbW8Hz
-  Vr/YT3S8RkdBsIdM
+  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA12mvBkBdLx5lIPvd0hJ6Ccer
+  t5fnF94UNRqE0zTxow9aAAtBb/G4fE/OkOBe69gq/5SSZRgF5m/qQ+//rZHSOUfR
+  f+a1Qqbho0CfFpAurAtDZQS45L5txhz1pRUnz/8bF6nkeKUF0pdLbNNVS9axE3uc
+  qBrfjUAP3yYe3K0TANgZym0TYJ3OhSeUV5Y8tuncuILHZI1hShYekjbPk3KLBJG5
+  16x3sHS209Y5LbRbzs85+HNBcNaN/Yi42IFl+mgdfyQLmbgSTpMtASPCXfsnAxsl
+  6QIiN9pQq9GSvCXA5wH+ZqYtFd6fJqDHVCDAlQ6lYBiCCpC/JV+lZj16c4yDnwID
+  AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU7Ygnr1Sx
+  42iryVPwtuJC/acw2TAwGwYDVR0RBBQwEoEQZnJhbmNrQHZlcnJvdC5mcjAbBgNV
+  HRIEFDASgRBmcmFuY2tAdmVycm90LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBdZVhZ
+  dhXujOsiysxAqtixFFXH9wSQNIltYQ8zuRLA/FgwqrNUQq+Qdiib5Kqj5hUK4okl
+  rTx4uCkHJszIocIZiKE/Ntk6xooQVTC/L95K/yycDCyss2c8JF2wdg/+q38u7rOS
+  fAbV2IGNLTPYWX+M2B08a6lVVRMD386TGrk0/ROjgZIhuHah4dY+ObAUyUv1oiyb
+  PEaDVSbqqbtwQAsY87Vam7GUcH/IJnhdLadvNOJlLr8jxW+gm1ZFE9MOlsSmHeGe
+  Z7BoH/Mfxw3P4yyir173p9JWvVqLiQE13XBeD13NPA8neoWpLJxm6k03PcTElT/E
+  QrOSgKrHAb/fFJma
   -----END CERTIFICATE-----
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: BLAKE2 - fast secure hashing - for Ruby
@@ -144,4 +144,3 @@ test_files:
 - test/blake2/key_test.rb
 - test/blake2_test.rb
 - test/test_helper.rb
-has_rdoc: