rubygems-update 3.0.3 → 3.4.7

data/test/rubygems/test_gem_commands_cert_command.rb

@@ -1,24 +1,28 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/commands/cert_command'
+require_relative "helper"
+require "rubygems/commands/cert_command"
 
-unless defined?(OpenSSL::SSL)
-  warn 'Skipping `gem cert` tests.  openssl not found.'
+unless Gem::HAVE_OPENSSL
+  warn "Skipping `gem cert` tests.  openssl not found."
 end
 
-class TestGemCommandsCertCommand < Gem::TestCase
+if Gem.java_platform?
+  warn "Skipping `gem cert` tests on jruby."
+end
 
-  ALTERNATE_CERT = load_cert 'alternate'
-  EXPIRED_PUBLIC_CERT = load_cert 'expired'
+class TestGemCommandsCertCommand < Gem::TestCase
+  ALTERNATE_CERT = load_cert "alternate"
+  EXPIRED_PUBLIC_CERT = load_cert "expired"
 
-  ALTERNATE_KEY_FILE = key_path 'alternate'
-  PRIVATE_KEY_FILE   = key_path 'private'
-  PUBLIC_KEY_FILE    = key_path 'public'
+  ALTERNATE_KEY_FILE  = key_path "alternate"
+  PRIVATE_KEY_FILE    = key_path "private"
+  PRIVATE_EC_KEY_FILE = key_path "private_ec"
+  PUBLIC_KEY_FILE     = key_path "public"
 
-  ALTERNATE_CERT_FILE      = cert_path 'alternate'
-  CHILD_CERT_FILE          = cert_path 'child'
-  PUBLIC_CERT_FILE         = cert_path 'public'
-  EXPIRED_PUBLIC_CERT_FILE = cert_path 'expired'
+  ALTERNATE_CERT_FILE      = cert_path "alternate"
+  CHILD_CERT_FILE          = cert_path "child"
+  PUBLIC_CERT_FILE         = cert_path "public"
+  EXPIRED_PUBLIC_CERT_FILE = cert_path "expired"
 
   def setup
     super
@@ -26,13 +30,21 @@ class TestGemCommandsCertCommand < Gem::TestCase
     @cmd = Gem::Commands::CertCommand.new
 
     @trust_dir = Gem::Security.trust_dir
+
+    @cleanup = []
+  end
+
+  def teardown
+    FileUtils.rm_f(@cleanup)
+
+    super
   end
 
   def test_certificates_matching
     @trust_dir.trust_cert PUBLIC_CERT
     @trust_dir.trust_cert ALTERNATE_CERT
 
-    matches = @cmd.certificates_matching ''
+    matches = @cmd.certificates_matching ""
 
     # HACK OpenSSL::X509::Certificate#== is Object#==, so do this the hard way
     match = matches.next
@@ -43,7 +55,7 @@ class TestGemCommandsCertCommand < Gem::TestCase
     assert_equal PUBLIC_CERT.to_pem, match.first.to_pem
     assert_equal @trust_dir.cert_path(PUBLIC_CERT), match.last
 
-    assert_raises StopIteration do
+    assert_raise StopIteration do
       matches.next
     end
   end
@@ -52,13 +64,13 @@ class TestGemCommandsCertCommand < Gem::TestCase
     @trust_dir.trust_cert PUBLIC_CERT
     @trust_dir.trust_cert ALTERNATE_CERT
 
-    matches = @cmd.certificates_matching 'alternate'
+    matches = @cmd.certificates_matching "alternate"
 
     match = matches.next
     assert_equal ALTERNATE_CERT.to_pem, match.first.to_pem
     assert_equal @trust_dir.cert_path(ALTERNATE_CERT), match.last
 
-    assert_raises StopIteration do
+    assert_raise StopIteration do
       matches.next
     end
   end
@@ -72,14 +84,14 @@ class TestGemCommandsCertCommand < Gem::TestCase
 
     cert_path = @trust_dir.cert_path PUBLIC_CERT
 
-    assert_path_exists cert_path
+    assert_path_exist cert_path
 
     assert_equal "Added '/CN=nobody/DC=example'\n", @ui.output
     assert_empty @ui.error
   end
 
   def test_execute_add_twice
