1 files changed, 7 insertions, 10 deletions
diff --git a/test/openssl/test_cipher.rb b/test/openssl/test_cipher.rb
index ad0e87b441..d87dedf73c 100644
--- a/test/openssl/test_cipher.rb
+++ b/test/openssl/test_cipher.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require_relative 'utils'
 
-if defined?(OpenSSL::TestUtils)
+if defined?(OpenSSL)
 
 class OpenSSL::TestCipher < OpenSSL::TestCase
   module Helper
@@ -129,7 +129,7 @@ class OpenSSL::TestCipher < OpenSSL::TestCase
     assert_equal ct, cipher.update(pt) << cipher.final
     cipher = new_decryptor("aes-128-ctr", key: key, iv: iv, padding: 0)
     assert_equal pt, cipher.update(ct) << cipher.final
-  end if has_cipher?('aes-128-ctr')
+  end
 
   def test_ciphers
     OpenSSL::Cipher.ciphers.each{|name|
@@ -165,10 +165,8 @@ class OpenSSL::TestCipher < OpenSSL::TestCase
   end
 
   def test_authenticated
-    if has_cipher?('aes-128-gcm')
-      cipher = OpenSSL::Cipher.new('aes-128-gcm')
-      assert_predicate(cipher, :authenticated?)
-    end
+    cipher = OpenSSL::Cipher.new('aes-128-gcm')
+    assert_predicate(cipher, :authenticated?)
     cipher = OpenSSL::Cipher.new('aes-128-cbc')
     assert_not_predicate(cipher, :authenticated?)
   end
@@ -220,7 +218,7 @@ class OpenSSL::TestCipher < OpenSSL::TestCase
     cipher = new_decryptor("aes-128-gcm", key: key, iv: iv, auth_tag: tag, auth_data: aad)
     cipher.update(ct2)
     assert_raise(OpenSSL::Cipher::CipherError) { cipher.final }
-  end if has_cipher?("aes-128-gcm")
+  end
 
   def test_aes_gcm_variable_iv_len
     # GCM spec Appendix B Test Case 5
@@ -243,7 +241,7 @@ class OpenSSL::TestCipher < OpenSSL::TestCase
     assert_equal tag, cipher.auth_tag
     cipher = new_decryptor("aes-128-gcm", key: key, iv_len: 8, iv: iv, auth_tag: tag, auth_data: aad)
     assert_equal pt, cipher.update(ct) << cipher.final
-  end if has_cipher?("aes-128-gcm")
+  end
 
   def test_aes_ocb_tag_len
     # RFC 7253 Appendix A; the second sample
@@ -295,7 +293,7 @@ class OpenSSL::TestCipher < OpenSSL::TestCase
 
     assert_equal ct1, ct2
     assert_equal tag1, tag2
-  end if has_cipher?("aes-128-gcm")
+  end
 
   private
 
@@ -312,7 +310,6 @@ class OpenSSL::TestCipher < OpenSSL::TestCase
       kwargs.each {|k, v| cipher.send(:"#{k}=", v) }
     end
   end
-
 end
 
 end