ece 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c93241d913169ee1b99d4981b7984c677c4f43ed
-  data.tar.gz: d7b99ebadb19980c081b870c0dde6e83f7cc7259
+  metadata.gz: 2e947d1704ffb9c3b8df64b1e1086b0cb6ccc582
+  data.tar.gz: a3106fb907ef7f8be5e16b9bbbd48230e8065dfd
 SHA512:
-  metadata.gz: cd8783c304738147ac82eb572de3f773cd5097303c4e03ff06cbc701b2368b7160722bc42fb1cb3f5ba0147ac07dabf9f4a01408230dfc14568ab9ea166b2034
-  data.tar.gz: d538fb755d02ac2965e2c8134694453b559d38bef5f4cd8961b2f78cc25a69bb5c5a93dfad01cd812d959de87fd0fde93871f8da3f846c73ec57b263a726ae42
+  metadata.gz: e715f1010c9d164946d1764c413fbf220387bbf579a32cfac29590a797ace9a8455b5d8d7ca820ae54c45399f7431cb4eb0c5060356be0c2603e49db8b7d7dba
+  data.tar.gz: 3b1e07649a250825e1cb0b078006519fc19023306784566c4b889fe368906b86446167271f797885d9ec7e268798fbf5e7e41f2bf4bd106d1544def73d247dac

data/lib/ece/ece.rb

@@ -62,9 +62,14 @@ class ECE
     raise "The rs parameter must be greater than 1." if rs <= 1
     rs -=1 #this ensures encrypted data cannot be truncated
     result = ""
+    pad_bytes = 1
+    if params[:auth] # old spec used 1 byte for padding, latest one always uses 2 bytes
+      pad_bytes = 2
+    end
+
     counter = 0
-    (0..data.length).step(rs) do |i|
-      block = encrypt_record(key, counter, data[i..i+rs-1], padsize)
+    (0..data.length).step(rs-pad_bytes+1) do |i|
+      block = encrypt_record(key, counter, data[i..i+rs-pad_bytes], padsize)
       result += block
       counter +=1
     end
@@ -75,7 +80,7 @@ class ECE
     key = extract_key(params)
     rs = params[:rs] ? params [:rs] : 4096
     raise "The rs parameter must be greater than 1." if rs <= 1
-    rs += 16
+    rs += TAG_LENGTH
     raise "Message is truncated" if data.length % rs == 0
     result = ""
     counter = 0
@@ -92,7 +97,11 @@ class ECE
     gcm.decrypt
     gcm.key = params[:key]
     gcm.iv = generate_nonce(params[:nonce], counter)
-    raise "Block is too small" if buffer.length <= TAG_LENGTH+1
+    pad_bytes = 1
+    if params[:auth] # old spec used 1 byte for padding, latest one always uses 2 bytes
+      pad_bytes = 2
+    end
+    raise "Block is too small" if buffer.length <= TAG_LENGTH+pad_bytes
     gcm.auth_tag = buffer[-TAG_LENGTH..-1]
     decrypted = gcm.update(buffer[0..-TAG_LENGTH-1]) + gcm.final
     

data/lib/ece/version.rb

@@ -1,3 +1,3 @@
 class ECE
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ece
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Alexander Shevtsov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler