@@ -10,7 +10,8 @@ module ActiveSupport # want users to be able to determine the value of the payload. class MessageEncryptor class InvalidMessage < StandardError; end - + OpenSSLCipherError = OpenSSL::Cipher.const_defined?(:CipherError) ? OpenSSL::Cipher::CipherError : OpenSSL::CipherError + def initialize(secret, cipher = 'aes-256-cbc') @secret = secret @cipher = cipher @@ -43,7 +44,7 @@ module ActiveSupport decrypted_data << cipher.final Marshal.load(decrypted_data) - rescue OpenSSL::CipherError, TypeError + rescue OpenSSLCipherError, TypeError raise InvalidMessage end @@ -66,4 +67,4 @@ module ActiveSupport MessageVerifier.new(@secret) end end -end \ No newline at end of file +end activesupport/lib/active_support/message_encryptor.rb 4073a6d0a2f5926e10f06fe1702db7b1b7a20751 Jeremy Kemper jeremy@bitsweat.net http://github.com/rails/rails/commit/d1213fa4024143edaa060ee0ed326d9d2fcbe919 d1213fa4024143edaa060ee0ed326d9d2fcbe919 2008-11-25T23:36:33-08:00 2008-11-25T23:36:33-08:00 Rescue OpenSSL::Cipher::CipherError or OpenSSL::CipherError depending on which is present 5fdd7fc3eb1e04db4c84e154db99eec684e02179 Jeremy Kemper jeremy@bitsweat.net