-    self.class.cert_path 'alternate'
+    self.class.cert_path "alternate"
 
     @cmd.handle_options %W[
       --add #{PUBLIC_CERT_FILE}
@@ -100,7 +112,7 @@ Added '/CN=alternate/DC=example'
   end
 
   def test_execute_build
-    passphrase = 'Foo bar'
+    passphrase = "Foo bar"
 
     @cmd.handle_options %W[--build nobody@example.com]
 
@@ -127,12 +139,48 @@ Added '/CN=alternate/DC=example'
     assert_empty output
     assert_empty @build_ui.error
 
-    assert_path_exists File.join(@tempdir, 'gem-private_key.pem')
-    assert_path_exists File.join(@tempdir, 'gem-public_cert.pem')
+    assert_path_exist File.join(@tempdir, "gem-private_key.pem")
+    assert_path_exist File.join(@tempdir, "gem-public_cert.pem")
+  end
+
+  def test_execute_build_key_algorithm_ec_key
+    passphrase = "Foo bar"
+
+    @cmd.handle_options %W[--build nobody@example.com --key-algorithm ec]
+
+    @build_ui = Gem::MockGemUi.new "#{passphrase}\n#{passphrase}"
+
+    use_ui @build_ui do
+      @cmd.execute
+    end
+
+    output = @build_ui.output.squeeze("\n").split "\n"
+
+    assert_equal "Passphrase for your Private Key:  ",
+                 output.shift
+    assert_equal "Please repeat the passphrase for your Private Key:  ",
+                 output.shift
+    assert_equal "Certificate: #{File.join @tempdir, 'gem-public_cert.pem'}",
+                 output.shift
+    assert_equal "Private Key: #{File.join @tempdir, 'gem-private_key.pem'}",
+                 output.shift
+
+    assert_equal "Don't forget to move the key file to somewhere private!",
+                 output.shift
+
+    assert_empty output
+    assert_empty @build_ui.error
+
+    assert_path_exist File.join(@tempdir, "gem-private_key.pem")
+
+    cert_path = File.join(@tempdir, "gem-public_cert.pem")
+    assert_path_exist cert_path
+    cert = OpenSSL::X509::Certificate.new(File.read(cert_path))
+    assert cert.public_key.is_a? OpenSSL::PKey::EC
   end
 
   def test_execute_build_bad_email_address
-    passphrase = 'Foo bar'
+    passphrase = "Foo bar"
     email = "nobody@"
 
     @cmd.handle_options %W[--build #{email}]
@@ -140,21 +188,20 @@ Added '/CN=alternate/DC=example'
     @build_ui = Gem::MockGemUi.new "#{passphrase}\n#{passphrase}"
 
     use_ui @build_ui do
-
-      e = assert_raises Gem::CommandLineError do
+      e = assert_raise Gem::CommandLineError do
         @cmd.execute
       end
 
       assert_equal "Invalid email address #{email}",
         e.message
 
-      refute_path_exists File.join(@tempdir, 'gem-private_key.pem')
-      refute_path_exists File.join(@tempdir, 'gem-public_cert.pem')
+      assert_path_not_exist File.join(@tempdir, "gem-private_key.pem")
+      assert_path_not_exist File.join(@tempdir, "gem-public_cert.pem")
     end
   end
 
   def test_execute_build_expiration_days
-    passphrase = 'Foo bar'
+    passphrase = "Foo bar"
 
     @cmd.handle_options %W[
       --build nobody@example.com
@@ -184,8 +231,8 @@ Added '/CN=alternate/DC=example'
     assert_empty output
     assert_empty @build_ui.error
 
-    assert_path_exists File.join(@tempdir, 'gem-private_key.pem')
-    assert_path_exists File.join(@tempdir, 'gem-public_cert.pem')
+    assert_path_exist File.join(@tempdir, "gem-private_key.pem")
+    assert_path_exist File.join(@tempdir, "gem-public_cert.pem")
 
     pem = File.read("#{@tempdir}/gem-public_cert.pem")
     cert = OpenSSL::X509::Certificate.new(pem)
@@ -195,15 +242,15 @@ Added '/CN=alternate/DC=example'
   end
 
   def test_execute_build_bad_passphrase_confirmation
-    passphrase = 'Foo bar'
-    passphrase_confirmation = 'Fu bar'
+    passphrase = "Foo bar"
+    passphrase_confirmation = "Fu bar"
 
     @cmd.handle_options %W[--build nobody@example.com]
 
     @build_ui = Gem::MockGemUi.new "#{passphrase}\n#{passphrase_confirmation}"
 
     use_ui @build_ui do
-      e = assert_raises Gem::CommandLineError do
+      e = assert_raise Gem::CommandLineError do
         @cmd.execute
       end
 
@@ -218,11 +265,10 @@ Added '/CN=alternate/DC=example'
 
       assert_equal "Passphrase and passphrase confirmation don't match",
                    e.message
-
     end
 
-    refute_path_exists File.join(@tempdir, 'gem-private_key.pem')
-    refute_path_exists File.join(@tempdir, 'gem-public_cert.pem')
+    assert_path_not_exist File.join(@tempdir, "gem-private_key.pem")
+    assert_path_not_exist File.join(@tempdir, "gem-public_cert.pem")
   end
 
   def test_execute_build_key
@@ -243,8 +289,8 @@ Added '/CN=alternate/DC=example'
     assert_empty output
     assert_empty @ui.error
 
-    assert_path_exists File.join(@tempdir, 'gem-public_cert.pem')
-    refute_path_exists File.join(@tempdir, 'gem-private_key.pem')
+    assert_path_exist File.join(@tempdir, "gem-public_cert.pem")
+    assert_path_not_exist File.join(@tempdir, "gem-private_key.pem")
   end
 
   def test_execute_build_encrypted_key
@@ -265,7 +311,29 @@ Added '/CN=alternate/DC=example'
     assert_empty output
     assert_empty @ui.error
 
-    assert_path_exists File.join(@tempdir, 'gem-public_cert.pem')
+    assert_path_exist File.join(@tempdir, "gem-public_cert.pem")
+  end
+
+  def test_execute_build_ec_key
+    @cmd.handle_options %W[
+      --build nobody@example.com
+      --private-key #{PRIVATE_EC_KEY_FILE}
+    ]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    output = @ui.output.split "\n"
+
+    assert_equal "Certificate: #{File.join @tempdir, 'gem-public_cert.pem'}",
+                 output.shift
+
+    assert_empty output
+    assert_empty @ui.error
+
+    assert_path_exist File.join(@tempdir, "gem-public_cert.pem")
+    assert_path_not_exist File.join(@tempdir, "gem-private_key.pem")
   end
 
   def test_execute_certificate
@@ -273,8 +341,8 @@ Added '/CN=alternate/DC=example'
       @cmd.handle_options %W[--certificate #{PUBLIC_CERT_FILE}]
     end
 
-    assert_equal '', @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.output
+    assert_equal "", @ui.error
 
     assert_equal PUBLIC_CERT.to_pem, @cmd.options[:issuer_cert].to_pem
   end
@@ -313,8 +381,8 @@ Added '/CN=alternate/DC=example'
       @cmd.send :handle_options, %W[--private-key #{PRIVATE_KEY_FILE}]
     end
 
-    assert_equal '', @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.output
+    assert_equal "", @ui.error
 
     assert_equal PRIVATE_KEY.to_pem, @cmd.options[:key].to_pem
   end
@@ -324,8 +392,8 @@ Added '/CN=alternate/DC=example'
       @cmd.send :handle_options, %W[--private-key #{ENCRYPTED_PRIVATE_KEY_PATH}]
     end
 
-    assert_equal '', @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.output
+    assert_equal "", @ui.error
 
     assert_equal ENCRYPTED_PRIVATE_KEY.to_pem, @cmd.options[:key].to_pem
   end
@@ -335,7 +403,7 @@ Added '/CN=alternate/DC=example'
 
     cert_path = @trust_dir.cert_path PUBLIC_CERT
 
-    assert_path_exists cert_path
+    assert_path_exist cert_path
 
     @cmd.handle_options %W[--remove nobody]
 
@@ -344,9 +412,9 @@ Added '/CN=alternate/DC=example'
     end
 
     assert_equal "Removed '/CN=nobody/DC=example'\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.error
 
-    refute_path_exists cert_path
+    assert_path_not_exist cert_path
   end
 
   def test_execute_remove_multiple
@@ -356,8 +424,8 @@ Added '/CN=alternate/DC=example'
     public_path = @trust_dir.cert_path PUBLIC_CERT
     alternate_path = @trust_dir.cert_path ALTERNATE_CERT
 
-    assert_path_exists public_path
-    assert_path_exists alternate_path
+    assert_path_exist public_path
+    assert_path_exist alternate_path
 
     @cmd.handle_options %W[--remove example]
 
@@ -371,10 +439,10 @@ Removed '/CN=nobody/DC=example'
     EXPECTED
 
     assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.error
 
-    refute_path_exists public_path
-    refute_path_exists alternate_path
+    assert_path_not_exist public_path
+    assert_path_not_exist alternate_path
   end
 
   def test_execute_remove_twice
@@ -384,8 +452,8 @@ Removed '/CN=nobody/DC=example'
     public_path = @trust_dir.cert_path PUBLIC_CERT
     alternate_path = @trust_dir.cert_path ALTERNATE_CERT
 
-    assert_path_exists public_path
-    assert_path_exists alternate_path
+    assert_path_exist public_path
+    assert_path_exist alternate_path
 
     @cmd.handle_options %W[--remove nobody --remove alternate]
 
@@ -399,17 +467,17 @@ Removed '/CN=alternate/DC=example'
     EXPECTED
 
     assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.error
 
-    refute_path_exists public_path
-    refute_path_exists alternate_path
+    assert_path_not_exist public_path
+    assert_path_not_exist alternate_path
   end
 
   def test_execute_sign
-    path = File.join @tempdir, 'cert.pem'
+    path = File.join @tempdir, "cert.pem"
     Gem::Security.write ALTERNATE_CERT, path, 0600
 
-    assert_equal '/CN=alternate/DC=example', ALTERNATE_CERT.issuer.to_s
+    assert_equal "/CN=alternate/DC=example", ALTERNATE_CERT.issuer.to_s
 
     @cmd.handle_options %W[
       --private-key #{PRIVATE_KEY_FILE}
@@ -422,12 +490,12 @@ Removed '/CN=alternate/DC=example'
       @cmd.execute
     end
 
-    assert_equal '', @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.output
+    assert_equal "", @ui.error
 
     cert = OpenSSL::X509::Certificate.new File.read path
 
-    assert_equal '/CN=nobody/DC=example', cert.issuer.to_s
+    assert_equal "/CN=nobody/DC=example", cert.issuer.to_s
 
     mask = 0100600 & (~File.umask)
 
@@ -435,10 +503,10 @@ Removed '/CN=alternate/DC=example'
   end
 
   def test_execute_sign_encrypted_key
-    path = File.join @tempdir, 'cert.pem'
+    path = File.join @tempdir, "cert.pem"
     Gem::Security.write ALTERNATE_CERT, path, 0600
 
-    assert_equal '/CN=alternate/DC=example', ALTERNATE_CERT.issuer.to_s
+    assert_equal "/CN=alternate/DC=example", ALTERNATE_CERT.issuer.to_s
 
     @cmd.handle_options %W[
       --private-key #{ENCRYPTED_PRIVATE_KEY_PATH}
@@ -451,12 +519,12 @@ Removed '/CN=alternate/DC=example'
       @cmd.execute
     end
 
-    assert_equal '', @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.output
+    assert_equal "", @ui.error
 
     cert = OpenSSL::X509::Certificate.new File.read path
 
-    assert_equal '/CN=nobody/DC=example', cert.issuer.to_s
+    assert_equal "/CN=nobody/DC=example", cert.issuer.to_s
 
     mask = 0100600 & (~File.umask)
 
@@ -464,18 +532,18 @@ Removed '/CN=alternate/DC=example'
   end
 
   def test_execute_sign_default
-    FileUtils.mkdir_p File.join Gem.user_home, '.gem'
+    FileUtils.mkdir_p File.join Gem.user_home, ".gem"
 
-    private_key_path = File.join Gem.user_home, '.gem', 'gem-private_key.pem'
+    private_key_path = File.join Gem.user_home, ".gem", "gem-private_key.pem"
     Gem::Security.write PRIVATE_KEY, private_key_path
 
-    public_cert_path = File.join Gem.user_home, '.gem', 'gem-public_cert.pem'
+    public_cert_path = File.join Gem.user_home, ".gem", "gem-public_cert.pem"
     Gem::Security.write PUBLIC_CERT, public_cert_path
 
-    path = File.join @tempdir, 'cert.pem'
+    path = File.join @tempdir, "cert.pem"
     Gem::Security.write ALTERNATE_CERT, path, 0600
 
-    assert_equal '/CN=alternate/DC=example', ALTERNATE_CERT.issuer.to_s
+    assert_equal "/CN=alternate/DC=example", ALTERNATE_CERT.issuer.to_s
 
     @cmd.handle_options %W[--sign #{path}]
 
@@ -483,12 +551,12 @@ Removed '/CN=alternate/DC=example'
       @cmd.execute
     end
 
-    assert_equal '', @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.output
+    assert_equal "", @ui.error
 
     cert = OpenSSL::X509::Certificate.new File.read path
 
-    assert_equal '/CN=nobody/DC=example', cert.issuer.to_s
+    assert_equal "/CN=nobody/DC=example", cert.issuer.to_s
 
     mask = 0100600 & (~File.umask)
 
@@ -496,18 +564,18 @@ Removed '/CN=alternate/DC=example'
   end
 
   def test_execute_sign_default_encrypted_key
-    FileUtils.mkdir_p File.join(Gem.user_home, '.gem')
+    FileUtils.mkdir_p File.join(Gem.user_home, ".gem")
 
-    private_key_path = File.join Gem.user_home, '.gem', 'gem-private_key.pem'
+    private_key_path = File.join Gem.user_home, ".gem", "gem-private_key.pem"
     Gem::Security.write ENCRYPTED_PRIVATE_KEY, private_key_path, 0600, PRIVATE_KEY_PASSPHRASE
 
-    public_cert_path = File.join Gem.user_home, '.gem', 'gem-public_cert.pem'
+    public_cert_path = File.join Gem.user_home, ".gem", "gem-public_cert.pem"
     Gem::Security.write PUBLIC_CERT, public_cert_path
 
-    path = File.join @tempdir, 'cert.pem'
+    path = File.join @tempdir, "cert.pem"
     Gem::Security.write ALTERNATE_CERT, path, 0600
 
-    assert_equal '/CN=alternate/DC=example', ALTERNATE_CERT.issuer.to_s
+    assert_equal "/CN=alternate/DC=example", ALTERNATE_CERT.issuer.to_s
 
     @cmd.handle_options %W[--sign #{path}]
 
@@ -515,12 +583,12 @@ Removed '/CN=alternate/DC=example'
       @cmd.execute
     end
 
-    assert_equal '', @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.output
+    assert_equal "", @ui.error
 
     cert = OpenSSL::X509::Certificate.new File.read path
 
-    assert_equal '/CN=nobody/DC=example', cert.issuer.to_s
+    assert_equal "/CN=nobody/DC=example", cert.issuer.to_s
 
     mask = 0100600 & (~File.umask)
 
@@ -528,25 +596,25 @@ Removed '/CN=alternate/DC=example'
   end
 
   def test_execute_sign_no_cert
-    FileUtils.mkdir_p File.join Gem.user_home, '.gem'
+    FileUtils.mkdir_p File.join Gem.user_home, ".gem"
 
-    private_key_path = File.join Gem.user_home, '.gem', 'gem-private_key.pem'
+    private_key_path = File.join Gem.user_home, ".gem", "gem-private_key.pem"
     Gem::Security.write PRIVATE_KEY, private_key_path
 
-    path = File.join @tempdir, 'cert.pem'
+    path = File.join @tempdir, "cert.pem"
     Gem::Security.write ALTERNATE_CERT, path, 0600
 
-    assert_equal '/CN=alternate/DC=example', ALTERNATE_CERT.issuer.to_s
+    assert_equal "/CN=alternate/DC=example", ALTERNATE_CERT.issuer.to_s
 
     @cmd.handle_options %W[--sign #{path}]
 
     use_ui @ui do
-      assert_raises Gem::MockGemUi::TermError do
+      assert_raise Gem::MockGemUi::TermError do
         @cmd.execute
       end
     end
 
-    assert_equal '', @ui.output
+    assert_equal "", @ui.output
 
     expected = <<-EXPECTED
 ERROR:  --certificate not specified and ~/.gem/gem-public_cert.pem does not exist
@@ -556,25 +624,25 @@ ERROR:  --certificate not specified and ~/.gem/gem-public_cert.pem does not exis
   end
 
   def test_execute_sign_no_key
-    FileUtils.mkdir_p File.join Gem.user_home, '.gem'
+    FileUtils.mkdir_p File.join Gem.user_home, ".gem"
 
-    public_cert_path = File.join Gem.user_home, '.gem', 'gem-public_cert.pem'
+    public_cert_path = File.join Gem.user_home, ".gem", "gem-public_cert.pem"
     Gem::Security.write PUBLIC_CERT, public_cert_path
 
-    path = File.join @tempdir, 'cert.pem'
+    path = File.join @tempdir, "cert.pem"
     Gem::Security.write ALTERNATE_CERT, path, 0600
 
-    assert_equal '/CN=alternate/DC=example', ALTERNATE_CERT.issuer.to_s
+    assert_equal "/CN=alternate/DC=example", ALTERNATE_CERT.issuer.to_s
 
     @cmd.handle_options %W[--sign #{path}]
 
     use_ui @ui do
-      assert_raises Gem::MockGemUi::TermError do
+      assert_raise Gem::MockGemUi::TermError do
         @cmd.execute
       end
     end
 
-    assert_equal '', @ui.output
+    assert_equal "", @ui.output
 
     expected = <<-EXPECTED
 ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exist
@@ -587,12 +655,13 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
     gem_path = File.join Gem.user_home, ".gem"
     Dir.mkdir gem_path
 
-    path = File.join @tempdir, 'cert.pem'
+    path = File.join @tempdir, "cert.pem"
     Gem::Security.write EXPIRED_PUBLIC_CERT, path, 0600
 
-    assert_equal '/CN=nobody/DC=example', EXPIRED_PUBLIC_CERT.issuer.to_s
+    assert_equal "/CN=nobody/DC=example", EXPIRED_PUBLIC_CERT.issuer.to_s
 
     tmp_expired_cert_file = File.join(Dir.tmpdir, File.basename(EXPIRED_PUBLIC_CERT_FILE))
+    @cleanup << tmp_expired_cert_file
     File.write(tmp_expired_cert_file, File.read(EXPIRED_PUBLIC_CERT_FILE))
 
     @cmd.handle_options %W[
@@ -611,19 +680,20 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
       /INFO:  Your certificate #{tmp_expired_cert_file} has been re-signed\nINFO:  Your expired certificate will be located at: #{expected_path}\.[0-9]+/,
       @ui.output
     )
-    assert_equal '', @ui.error
+    assert_equal "", @ui.error
   end
 
   def test_execute_re_sign_with_cert_expiration_length_days
     gem_path = File.join Gem.user_home, ".gem"
     Dir.mkdir gem_path
 
-    path = File.join @tempdir, 'cert.pem'
+    path = File.join @tempdir, "cert.pem"
     Gem::Security.write EXPIRED_PUBLIC_CERT, path, 0600
 
-    assert_equal '/CN=nobody/DC=example', EXPIRED_PUBLIC_CERT.issuer.to_s
+    assert_equal "/CN=nobody/DC=example", EXPIRED_PUBLIC_CERT.issuer.to_s
 
     tmp_expired_cert_file = File.join(Dir.tmpdir, File.basename(EXPIRED_PUBLIC_CERT_FILE))
+    @cleanup << tmp_expired_cert_file
     File.write(tmp_expired_cert_file, File.read(EXPIRED_PUBLIC_CERT_FILE))
 
     @cmd.handle_options %W[
@@ -642,7 +712,7 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
     cert_days_to_expire = (re_signed_cert.not_after - re_signed_cert.not_before).to_i / (24 * 60 * 60)
 
     assert_equal(28, cert_days_to_expire)
-    assert_equal '', @ui.error
+    assert_equal "", @ui.error
   end
 
   def test_handle_options
@@ -661,29 +731,29 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
     ]
 
     assert_equal [PUBLIC_CERT.to_pem, ALTERNATE_CERT.to_pem],
-                 @cmd.options[:add].map { |cert| cert.to_pem }
+                 @cmd.options[:add].map {|cert| cert.to_pem }
 
     assert_equal %w[nobody example], @cmd.options[:remove]
 
     assert_equal %w[nobody@example other@example],
-                 @cmd.options[:build].map { |name| name.to_s }
+                 @cmd.options[:build].map {|name| name.to_s }
 
-    assert_equal ['', 'example'], @cmd.options[:list]
+    assert_equal ["", "example"], @cmd.options[:list]
   end
 
   def test_handle_options_add_bad
-    nonexistent = File.join @tempdir, 'nonexistent'
-    e = assert_raises OptionParser::InvalidArgument do
+    nonexistent = File.join @tempdir, "nonexistent"
+    e = assert_raise Gem::OptionParser::InvalidArgument do
       @cmd.handle_options %W[--add #{nonexistent}]
     end
 
     assert_equal "invalid argument: --add #{nonexistent}: does not exist",
                  e.message
 
-    bad = File.join @tempdir, 'bad'
+    bad = File.join @tempdir, "bad"
     FileUtils.touch bad
 
-    e = assert_raises OptionParser::InvalidArgument do
+    e = assert_raise Gem::OptionParser::InvalidArgument do
       @cmd.handle_options %W[--add #{bad}]
     end
 
@@ -692,18 +762,18 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
   end
 
   def test_handle_options_certificate
-    nonexistent = File.join @tempdir, 'nonexistent'
-    e = assert_raises OptionParser::InvalidArgument do
+    nonexistent = File.join @tempdir, "nonexistent"
+    e = assert_raise Gem::OptionParser::InvalidArgument do
       @cmd.handle_options %W[--certificate #{nonexistent}]
     end
 
     assert_equal "invalid argument: --certificate #{nonexistent}: does not exist",
                  e.message
 
-    bad = File.join @tempdir, 'bad'
+    bad = File.join @tempdir, "bad"
     FileUtils.touch bad
 
-    e = assert_raises OptionParser::InvalidArgument do
+    e = assert_raise Gem::OptionParser::InvalidArgument do
       @cmd.handle_options %W[--certificate #{bad}]
     end
 
@@ -713,8 +783,8 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
   end
 
   def test_handle_options_key_bad
-    nonexistent = File.join @tempdir, 'nonexistent'
-    e = assert_raises OptionParser::InvalidArgument do
+    nonexistent = File.join @tempdir, "nonexistent"
+    e = assert_raise Gem::OptionParser::InvalidArgument do
       @cmd.handle_options %W[--private-key #{nonexistent}]
     end
 
@@ -722,17 +792,17 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
                  "--private-key #{nonexistent}: does not exist",
                  e.message
 
-    bad = File.join @tempdir, 'bad'
+    bad = File.join @tempdir, "bad"
     FileUtils.touch bad
 
-    e = assert_raises OptionParser::InvalidArgument do
+    e = assert_raise Gem::OptionParser::InvalidArgument do
       @cmd.handle_options %W[--private-key #{bad}]
     end
 
-    assert_equal "invalid argument: --private-key #{bad}: invalid RSA key",
+    assert_equal "invalid argument: --private-key #{bad}: invalid RSA, DSA, or EC key",
                  e.message
 
-    e = assert_raises OptionParser::InvalidArgument do
+    e = assert_raise Gem::OptionParser::InvalidArgument do
       @cmd.handle_options %W[--private-key #{PUBLIC_KEY_FILE}]
     end
 
@@ -778,8 +848,8 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
   end
 
   def test_handle_options_sign_nonexistent
-    nonexistent = File.join @tempdir, 'nonexistent'
-    e = assert_raises OptionParser::InvalidArgument do
+    nonexistent = File.join @tempdir, "nonexistent"
+    e = assert_raise Gem::OptionParser::InvalidArgument do
       @cmd.handle_options %W[
         --private-key #{ALTERNATE_KEY_FILE}
 
@@ -792,5 +862,4 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
     assert_equal "invalid argument: --sign #{nonexistent}: does not exist",
                  e.message
   end
-
-end if defined?(OpenSSL::SSL)
+end if Gem::HAVE_OPENSSL && !Gem.java_platform?