megar 0.0.3 → 0.0.4

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.0.4 reduce OpenSSL requirements               17-Mar-2013
+===========================================================
+* switch to a native AES CTR implementation so there are no
+  longer any special OpenSSL requirements
+
 0.0.3 put and get ready                          9-Mar-2013
 ===========================================================
 * basic file upload support added

data/README.rdoc

@@ -2,16 +2,23 @@
 
 Megar ("megaargh!" in pirate-speak) is a Ruby wrapper and command-line (CLI) client for the {Mega API}[https://mega.co.nz/#developers].
 
-So far this is "experimental". Megar has coverage of the basic file/folder operations: connect, get file/folder listings and details, and
-download files. There's more in the API that would be worth supporting .. a job for tomorrow!
+Megar has coverage of the basic file/folder operations: connect, get file/folder listings and details,
+upload and download files. Read on - the following sections provide cookbook examples for using Megar within Ruby
+and from the command-line.
+
+Your help is greatly appreciated on two fronts:
+* Use: It needs hammering to make sure we don't have the edge-case crypto bugs.
+* Code: there's more interesting stuff in the API it would be nice to support. And a lot it would be nice to refactor (the priority so far has been to make it work correctly and testably, not fast or elegantly). Tuck in!
+
+NOTE: megar no longer requires OpenSSL 1.0.1+. It is quite happy with any version that implements AES-128-CBC
+(commonly OpenSSL 0.9.8 or greater, which you most likely already have installed).
 
 
 == Requirements and Known Limitations
 
 Consider this totally alpha at this point, especially since the Mega API has yet to be formally and fully documented.
 
-* Currently tested with MRI 1.9.3
-* Requires OpenSSL 1.0.1+ (and properly linked with ruby)
+* Currently tested with MRI 1.9.3 with OpenSSL 0.9.8+
 * MRI 1.9.2 and 2.x, Rubinius and JRuby 1.9 modes not yet tested. No plans to support 1.8 Ruby modes.
 
 Mega API coverage is far from complete at this point (help appreciated!). Here's the run-down:
@@ -316,12 +323,9 @@ commit and distribute credentials. Change the password on the account first.
 The tests will still run as intended with the snapshot of crypto details stored in the expectations file.
 
 
-=== Getting my OpenSSL installation up to snuff (MacOSX)
+=== Checking my OpenSSL installation
 
-These notes are specific to MacOSX. Mileage on other operating systems may vary, but this should give you
-a guide:
-
-Check the openssl version installed
+Megar will fail with a warning if suitable OpenSSL support is not available. To manually check the OpenSSL version installed:
 
   $ irb -r openssl
   1.9.3p327 :001 > OpenSSL::VERSION
@@ -329,16 +333,18 @@ Check the openssl version installed
   1.9.3p327 :002 > OpenSSL::OPENSSL_VERSION
    => "OpenSSL 0.9.8r 8 Feb 2011"
 
-OK, that's too old. The OS-installed version is probably not going to change any time soon, and we don't
-want to replace it (too many unintended consequences) but we need a later version to use with ruby.
+OK, that's fine. Note that earlier versions of megar required 1.0.1+ but that is no longer the case.
+
+If you do need or want to install or update OpenSSL, you can install from source or rvm.
+On MacOSX, it is probably not a good idea to upgrade the OS-installed version (too many unintended consequences),
+but you can also use brew or macports to install a version in parallel.
 
-You can install form source, use brew or macports, or use rvm.
 
 ==== Installing OpenSSL Using RVM:
 
 See the {rvm openssl}[https://rvm.io//packages/openssl/] page for details..
 
-  $  rvm pkg install openssl
+  $ rvm pkg install openssl
   Fetching openssl-1.0.1c.tar.gz to ...
 
   $ rvm reinstall 1.9.3 --with-openssl-dir=$rvm_path/usr
@@ -357,6 +363,9 @@ Sweet.
 * {Mega API is documentation}[https://mega.co.nz/#developers]
 * {Using the Mega API, with Python examples}[http://julien-marchand.fr/blog/using-mega-api-with-python-examples/]
 * {SpiderOak's Analysis and Recommendations for the Crypto in Kim Dotcom's Mega}[https://spideroak.com/blog/20130123130638-spideroaks-analysis-and-recommendations-for-the-crypto-in-kim-dotcoms-mega-part-one]
+* {mega.py - a Python library for Mega}[https://github.com/richardasaurus/mega.py]
+* {My blog post about Megar}[http://tardate.blogspot.sg/2013/03/rolling-mega-api-with-ruby.html]
+* {rmega - another Ruby implementation}[https://github.com/daniele-m/rmega] - it seems rmega came to life on a similar timeline to megar. Some different implementation decisions have been made under the covers, so I don't think we'll see these projects merge anytime soon. But that means you have more choice;-) My thanks to the rmega folks for inspiring the switch in megar from OpenSSL 1.0.1+ AES CTR implementation to a native version that works with OpenSSL 0.9.8.
 
 
 == Contributing

data/lib/megar/adapters/file_downloader.rb

@@ -5,7 +5,7 @@ require 'open-uri'
 # Javascript reference implementation: function startdownload2(res,ctx)
 #
 class Megar::FileDownloader
-  include Megar::CryptoSupport
+  include Megar::Crypto::Support
 
   attr_reader :session
   attr_reader :file
@@ -31,7 +31,7 @@ class Megar::FileDownloader
     decoded_content = ''
     calculated_mac = [0, 0, 0, 0]
 
-    decryptor = get_file_decrypter(decomposed_key,iv)
+    decryptor = get_file_cipher(decomposed_key,iv)
 
     get_chunks(download_size).each do |chunk_start, chunk_size|
       chunk = stream.readpartial(chunk_size)

data/lib/megar/adapters/file_uploader.rb

@@ -10,7 +10,7 @@ require 'pathname'
 # Javascript reference implementation: function initupload3()
 #
 class Megar::FileUploader
-  include Megar::CryptoSupport
+  include Megar::Crypto::Support
 
   attr_reader :folder
   attr_reader :session
@@ -62,7 +62,7 @@ class Megar::FileUploader
     calculated_mac = [0, 0, 0, 0]
     completion_file_handle = ''
 
-    encryptor = get_file_encrypter(upload_key,iv_str)
+    encryptor = get_file_cipher(upload_key,iv)
 
     get_chunks(upload_size).each do |chunk_start, chunk_size|
       chunk = stream.readpartial(chunk_size)
@@ -121,11 +121,8 @@ class Megar::FileUploader
   end
 
   def iv
-    ((upload_key[4]<<32)+upload_key[5])<<64
-  end
-
-  def iv_str
-    hexstr_to_bstr( iv.to_s(16) )
+    # ((upload_key[4]<<32)+upload_key[5])<<64
+    [upload_key[4], upload_key[5], 0, 0]
   end
 
   # Returns and caches a file upload response

data/lib/megar/connection.rb

@@ -51,14 +51,11 @@ module Megar::Connection
     params['sid'] = sid if sid
     json_data = [data].to_json
 
-    response_data = get_api_response(params,json_data).first
-
-    raise Megar::MegaRequestError.new(response_data) if response_data.is_a?(Fixnum)
-
-    response_data
+    response_body = get_api_response(params,json_data)
+    parse_json_response(response_body)
   end
 
-  # Command: low-level method to actually perform the API request and return the JSON response.
+  # Command: low-level method to actually perform the API request and return the response body.
   # Given +params+ Hash of query string parameters, and +data+ JSON data structure.
   # Note: there is no handling of network errors or timeouts - any exceptions will bubble up.
   def get_api_response(params,data)
@@ -66,11 +63,25 @@ module Megar::Connection
     http.use_ssl = (api_uri.scheme == 'https')
     uri_path = api_uri.path.empty? ? '/' : api_uri.path
     uri_path << hash_to_query_string(params)
-    response = http.post(uri_path,data)
-    JSON.parse(response.body)
+    http.post(uri_path,data).body
   end
   protected :get_api_response
 
+  # Returns the first response as JSON from response +body+, raising Mega error if present.
+  # Note: expects and currently only handles a single response in the data
+  def parse_json_response(body)
+    begin
+      response_data = JSON.parse(body)
+      response_data = response_data.first if response_data.is_a?(Array)
+    rescue => e
+      raise Megar::MegaRequestError.new(body.to_i) if body =~ /^[-\d]+$/
+      raise Megar::BadApiResponseError.new(e)
+    end
+    raise Megar::MegaRequestError.new(response_data) if response_data.is_a?(Fixnum)
+    response_data
+  end
+  protected :parse_json_response
+
   # Returns Hash +h+ as an encoded query string '?a=b&c=d...'
   def hash_to_query_string(h)
     if qs = URI.escape(h.to_a.map{|e| e.join('=') }.join('&'))

data/lib/megar/crypto.rb

@@ -1 +1,5 @@
-require 'megar/crypto/support'
+module Megar::Crypto
+end
+require 'megar/crypto/support'
+require 'megar/crypto/aes'
+require 'megar/crypto/aes_ctr'

data/lib/megar/crypto/aes.rb

@@ -0,0 +1,60 @@
+# A convenience wrapper for AES CBC implementation provided by OpenSSL
+class Megar::Crypto::Aes
+
+  attr_accessor :key
+  attr_accessor :iv
+
+  def initialize(options={})
+    self.key = options[:key]
+    self.iv = options[:iv]
+  end
+
+  def key=(value)
+    @key = value.is_a?(Array) ? value.pack(packing) : value
+  end
+
+  def iv=(value)
+    @iv = value || "\x0" * 16
+  end
+
+  def packing
+    'l>*'
+  end
+
+  def mode
+    'AES-128-CBC'
+  end
+
+  def cipher
+    @cipher ||= OpenSSL::Cipher::Cipher.new(mode)
+  end
+
+  def encrypt(data)
+    a32_mode = data.is_a?(Array)
+    d = a32_mode ? data.pack(packing) : data
+
+    cipher.reset
+    cipher.encrypt
+    cipher.padding = 0
+    cipher.iv = iv
+    cipher.key = key
+    result = cipher.update d
+
+    a32_mode ? result.unpack(packing) : result
+  end
+
+  def decrypt(data)
+    a32_mode = data.is_a?(Array)
+    d = a32_mode ? data.pack(packing) : data
+
+    cipher.reset
+    cipher.decrypt
+    cipher.padding = 0
+    cipher.iv = iv
+    cipher.key = key
+    result = cipher.update d
+
+    a32_mode ? result.unpack(packing) : result
+  end
+
+end

data/lib/megar/crypto/aes_ctr.rb

@@ -0,0 +1,75 @@
+# Implements AES COUNTER mode using base AES CBC implementation provided by OpenSSL
+class Megar::Crypto::AesCtr
+
+  attr_accessor :key
+  attr_accessor :iv
+
+  # Consturcts a new AES CTR-mode object give +options+
+  # options[:key] = encryption key as binary string or array of 32-bit integer (required)
+  # options[:iv] = initialisation vector as array of 32-bit integer (nulled by default)
+  def initialize(options={})
+    self.key = options[:key]
+    self.iv = options[:iv]
+  end
+
+  def packing
+    'l>*'
+  end
+
+  def key=(value)
+    @key = value.is_a?(Array) ? value.pack(packing) : value
+  end
+
+  def iv=(value)
+    @iv = value ? value.dup : [0,0,0,0]
+  end
+
+  # Returns the encrypted binary string of +chunk+ (provided as binary string).
+  # Repeated calls will continue the counter sequence.
+  def update(chunk)
+    a32 = str_to_a32(chunk)
+    last_i = 0
+
+    (0..a32.size - 3).step(4) do |i|
+      enc = Megar::Crypto::Aes.new(key: key).encrypt(iv)
+      4.times do |m|
+        a32[i+m] = (a32[i+m] || 0) ^ (enc[m] || 0)
+      end
+      iv[3] += 1
+      iv[2] += 1 if iv[3] == 0
+      last_i = i + 4
+    end
+
+    remainder = a32.size % 4
+
+    if remainder > 0
+      v = [0, 0, 0, 0]
+      (last_i..a32.size - 1).step(1) { |m| v[m-last_i] = a32[m] || 0 }
+      enc = Megar::Crypto::Aes.new(key: key).encrypt(iv)
+      4.times { |m| v[m] = v[m] ^ enc[m] }
+
+      (last_i..a32.size - 1).step(1) { |j| a32[j] = v[j - last_i] || 0 }
+    end
+
+    a32_to_str(a32)[0..chunk.size - 1]
+  end
+
+  # TODO: refactor to pull this method from a shared lib.
+  def str_to_a32(b,signed=true)
+    a = Array.new((b.length+3) >> 2,0)
+    b.length.times { |i| a[i>>2] |= (b.getbyte(i) << (24-(i & 3)*8)) }
+    if signed
+      a.pack('l>*').unpack('l>*')
+    else
+      a
+    end
+  end
+
+  # TODO: refactor to pull this method from a shared lib.
+  def a32_to_str(a)
+    b = ''
+    (a.size * 4).times { |i| b << ((a[i>>2] >> (24-(i & 3)*8)) & 255).chr }
+    b
+  end
+
+end

data/lib/megar/crypto/support.rb

@@ -9,11 +9,11 @@ require 'base64'
 #
 # Javascript reference implementations quoted here are taken from the Mega javascript source.
 #
-module Megar::CryptoSupport
+module Megar::Crypto::Support
 
   # Verifies that the required crypto support is available from ruby/openssl
   def crypto_requirements_met?
-    OpenSSL::Cipher.ciphers.include?("AES-128-CTR")
+    OpenSSL::Cipher.ciphers.include?("AES-128-CBC")
   end
 
   # Returns encrypted key given an array +a+ of 32-bit integers
@@ -72,17 +72,14 @@ module Megar::CryptoSupport
     a32_to_str(decrypt_base64_to_a32(data, key))
   end
 
+  # Returns AES-128 CBC encrypted given +key+ and +data+ (String)
+  def aes_cbc_encrypt(data, key)
+    Megar::Crypto::Aes.new(key: key).encrypt(data)
+  end
 
   # Returns AES-128 encrypted given +key+ and +data+ (arrays of 32-bit signed integers)
   def aes_encrypt_a32(data, key)
-    aes = OpenSSL::Cipher::Cipher.new('AES-128-ECB')
-    aes.encrypt
-    aes.padding = 0
-    aes.key = key.pack('l>*')
-    aes.update(data.pack('l>*')).unpack('l>*')
-    # e = aes.update(data.pack('l>*')).unpack('l>*')
-    # e << aes.final
-    # e.unpack('l>*')
+    Megar::Crypto::Aes.new(key: key).encrypt(data)
   end
 
   # Returns AES-128 CBC decrypted given +key+ and +data+ (arrays of 32-bit signed integers)
@@ -92,14 +89,7 @@ module Megar::CryptoSupport
 
   # Returns AES-128 CBC decrypted given +key+ and +data+ (String)
   def aes_cbc_decrypt(data, key)
-    aes = OpenSSL::Cipher::Cipher.new('AES-128-CBC')
-    aes.decrypt
-    aes.padding = 0
-    aes.key = key
-    aes.iv = "\0" * 16
-    d = aes.update(data)
-    d = aes.final if d.empty?
-    d
+    Megar::Crypto::Aes.new(key: key).decrypt(data)
   end
 
   # Returns AES-128 CBC decrypted given +key+ and +data+ (arrays of 32-bit signed integers)
@@ -107,18 +97,6 @@ module Megar::CryptoSupport
     str_to_a32(aes_cbc_encrypt(a32_to_str(data), a32_to_str(key)),signed)
   end
 
-  # Returns AES-128 CBC encrypted given +key+ and +data+ (String)
-  def aes_cbc_encrypt(data, key)
-    aes = OpenSSL::Cipher::Cipher.new('AES-128-CBC')
-    aes.encrypt
-    aes.padding = 0
-    aes.key = key
-    aes.iv = "\0" * 16
-    d = aes.update(data)
-    d = aes.final if d.empty?
-    d
-  end
-
   # Returns an array of 32-bit signed integers representing the string +b+
   #
   # Javascript reference implementation: function str_to_a32(b)
@@ -127,7 +105,6 @@ module Megar::CryptoSupport
     a = Array.new((b.length+3) >> 2,0)
     b.length.times { |i| a[i>>2] |= (b.getbyte(i) << (24-(i & 3)*8)) }
     if signed
-      # hack to force to signed 32-bit ... I don't think we really need to do this, but it makes comparison with
       a.pack('l>*').unpack('l>*')
     else
       a
@@ -152,7 +129,7 @@ module Megar::CryptoSupport
     s32 = str_to_a32(s)
     h32 = [0,0,0,0]
     s32.length.times {|i| h32[i&3] ^= s32[i] }
-    16384.times {|i| h32 = aes_encrypt_a32(h32, aeskey) }
+    0x4000.times {|i| h32 = aes_encrypt_a32(h32, aeskey) }
     a32_to_base64([h32[0],h32[2]])
   end
 
@@ -278,10 +255,8 @@ module Megar::CryptoSupport
     4.times do
       len = ((privk[0].ord * 256 + privk[1].ord + 7) / 8) + 2
       privk_part = privk[0,len]
-      # puts "\nprivk_part #{base64urlencode(privk_part)}"
       privk_part_a32 = mpi_to_a32(privk_part)
       decomposed_key << privk_part_a32
-      # puts "decomp: len:#{len} privk_part_a32:#{privk_part_a32.length} first:#{privk_part_a32.first} last:#{privk_part_a32.last}"
       privk.slice!(0,len)
     end
     decomposed_key
@@ -303,8 +278,6 @@ module Megar::CryptoSupport
     4.times do |i|
       len = ((privk[0].ord * 256 + privk[1].ord + 7) / 8) + 2
       privk_part = privk[0,len]
-      # puts "\nl: ", len
-      # puts "decrypted rsa part hex: \n", privk_part.unpack('H*').first
       decomposed_key << privk_part[2,privk_part.length].unpack('H*').first.to_i(16)
       privk.slice!(0,len)
     end
@@ -482,26 +455,10 @@ module Megar::CryptoSupport
     chunks
   end
 
-  # Returns AES CTR-mode decryption cipher given +key+ and +iv+ as array of int
-  #
-  def get_file_decrypter(key,iv)
-    aes = OpenSSL::Cipher::Cipher.new('AES-128-CTR')
-    aes.decrypt
-    aes.padding = 0
-    aes.key = a32_to_str(key)
-    aes.iv = a32_to_str(iv)
-    aes
-  end
-
-  # Returns AES CTR-mode encryption cipher given +key+ as array of int and +iv+ as binary string
+  # Returns AES CTR-mode decryption cipher given +key+ and +iv+ as array of 32-bit integer
   #
-  def get_file_encrypter(key,iv)
-    aes = OpenSSL::Cipher::Cipher.new('AES-128-CTR')
-    aes.encrypt
-    aes.padding = 0
-    aes.key = a32_to_str(key)
-    aes.iv = iv
-    aes
+  def get_file_cipher(key,iv)
+    Megar::Crypto::AesCtr.new(key: key, iv: iv)
   end
 
   # Returns the +chunk+ mac (array of unsigned int)

data/lib/megar/exception.rb

@@ -15,6 +15,9 @@ module Megar
   # Raised on non-API related file upload errors
   class FileUploadError < Error; end
 
+  # Raised on non-mega API related request errors
+  class BadApiResponseError < Error; end
+
   class MegaRequestError < Error
 
     # Initialise with +error_code+ returned from Mega

data/lib/megar/session.rb

@@ -1,6 +1,6 @@
 class Megar::Session
 
-  include Megar::CryptoSupport
+  include Megar::Crypto::Support
   include Megar::Connection
 
   attr_accessor :options

data/lib/megar/version.rb

@@ -1,3 +1,3 @@
 module Megar
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/fixtures/crypto_expectations/sample_user.json

@@ -1,12 +1,12 @@
 {
   "email": "megartest@gmail.com",
   "email_mixed_case": "Megartest@gmail.com",
-  "password": "NEvfEM5xME7jAnr6YN9JZH8M",
+  "password": "arDGGNCVPQEZKqasmfjQSvOmgOPdLhBX",
   "autoconnect": false,
   "login_response_data": {
-    "csid": "CABObd6kRiw5JF_4Fr7z2R_tleh8g3jlsiGl3fX48C3MFq57ni86x3cVOgtNgv48N5ZX_68g-MROc_5j6TP3g2FTBpOhMRf2E4swTAwBQxa0CF04dj6hfHKHIp5XyE1KPGN57GvecLzTV6FgtanY1v41Pm_1H6PE89XSejovQIGOOKwsmeUOlmfLYreMe58Il1aROqzr6E-eybD8BzozQgy8XMO80Gcc6eoja0VbbxehHPdCYS990tAWBYkG8up-rnQqwpln-UrmtZbXtv4WoNO5n3wI4s5abyQl7PbG_42xw9Uk2QYwvIrRSnt4rDB8m-iAihGS7Zp6QQO5RVpuWvU1",
+    "csid": "CAArCWzdn3ohzX_8-CYamVViQnGwY3j0tAp35lqN02lOCJM3cdQP42UpVWWcB0Q901XaMf2LtQh94QK9Y-llhC9ktJCjVH7Da_kAy9FpQb46si1nVg1cAjRyXUQqQgyo62r-ooluHxE7gq98JCwH3pmfM7998A7YDKKhfaNpL-TghE6yhhbnCLg_qPy2u4HNIBbYbooOFVSUn1jPmPeLhUbnafHMACygftUXlymocYcbTJRfBxU-gVSLlrHJTw7dm96_nGAfoaOqfr_-IR2yU0Td8Y5XMFMDFcBue_5iE2f1EuZ5tJK_zTz2nDyQPciuf7RKvMLcJQimbwEwEJLujr9o",
     "privk": "4Iurk4vQ0BlLEEvEyaRUX8QnYzJFIedm0RVKe2pLh4wTzBBtgmafnszD_dP3Y40P-DSNLEGfWghL-0_BIW4XP8tfGNFkMg7mnYgQYC91ccz58BbhGEDf7-j97dstckf3OSSsT9D9H-cocXzyt1m231w9d7YLX23c3KAGz3vxdnl66F4jsFGO9AdIyb1KTEEt7NHkljtbz3WgWlk6W6wBawuEbJvLPHPx2L16i0iacbbkQi8ZF4pmddswMa9yWOSXwUribGDbdgx_jDGjBoKJUJI-7Aa-aOaRPEoVUTft2R2lNAVErvYwD_GIsIhQiCcJWul-KqPhI3vquvzUHd2rHHvKyTLyvXKyIDeVdBGXTaqFA2ni9xsjUNMOX14ftBZ4_fgDce0jvrZzYRs5IuOMt3K9gKMpBpUWtnlaBYbnYdL2zJuFlrM77PlcYab2uLLqlSe4hh-FxMAc_p_8tDAoU4dPgpgOpU3GRR8i7oszu_MKibzNpRBeAX1UtwKwQepjPnipu9aQlPy9OtgB-5KmGi34EcMKBPg8BN6vHRYg0Za_lk_TtTQ4WbkllAqR3Fla5-RBjzB7f3dWae4ES3VX4f-dI-UYrrKDQkqaS0R_xLaMPNG6_GQMDM7L5Fsa8I3hFjdgfs9rV4Xf_uIFrhUjm25EuT5JCdobNmwBi9VU5nCbk0LQJdrXDNYV3fmD-Y_p_KV8x_-opRnXUV03SCopOD6DhitsFtpv065QXcG1SNDu0mM-kgDh9E-QddtQQtXLLPuKFyX5o1ts08EqXTxHsZo5tIsevbExZoz9hxSRrr-V5swEDcJXoV78_k6sR3iniZ_m77JVo9QU572av2MvNhyu5YeTXyc0m6Me7cPGiO0",
-    "k": "0sdW36PBOcqicUJ7814isw"
+    "k": "8FS4LRVtEpzQXKZNUyGBwg"
   },
   "master_key": [
     384287193,
@@ -14,8 +14,8 @@
     554881366,
     530403344
   ],
-  "expected_uh": "FeGJgLm4ciM",
-  "sid": "gVes6vS8WZ2c-CB7HJRdXHpBOEN6Q2Y5dFp3CQbFwprvxr0nkhb_XTqQrA",
+  "expected_uh": "rMkG_yo0TCw",
+  "sid": "WhJ1kiw0-YORXrdnSr8qJnpBOEN6Q2Y5dFp37MVSDV1V6EpwGECdQtgW0Q",
   "rsa_private_key_b64": "BACOQ7VCjwkiwYCKhqRRvPTMBaQ5Yx2_sszj6ILrxrTBOJ2bu-9LsOSvaGz0HpnM2lXpJg3h6QWJdlQBOhwvfeafHg7rcEaaDuUWONifv5ABpQgeoAij6cgARMvFiOdjarMvu954Eduup8PHcgfjsBSu76qpu3UqkZCpBpByAYU1oQQA1i5oxuA9i7qsXxhJRsBeceI7hZSnNYAQzsWfFD0kDW8GsJBuK-CST6oNNp0z7MQ5Qof6DZ8x9wt5ZJR43HFmD2VtTQUZLvIeemC4URuR74UWn25CETyzQdIhdNSEibaCRvi0sNwb-ikCZVxxo4-O7ZBQPw0egrQOJW06HlCQUykH_00EIoiBRcbJLS6W3nJ8KhddDf_4glZYPz6fBpqu1jIdIBGOGQf4Ttn_DmdAgkLxWF7AF6k59D45J9kxfANRJIBGSWUsI1bQBlrwFtois4O14uQkQ40Jh_d5BCrLPe599zrliGH1SsECx_xYGWcWY_GPsPa99d_St56BB9oUtDW3A1clEx2uVS8OWqRPgVimu6MXs_TEEnjWGRFofHpl_8qGeAoPbNkXsTMQb6uUK4NCYq3UzVfreByEnOqxuQcu2jlF4Ey0UH9w_KjkRyT8xu--kyZAbktYaw4EZmGUxZIlkZLk_OAGaW8KWPZhdGxjfi8K7WeZK2HtLe4At48DC_ED_20pNtkTCrB6-FQlMj6a4O2C1sE6pSdrIPofcK-HpaefOXqYKWpRM-Wnp_qHnuJgEtgodQ-pw74nXkOsVFZoJzVGCepZKoa2xhevAu3CfXMfR97LIski17PPwWV9n7yQ7onSKDmJP-q4mO7PG7LICE22WkgJkk_T1W4UkDTkCxZE_t64F6JOryg",
   "decomposed_rsa_private_key": [
     99901518447147034909201847419097315968297147437151469508360346463543063455874100243913856315732601845631262435262260706834732781343251117295631282035669718956849603873760427510697419513879951677293141811802298231979984193675329310799949319780256427743430868153430092107435691279045586737323088097814348379553,
@@ -52,6 +52,16 @@
         "k": "",
         "ts": 1361694312
       },
+      {
+        "h": "Ot5xDCTI",
+        "p": "ewZ1GAqT",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "JKLTa3pcvxf3ICsFHc0aa4JDQt7Dn9ODBZ9S7szZV-4aWMnKoUORIpWxvsTsV4oC",
+        "k": "zA8CzCf9tZw:dFvviPw8ljp8cKeEq1sIdVusWdY56kXZKdBQVQeK4qk",
+        "s": 5482930,
+        "ts": 1363505767
+      },
       {
         "h": "jtwkAQaK",
         "p": "ywJVFBKB",
@@ -119,6 +129,258 @@
         "k": "zA8CzCf9tZw:bLCHGilxhwBlxkZs8uptY87wZf_WNCR6RefwEgtbRmo",
         "s": 8920445,
         "ts": 1362235380
+      },
+      {
+        "h": "vxpUhLKT",
+        "p": "ywJVFBKB",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "-MsEWITGkFl-E_aM7qWXZLSOpfi9p_mwjGy47IrSLvk",
+        "k": "zA8CzCf9tZw:1kZ1iNJoSjwf-X5DtmtIc6rjNouau0CgPANnaPmGCEw",
+        "s": 137080,
+        "fa": "113:0*DW1HZGACejc",
+        "ts": 1362778998
+      },
+      {
+        "h": "ahozjYba",
+        "p": "ywJVFBKB",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "2poE9RKoqBfWeK71Vnv8YKyUAKzUqaUcGDhcToD-Brk",
+        "k": "zA8CzCf9tZw:-FjfHWTpg9u48DsPNKxjlrslIZXqenC4CeCTkk_aoek",
+        "s": 137080,
+        "ts": 1362779516
+      },
+      {
+        "h": "asY3gbSa",
+        "p": "ywJVFBKB",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "JYggnUiEG4yQ6KeMi7uYVb1Hd20qfpcE_kgt74-WtW8",
+        "k": "zA8CzCf9tZw:jqHCYoJVoHSjbfCoaafcStGQhbzG7YlnKaovknUnMhI",
+        "s": 137080,
+        "ts": 1362793600
+      },
+      {
+        "h": "Wk4nWISA",
+        "p": "ywJVFBKB",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "k11jsEyjmBDwbb0nLO8lJq_BZC0-o8lCnvKy4dHTWAM",
+        "k": "zA8CzCf9tZw:jLbBi09Xuh4_EkBKojzXRvmAjRiRdMnq6FTpxLraSJs",
+        "s": 39,
+        "ts": 1362798430
+      },
+      {
+        "h": "2hBgHbAQ",
+        "p": "ywJVFBKB",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "HX1V3cQKT7j3U0tc8UWF-FPOoacebme0wJto2kjOIFr_o4rss15XYMibUpHx1kzd",
+        "k": "zA8CzCf9tZw:n2E2YxruJFeifhcSM8pxd8D7wOSoOuQcaAsjip_UmMI",
+        "s": 7622058,
+        "ts": 1362798784
+      },
+      {
+        "h": "LtZE3YKY",
+        "p": "ywJVFBKB",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "81ADi8A0sb761XNa7qQ9qYgT7MO8-3n6ctcZq71PHDs",
+        "k": "zA8CzCf9tZw:xffmeXDkLZ0WWzioEaMJAEzdLqB53rSEkY1XzR8aR_A",
+        "s": 39,
+        "ts": 1362801884
+      },
+      {
+        "h": "X5oiVQKa",
+        "p": "ywJVFBKB",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "dyvg4y1uxduQCBPxjtANaQ7tse9DAOk_MUeiIZ_Woxs",
+        "k": "zA8CzCf9tZw:ECSKwEkyAvS6lWAQJFWZcH3P48eeAQNQxGYAJQFr9_o",
+        "s": 39,
+        "ts": 1362802310
+      },
+      {
+        "h": "zl5WEBZL",
+        "p": "ywJVFBKB",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "WyFR2PQ1HPCdi5X7GUR98o7Posh_gAtwKcgvGI0wPiA",
+        "k": "zA8CzCf9tZw:h4OAIIuQ38G41RMhYTro92JZEuzuuo_Ei0ZSiNNe6nY",
+        "s": 39,
+        "ts": 1362802849
+      },
+      {
+        "h": "H9BwDLRa",
+        "p": "ywJVFBKB",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "qHhpeU0sTjxsIWMCnT7zDXjLChHXt_lPmg42bxn93SI",
+        "k": "zA8CzCf9tZw:0t8RnutgNVAJrZCCLv9QJGCBZSRC9zG6SGecIvW4rGE",
+        "s": 39,
+        "ts": 1362803888
+      },
+      {
+        "h": "79gjRRZa",
+        "p": "ywJVFBKB",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "MB1tbC7R_H2_fTQZslTfrwI1guKfw6FJrxUzC1yXFeA",
+        "k": "zA8CzCf9tZw:UyN77tmMdhv3OIAi64JEf9OwWIMu11nYv1SNNG1orVs",
+        "s": 39,
+        "ts": 1362803938
+      },
+      {
+        "h": "f4BCSDRa",
+        "p": "ywJVFBKB",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "K1lKkodz26q9BnRpoNbuV6QdEBFx1EYSDGlHgbRIUfA",
+        "k": "zA8CzCf9tZw:g_-SqiuxXreNze5_g9ZShPBYpZQ1nxKpyNb85P_7N4s",
+        "s": 39,
+        "ts": 1362804274
+      },
+      {
+        "h": "q9oRUJhI",
+        "p": "ywJVFBKB",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "CrTfHaSw2ueOZoVlCynDL8f-f10gKkuurMrXXRsWnZE",
+        "k": "zA8CzCf9tZw:rIgbLqS3Fq3acmFZaN6pNa-ArrjCi2gB0k-ngIeHoUA",
+        "s": 117,
+        "ts": 1362810737
+      },
+      {
+        "h": "r8RynQzR",
+        "p": "ywJVFBKB",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "O2kUBPVRHHnNm42hzp9-0-8_rGH4Ym_bTM8APDA9zsU",
+        "k": "zA8CzCf9tZw:cNPzHLkA0NTVAys3esnj9QWNXF34nikUt1NhKK_c1Q8",
+        "s": 195,
+        "ts": 1362810989
+      },
+      {
+        "h": "P8RT0KgS",
+        "p": "ywJVFBKB",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "AJNkLW7wKTziPYvxwkTwQx0a9p8CM-lxEIeR5RZu4R4",
+        "k": "zA8CzCf9tZw:LbMSMY5HNMeDjdSU3q0nYGmAOt_WerTU_DO3v7iQdkE",
+        "s": 39,
+        "ts": 1362811065
+      },
+      {
+        "h": "axwRVSzY",
+        "p": "ywJVFBKB",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "HRZtXiNle4qhocTLMYW2mmmCV0j_B9bEvK27yD9xQK8",
+        "k": "zA8CzCf9tZw:UYpuIGPDzALgy_1CbvLPSA5Sr6Dv6Et2E4EM3Uw0moI",
+        "s": 39,
+        "ts": 1363516600
+      },
+      {
+        "h": "btpXFCxR",
+        "p": "ywJVFBKB",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "_jTsbHtJPR7fjbmqUK8Wsm7yw-d6nryNO7SPw4NO9TM",
+        "k": "zA8CzCf9tZw:IxMuRPVCFh-thywK1acaMjRKp3RerDi1-NEpKp59Uh0",
+        "s": 137080,
+        "fa": "115:0*qOMemq7l9jY",
+        "ts": 1363516781
+      },
+      {
+        "h": "boQCiQiT",
+        "p": "ywJVFBKB",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "hmWiu5RHYoCKpiQqPx8hkd5t8g_Qcs_mUlDWsUclBct9HRuCUp_L3mEAwd4l0rD5",
+        "k": "zA8CzCf9tZw:4QCgBoj9bYA40I_vq8E6-j3TlEUkfAdW_sW4meyoAvQ",
+        "s": 5482930,
+        "ts": 1363516963
+      },
+      {
+        "h": "zh5hhBAI",
+        "p": "ywJVFBKB",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "m1TCrq-Btvsp4ckHFRHuzaaZFiJKeA1f4wD5s2rFvvs",
+        "k": "zA8CzCf9tZw:5sushWWIFZAfDLq1ZKNIVu8P2JryHAiWgKkkUl05k6g",
+        "s": 5482930,
+        "ts": 1363517214
+      },
+      {
+        "h": "ep4XnTxQ",
+        "p": "jtwkAQaK",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "Cs1l7Rew5I2GGbyzw8VePAhoPyMkMHTVXoa2-SN4-uo",
+        "k": "zA8CzCf9tZw:09CaiWPvTBrPQhxWxKoIgUbkZNKNJRSQmJ0hHzw3JvI",
+        "s": 39,
+        "ts": 1362803268
+      },
+      {
+        "h": "b4IiHZII",
+        "p": "jtwkAQaK",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "uazdd2xapOTa5p_WMSVtav2hytWZw9eYyqTOzUAFpDc",
+        "k": "zA8CzCf9tZw:cI9G4pGAAExuZlPILGyqudknvWxh9rse00yWWC7pgp8",
+        "s": 78,
+        "ts": 1362805795
+      },
+      {
+        "h": "jgQg3ALZ",
+        "p": "jtwkAQaK",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "veRpCzk5S22KWwlnOqdgtqt3rWFM76XztTygOevPp34",
+        "k": "zA8CzCf9tZw:esxiNRkxr1KscaCsJuxg19qu7mXrgTB5tLwbtHMZoAs",
+        "s": 156,
+        "ts": 1362805852
+      },
+      {
+        "h": "fkQ0wZjZ",
+        "p": "jtwkAQaK",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "cPDFcFwRVTaCB-DxBAGCUxwD8qrgt1B2OMBGK-VNPME",
+        "k": "zA8CzCf9tZw:32zJUYIXo4uF-wgbHj-tlCxkKl4pYvs2gP0YIajuWdQ",
+        "s": 117,
+        "ts": 1362805994
+      },
+      {
+        "h": "DsJClQSZ",
+        "p": "jtwkAQaK",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "-oN7uRxlI-WrKsT03Zju5luB7z3Lg7uKVWSRczZsf7k",
+        "k": "zA8CzCf9tZw:Ut4_ESCi5yk71HroPJidRIqwPwyy3ZWsjz3NcgdPfBM",
+        "s": 195,
+        "ts": 1362810877
+      },
+      {
+        "h": "j9RWXTqC",
+        "p": "jtwkAQaK",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "h2ekShHqJMnbjk3uvW9n8hTGF07UySjFYvfTo5ktcCk",
+        "k": "zA8CzCf9tZw:4Q-l3ygtVC8-0p5CtWVWZkMc0G49aYKxCjx6vWO8Wvw",
+        "s": 195,
+        "ts": 1362810882
+      },
+      {
+        "h": "jopGGDJZ",
+        "p": "jtwkAQaK",
+        "u": "zA8CzCf9tZw",
+        "t": 0,
+        "a": "oJlWwnaj_tjQf__zDiqQm3zKhemldlfH-boZb7Cjri8",
+        "k": "zA8CzCf9tZw:Xol_vUW-InH4GMae5dZahrj2noOdLwibtgyGdzNSEvM",
+        "s": 195,
+        "ts": 1362810883
       }
     ],
     "ok": [
@@ -134,17 +396,18 @@
         "m": "megartest@gmail.com"
       }
     ],
-    "sn": "rkC92G0-SNg"
+    "sn": "71k37B8iTRY"
   },
   "file_upload_url_response": {
-    "p": "http://gfs262n185.userstorage.mega.co.nz/ul/YKxC-sS4xNF8MgL4iddMm9PNukmzMODqpxWsV5CquftEe5YDUZaq2_QSuqt8ubYtt0_VYE-yLk2gN5uJIyDHhQ"
+    "p": "http://gfs262n153.userstorage.mega.co.nz/ul/m8ZGZ_6t5WZHlQIlxfoPJjq3g31KcumFhIJiDoWrmTo1UNjleDcbzk0T8aGIsYX10KZccP08iFlTBGXWF79Jnw"
   },
   "sample_files": {
     "megar_test_sample_1.txt": {
       "file_download_url_response": {
         "s": 39,
         "at": "lv-LcMAl0dvpdxQFWNVZ7m9-mFT79mS0Mi_fH9InTqtBgcpe8kRVDGQ5Hj4BrXrc",
-        "g": "http://gfs262n164.userstorage.mega.co.nz/dl/Hv0Huu5AKOP1CQKwZNxpr7JMVXST1oxYEWT08YF3WIAWIDX4-3-bKAGVDU13ESYqBmcMDQGDsohpihtrDwEIpz3W5yvdTIFAhhWR49qpZvi3yfkhGg"
+        "g": "http://gfs262n164.userstorage.mega.co.nz/dl/nZUYBF_XMjz2fQKIdUQ8jsNYgY_Rucr3ykY900Mow4DtWWYq0wt-jt0tBC2cIQTOR6Modf11n-ekN4FZb01mgq2TSPcRDGy2-X_6uumuN0c-n83KZw",
+        "pfa": 1
       },
       "key": [
         2080156050,
@@ -179,7 +442,8 @@
       "file_download_url_response": {
         "s": 137080,
         "at": "OFTM18eQGxUTcJP2BQWXBo23vnjqs4b9QzmNZtDqekz4GZESVNiYlqKtasZqdVHN",
-        "g": "http://gfs262n170.userstorage.mega.co.nz/dl/ZWHZvT4lAtuWdwKYNzKGjqDfAvohHAi7AnKmQCCCWormdDhn-CLkuVb5Onah2GxtzcJ_vQFoI_EWAxIxGyBIXrsRLw60IJ6ZNjNWiDpcPG_6jTgP4A"
+        "g": "http://gfs262n170.userstorage.mega.co.nz/dl/RAS3RZCZPTWLCwLef5jWLhfjdHgnQYLqpQLb0xODrKWGcc5Og31zTYWov4dQ1xq65UUrAxOgwUvejHZshD3pBl6zybqiubp0cz_FX4FpsOuHsXVhTg",
+        "pfa": 1
       },
       "key": [
         1029178532,

data/spec/unit/adapters/file_uploader_spec.rb

@@ -18,7 +18,8 @@ describe Megar::FileUploader do
     [
       {
         upload_key:      [3230625094, 2656764682, 1008836587, 1082599785, 1919494632, 3993726968],
-        expected_iv:     152078032723025278718811426614033776640,
+        # expected_iv:     152078032723025278718811426614033776640,
+        expected_iv:     [1919494632, 3993726968, 0, 0],
         expected_mac_iv: [1919494632, 3993726968,1919494632, 3993726968],
         expected_mac_encryption_key: [3230625094, 2656764682, 1008836587, 1082599785]
       }

data/spec/unit/connection_spec.rb

@@ -36,11 +36,40 @@ describe Megar::Connection do
   describe "#api_request" do
     let(:data) { {} }
     subject { harness.api_request(data) }
-    context "when error response" do
-      let(:response_data) { JSON.parse("[-15,-15,-15]") }
-      it "should raise associated error" do
-        harness.stub(:get_api_response).and_return(response_data)
-        expect { subject }.to raise_error(Megar::MegaRequestError)
+
+    {
+      as_json: "[-15,-15,-15]",
+      as_error_code: "-15"
+    }.each do |test_name,given_response|
+      context "when mega error response (#{given_response})" do
+        it "should raise associated error" do
+          harness.stub(:get_api_response).and_return(given_response)
+          expect { subject }.to raise_error(Megar::MegaRequestError)
+        end
+      end
+    end
+
+    {
+      as_broken_json: "[{,{},{}]"
+    }.each do |test_name,given_response|
+      context "when invalid JSON response (#{given_response})" do
+        it "should raise associated error" do
+          harness.stub(:get_api_response).and_return(given_response)
+          expect { subject }.to raise_error(Megar::BadApiResponseError)
+        end
+      end
+    end
+
+    {
+      as_json: { given: '[{"a":1},{"b":2}]', expect: {'a' => 1} },
+      as_unarray: { given: '{"a":1}', expect: {'a' => 1} }
+    }.each do |test_name,expectations|
+      context "when valid response (#{expectations[:given]})" do
+        before { harness.stub(:get_api_response).and_return(expectations[:given]) }
+        it "should not raise error" do
+          expect { subject }.to_not raise_error
+        end
+        it { should eql(expectations[:expect]) }
       end
     end
 

data/spec/unit/crypto/aes_ctr_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Megar::Crypto::AesCtr do
+  let(:harness) { Megar::Crypto::AesCtr.new(options) }
+  let(:options) { {} }
+
+  describe "#key" do
+    subject { harness.key }
+    context "when provided as array of int" do
+      let(:options) { { key: [0x40404040,0x40404040,0x40404040,0x40404040] } }
+      it { should eql('@@@@@@@@@@@@@@@@') }
+    end
+    context "when provided as a binary string" do
+      let(:options) { { key: 'abcd' } }
+      it { should eql('abcd') }
+    end
+  end
+
+  describe "#iv" do
+    subject { harness.iv }
+    context "when not provided" do
+      it { should eql([0,0,0,0]) }
+    end
+    context "when provided as array of int" do
+      let(:options) { { iv: [1,2,3,4] } }
+      it { should eql([1,2,3,4]) }
+    end
+  end
+
+end

data/spec/unit/crypto/aes_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Megar::Crypto::Aes do
+  let(:harness) { Megar::Crypto::Aes.new(options) }
+  let(:options) { { key: key } }
+
+  describe "#encrypt" do
+    subject { harness.encrypt(data) }
+    # expectation generation in Javascript:
+    #   key = [0,0,0,0]
+    #   data = [-1965633819,-2121597728,1547823083,-1677263149]
+    #   cipher = new sjcl.cipher.aes(key)
+    #   cipher.encrypt(data)
+    [
+      { data: [0x93C467E3,0x7DB0C7A4,0xD1BE3F81,0x0152CB56], key: [0,0,0,0], expect: [887729479,-1472906423,407560426,1302943674] },
+      { data: [887729479,-1472906423,407560426,1302943674], key: [602974403,-1330001938,-1976634718,-894142530], expect: [-19364982,-598654435,1840800477,-1490065331] }
+    ].each do |test_case|
+      context "given #{test_case[:data]}" do
+        let(:key) { test_case[:key] }
+        let(:data) { test_case[:data] }
+        it { should eql(test_case[:expect]) }
+      end
+    end
+  end
+
+  describe "#encrypt" do
+    subject { harness.decrypt(data) }
+    # expectation generation in Javascript:
+    #   key = prepare_key_pw('NS7j8OKCfGeEEaUK') // [1258112910,-1520042757,-243943422,-1960187198]
+    #   data = [887729479,-1472906423,407560426,1302943674]
+    #   cipher = new sjcl.cipher.aes(key)
+    #   cipher.decrypt(data) // [480935216,755335218,-883525214,599824580]
+    [
+      { data: [887729479,-1472906423,407560426,1302943674], key: [1258112910,-1520042757,-243943422,-1960187198], expect: [480935216,755335218,-883525214,599824580] },
+      { data: [887729479,-1472906423,407560426,1302943674], key: [0,0,0,0], expect: [-1815844893,2108737444,-776061055,22203222] },
+      { data: [-19364982,-598654435,1840800477,-1490065331], key: [602974403,-1330001938,-1976634718,-894142530], expect: [887729479,-1472906423,407560426,1302943674] },
+      { data: [0x93C467E3,0x7DB0C7A4,0xD1BE3F81,0x0152CB56], key: [0,0,0,0], expect: [-1965633819,-2121597728,1547823083,-1677263149] }
+    ].each do |test_case|
+      context "given #{test_case[:data]}" do
+        let(:key) { test_case[:key] }
+        let(:data) { test_case[:data] }
+        it { should eql(test_case[:expect]) }
+      end
+    end
+  end
+end

data/spec/unit/crypto/support_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 class CryptoSupportTestHarness
-  include Megar::CryptoSupport
+  include Megar::Crypto::Support
 end
 
-describe Megar::CryptoSupport do
+describe Megar::Crypto::Support do
   let(:harness) { CryptoSupportTestHarness.new }
 
   describe "#crypto_requirements_met?" do

data/spec/unit/exception_spec.rb

@@ -7,7 +7,8 @@ describe "Megar Exceptions" do
     Megar::CryptoSupportRequirementsError,
     Megar::MacVerificationError,
     Megar::UnsupportedFileHandleTypeError,
-    Megar::FileUploadError
+    Megar::FileUploadError,
+    Megar::BadApiResponseError
   ].each do |exception_class|
     describe exception_class do
       subject { raise exception_class.new("test") }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megar
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: getoptions
@@ -181,6 +181,8 @@ files:
 - lib/megar/catalog/folders.rb
 - lib/megar/connection.rb
 - lib/megar/crypto.rb
+- lib/megar/crypto/aes.rb
+- lib/megar/crypto/aes_ctr.rb
 - lib/megar/crypto/support.rb
 - lib/megar/exception.rb
 - lib/megar/session.rb
@@ -202,6 +204,8 @@ files:
 - spec/unit/catalog/folder_spec.rb
 - spec/unit/catalog/folders_spec.rb
 - spec/unit/connection_spec.rb
+- spec/unit/crypto/aes_ctr_spec.rb
+- spec/unit/crypto/aes_spec.rb
 - spec/unit/crypto/support_spec.rb
 - spec/unit/exception_spec.rb
 - spec/unit/extensions/math_spec.rb
@@ -247,6 +251,8 @@ test_files:
 - spec/unit/catalog/folder_spec.rb
 - spec/unit/catalog/folders_spec.rb
 - spec/unit/connection_spec.rb
+- spec/unit/crypto/aes_ctr_spec.rb
+- spec/unit/crypto/aes_spec.rb
 - spec/unit/crypto/support_spec.rb
 - spec/unit/exception_spec.rb
 - spec/unit/extensions/math_spec.rb