Skip to content

Commit 0a97559

Browse files
committed
ruby 2.4: fix OpenSSL::Cipher::Cipher deprecation warning
Change-Id: I6e7ffefc974e51e14e2230b5fc09aeb803d408c3 Reviewed-on: https://gerrit.instructure.com/101399 Tested-by: Jenkins Reviewed-by: Simon Williams <simon@instructure.com> Product-Review: Cody Cutrer <cody@instructure.com> QA-Review: Cody Cutrer <cody@instructure.com>
1 parent 88399f2 commit 0a97559

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

lib/canvas/security.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def self.config
4444

4545
def self.encrypt_password(secret, key)
4646
require 'base64'
47-
c = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
47+
c = OpenSSL::Cipher.new('aes-256-cbc')
4848
c.encrypt
4949
c.key = Digest::SHA1.hexdigest(key + "_" + encryption_key)[0...32]
5050
c.iv = iv = c.random_iv
@@ -58,7 +58,7 @@ def self.decrypt_password(secret, salt, key, encryption_key = nil)
5858
encryption_keys = Array(encryption_key) + self.encryption_keys
5959
last_error = nil
6060
encryption_keys.each do |encryption_key|
61-
c = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
61+
c = OpenSSL::Cipher.new('aes-256-cbc')
6262
c.decrypt
6363
c.key = Digest::SHA1.hexdigest(key + "_" + encryption_key)[0...32]
6464
c.iv = Base64.decode64(salt)

0 commit comments

Comments
 (0)