From d1213fa4024143edaa060ee0ed326d9d2fcbe919 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 25 Nov 2008 23:36:33 -0800 Subject: Rescue OpenSSL::Cipher::CipherError or OpenSSL::CipherError depending on which is present --- activesupport/lib/active_support/message_encryptor.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb index de2b4bee76..347af9dc76 100644 --- a/activesupport/lib/active_support/message_encryptor.rb +++ b/activesupport/lib/active_support/message_encryptor.rb @@ -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 -- cgit v1.2.3