Merge server and rails_3_1

app/controllers/application_controller.rb

@@ -25,6 +25,8 @@ class ApplicationController < ActionController::Base
     end
   end
   
+  protected
+  
   # Set I18n.locale
   def set_locale
     # update session if passed
@@ -55,5 +57,21 @@ class ApplicationController < ActionController::Base
   def set_current_item
     session[:current_page] = params[:id] || @item.id rescue nil
   end
+  
+  def decrypt_data(encrypted_data, encrypted_key, encrypted_iv)
+    site = Site.find(session[:site])
+    if encrypted_data
+      private_key = OpenSSL::PKey::RSA.new(site.private_key)
+      cipher = OpenSSL::Cipher.new('aes-256-cbc')
+      cipher.decrypt
+      cipher.key = private_key.private_decrypt(encrypted_key)
+      cipher.iv = private_key.private_decrypt(encrypted_iv)
+
+      decrypted_data = cipher.update(encrypted_data)
+      decrypted_data << cipher.final
+    else
+      ''
+    end
+  end
 
 end