ece 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e1fb33decb622db3f5afe9babc71844cf80052b
-  data.tar.gz: a48163908a122bff9c578d7515e11adcac2b360b
+  metadata.gz: c93241d913169ee1b99d4981b7984c677c4f43ed
+  data.tar.gz: d7b99ebadb19980c081b870c0dde6e83f7cc7259
 SHA512:
-  metadata.gz: 604a8af64ea4237efb9b55387d5042bbe25313efd1eec799da24f7cd6791fac6b4b6c058581cb7ba2beb885d148dc44ffac48a822dd868ce7941e315e63adb1a
-  data.tar.gz: 31a175ab89e98b8843e9e1c5d8062b4c0453862df991c65b6886f83c13d4d9fb7a1a84972905045568dbb6fb63289269e91d1b67abbabff43038d7e0709037fc
+  metadata.gz: cd8783c304738147ac82eb572de3f773cd5097303c4e03ff06cbc701b2368b7160722bc42fb1cb3f5ba0147ac07dabf9f4a01408230dfc14568ab9ea166b2034
+  data.tar.gz: d538fb755d02ac2965e2c8134694453b559d38bef5f4cd8961b2f78cc25a69bb5c5a93dfad01cd812d959de87fd0fde93871f8da3f846c73ec57b263a726ae42

data/lib/ece/ece.rb

@@ -9,6 +9,7 @@ class ECE
   KEY_LENGTH=16
   TAG_LENGTH=16
   NONCE_LENGTH=12
+  SHA256_LENGTH=32
 
   def self.hmac_hash(key, input)
     digest = OpenSSL::Digest.new('sha256')
@@ -18,12 +19,30 @@ class ECE
   def self.hkdf_extract(salt, ikm) #ikm stays for input keying material
     hmac_hash(salt,ikm)
   end
+  
+  def self.get_info(type, client_public, server_public)
+    cl_len_no = [client_public.size].pack('n')
+    sv_len_no = [server_public.size].pack('n')
+    "Content-Encoding: #{type}\x00P-256\x00#{cl_len_no}#{client_public}#{sv_len_no}#{server_public}"
+  end
 
   def self.extract_key(params)
     raise "Salt must be 16-bytes long" unless params[:salt].length==16
-    key =  HKDF.new(params[:key], salt: params[:salt], algorithm: 'sha256', info: "Content-Encoding: aesgcm128")
-    nonce =  HKDF.new(params[:key], salt: params[:salt], algorithm: 'sha256', info: "Content-Encoding: nonce")
-    {key: key.next_bytes(KEY_LENGTH), nonce: nonce.next_bytes(NONCE_LENGTH)}
+
+    input_key = params[:key]
+    auth = false
+    if params.has_key?(:auth) # Encrypted Content Encoding, March 11 2016, http://httpwg.org/http-extensions/draft-ietf-httpbis-encryption-encoding.html
+      auth = true
+      input = HKDF.new(input_key, {salt: params[:auth] , algorithm: 'sha256', info: "Content-Encoding: auth\x00"})
+      input_key = input.next_bytes(SHA256_LENGTH)
+      secret =  HKDF.new(input_key, {salt: params[:salt], algorithm: 'sha256', info: get_info("aesgcm", params[:user_public_key], params[:server_public_key])})
+      nonce =  HKDF.new(input_key, salt: params[:salt], algorithm: 'sha256', info: get_info("nonce", params[:user_public_key], params[:server_public_key]))
+    else
+      secret =  HKDF.new(input_key, {salt: params[:salt], algorithm: 'sha256', info: "Content-Encoding: aesgcm128"})
+      nonce =  HKDF.new(input_key, salt: params[:salt], algorithm: 'sha256', info: "Content-Encoding: nonce")
+    end
+
+    {key: secret.next_bytes(KEY_LENGTH), nonce: nonce.next_bytes(NONCE_LENGTH), auth: auth}
   end
 
   def self.generate_nonce(nonce, counter)
@@ -39,12 +58,13 @@ class ECE
   def self.encrypt(data, params)
     key = extract_key(params)
     rs = params[:rs] ? params [:rs] : 4096
+    padsize = params[:padsize] ? params [:padsize] : 0
     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|
-      block = encrypt_record(key, counter, data[i..i+rs-1])
+      block = encrypt_record(key, counter, data[i..i+rs-1], padsize)
       result += block
       counter +=1
     end
@@ -75,11 +95,20 @@ class ECE
     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]
+    
+    if params[:auth]
+      padding_length = decrypted[0..1].unpack("n")[0]
+      raise "Padding is too big" if padding_length+2 > decrypted.length
+      padding = decrypted[2..padding_length]
+      raise "Wrong padding"  unless padding = "\x00"*padding_length
+      return decrypted[2+padding_length..-1]
+    else
+      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
+      return decrypted[1..-1]
+    end    
   end
 
   def self.encrypt_record(params, counter, buffer, pad=0)
@@ -88,7 +117,15 @@ class ECE
     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
+    padding = ""
+    if params[:auth]
+      padding = [pad].pack('n') + "\x00"*pad # 2 bytes, big endian, then n zero bytes of padding
+      buf = padding+buffer
+      record = gcm.update(buf)
+    else
+      record = gcm.update("\x00"+buffer) # 1 padding byte, not fully implemented
+    end
+    enc = record + gcm.final + gcm.auth_tag 
     enc
   end
 

data/lib/ece/version.rb

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

metadata

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