ece 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 224dae0f5809056afa010473e4fdd7cd0ac33d9c
-  data.tar.gz: e038af72e2b067e76e57433cdaed07ae4c2a0a5c
+  metadata.gz: 7e1fb33decb622db3f5afe9babc71844cf80052b
+  data.tar.gz: a48163908a122bff9c578d7515e11adcac2b360b
 SHA512:
-  metadata.gz: 339b6561b5715d3430d7e3abaf696886042f5c798a47000bccf0a77c06b53d47daa65d583cf7f5fd0fea2b2ae6e2ade2862b9b834b39802a5b79152a108a9f84
-  data.tar.gz: fd3f463c8426080f8336b5eebcddf05bcb3128efe9019b82ceb6694de6f4d3a3830e85c818b4feddc23897c8adc81a7fc0589c93d478d80fe1c13b9cc6bd01d6
+  metadata.gz: 604a8af64ea4237efb9b55387d5042bbe25313efd1eec799da24f7cd6791fac6b4b6c058581cb7ba2beb885d148dc44ffac48a822dd868ce7941e315e63adb1a
+  data.tar.gz: 31a175ab89e98b8843e9e1c5d8062b4c0453862df991c65b6886f83c13d4d9fb7a1a84972905045568dbb6fb63289269e91d1b67abbabff43038d7e0709037fc

data/lib/ece/ece.rb

@@ -15,7 +15,7 @@ class ECE
     OpenSSL::HMAC.digest(digest, key, input)
   end
 
-  def self.hkdf_extract(salt, ikm)
+  def self.hkdf_extract(salt, ikm) #ikm stays for input keying material
     hmac_hash(salt,ikm)
   end
 
@@ -31,23 +31,16 @@ class ECE
     output = nonce.dup
     integer = nonce[-6..-1].unpack('B*')[0].to_i(2) #taking last 6 bytes, treating as integer
     x = ((integer ^ counter) & 0xffffff) + ((((integer / 0x1000000) ^ (counter / 0x1000000)) & 0xffffff) * 0x1000000)
-    output[-6..-1] = [x.to_s(16)].pack('H*')
-    output
-  end
-
-  def self.encrypt_record(params, counter, buffer, pad=0)
-    raise "Key must be #{KEY_LENGTH} bytes long" unless params[:key].length == KEY_LENGTH
-    gcm = OpenSSL::Cipher.new('aes-128-gcm')
-    gcm.encrypt
-    gcm.key = params[:key]
-    gcm.iv = generate_nonce(params[:nonce], counter)
-    enc = gcm.update("\x00"+buffer) + gcm.final + gcm.auth_tag  #enc = gcm.update("\x00"*pad+buffer)+gcm.final + gcm.auth_tag padding is not fully implemented for now
-    enc
+    bytestring = x.to_s(16).length < 12 ? "0"*(12-x.to_s(16).length)+x.to_s(16) : x.to_s(16) #it's for correct handling of cases when generated integer is less than 6 bytes
+    output[-6..-1] = [bytestring].pack('H*')                                                 #without it packing would produce less than 6 bytes
+    output                                                                                   #I didn't find pack directive for such usage, so there is a such solution
   end
 
   def self.encrypt(data, params)
     key = extract_key(params)
-    rs = 4095 #should be variable, but for now it's constant
+    rs = params[:rs] ? params [:rs] : 4096
+    raise "The rs parameter must be greater than 1." if rs <= 1
+    rs -=1 #this ensures encrypted data cannot be truncated
     result = ""
     counter = 0
     (0..data.length).step(rs) do |i|
@@ -58,23 +51,12 @@ class ECE
     result
   end
 
-  def self.decrypt_record(params, counter, buffer, pad=0)
-    raise "Key must be #{KEY_LENGTH} bytes long" unless params[:key].length == KEY_LENGTH
-    gcm = OpenSSL::Cipher.new('aes-128-gcm')
-    gcm.decrypt
-    gcm.key = params[:key]
-    gcm.iv = generate_nonce(params[:nonce], counter)
-    gcm.auth_tag = buffer[-TAG_LENGTH..-1]
-    decrypted = gcm.update(buffer[0..-TAG_LENGTH-1]) + gcm.final
-    #padding = decrypted[0]  -- this would be used once variable record-size is implemented
-    #padding_length = decrypted[0].unpack("C")
-    #raise Err unless padding = "\x00"*padding_length
-    decrypted[1..-1]
-  end
-
   def self.decrypt(data, params)
     key = extract_key(params)
-    rs = 4096+16 #not changeable for now
+    rs = params[:rs] ? params [:rs] : 4096
+    raise "The rs parameter must be greater than 1." if rs <= 1
+    rs += 16
+    raise "Message is truncated" if data.length % rs == 0
     result = ""
     counter = 0
     (0..data.length).step(rs) do |i|
@@ -85,4 +67,30 @@ class ECE
     result
   end
 
+  def self.decrypt_record(params, counter, buffer, pad=0)
+    gcm = OpenSSL::Cipher.new('aes-128-gcm')
+    gcm.decrypt
+    gcm.key = params[:key]
+    gcm.iv = generate_nonce(params[:nonce], counter)
+    raise "Block is too small" if buffer.length <= TAG_LENGTH+1
+    gcm.auth_tag = buffer[-TAG_LENGTH..-1]
+    decrypted = gcm.update(buffer[0..-TAG_LENGTH-1]) + gcm.final
+    padding_length = decrypted[0].unpack("C")[0]
+    raise "Padding is too big" if padding_length+1 > decrypted.length
+    padding = decrypted[1..padding_length]
+    raise "Wrong padding"  unless padding = "\x00"*padding_length
+    decrypted[1..-1]
+  end
+
+  def self.encrypt_record(params, counter, buffer, pad=0)
+    gcm = OpenSSL::Cipher.new('aes-128-gcm')
+    gcm.encrypt
+    gcm.key = params[:key]
+    gcm.iv = generate_nonce(params[:nonce], counter)
+    gcm.auth_data = "" 
+    enc = gcm.update("\x00"+buffer) + gcm.final + gcm.auth_tag  #enc = gcm.update("\x00"*pad+buffer)+gcm.final + gcm.auth_tag padding is not fully implemented for now
+    enc
+  end
+
+
 end

data/lib/ece/version.rb

@@ -1,3 +1,3 @@
 class ECE
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ece
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Alexander Shevtsov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2015-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler