x509: update keys used in tests

Replace fixed-sized RSA keys with the generic rsa-{1,2,3}.pem keys.
Those test cases do not depend on specific keys or key sizes, and just
need several different keys.

Replace DSA keys with EC keys so that we can run more tests in the FIPS
mode, which do not seem to support DSA anymore.

Also, clean up duplicate test cases using very small keys or obsolete
hash functions.

rake test_fips no longer skips those test cases.

Author: rhenium

Rakefile

@@ -35,10 +35,6 @@ Rake::TestTask.new(:test_fips_internal) do |t|
     'test/openssl/test_ocsp.rb',
     'test/openssl/test_pkcs12.rb',
     'test/openssl/test_ts.rb',
-    'test/openssl/test_x509cert.rb',
-    'test/openssl/test_x509crl.rb',
-    'test/openssl/test_x509name.rb',
-    'test/openssl/test_x509req.rb',
   ]
   t.warning = true
 end

test/openssl/test_x509cert.rb

@@ -6,17 +6,16 @@
 class OpenSSL::TestX509Certificate < OpenSSL::TestCase
   def setup
     super
-    @rsa1024 = Fixtures.pkey("rsa1024")
-    @rsa2048 = Fixtures.pkey("rsa2048")
-    @dsa256  = Fixtures.pkey("dsa256")
-    @dsa512  = Fixtures.pkey("dsa512")
+    @rsa1 = Fixtures.pkey("rsa-1")
+    @rsa2 = Fixtures.pkey("rsa-2")
+    @ec1 = Fixtures.pkey("p256")
     @ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
     @ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1")
   end
 
   def test_serial
     [1, 2**32, 2**100].each{|s|
-      cert = issue_cert(@ca, @rsa2048, s, [], nil, nil)
+      cert = issue_cert(@ca, @rsa1, s, [], nil, nil)
       assert_equal(s, cert.serial)
       cert = OpenSSL::X509::Certificate.new(cert.to_der)
       assert_equal(s, cert.serial)
@@ -29,40 +28,34 @@ def test_public_key
       ["subjectKeyIdentifier","hash",false],
       ["authorityKeyIdentifier","keyid:always",false],
     ]
-
-    [
-      @rsa1024, @rsa2048, @dsa256, @dsa512,
-    ].each{|pk|
-      cert = issue_cert(@ca, pk, 1, exts, nil, nil)
-      assert_equal(cert.extensions.sort_by(&:to_s)[2].value,
-                   OpenSSL::TestUtils.get_subject_key_id(cert))
-      cert = OpenSSL::X509::Certificate.new(cert.to_der)
-      assert_equal(cert.extensions.sort_by(&:to_s)[2].value,
-                   OpenSSL::TestUtils.get_subject_key_id(cert))
-    }
+    cert = issue_cert(@ca, @rsa1, 1, exts, nil, nil)
+    assert_kind_of(OpenSSL::PKey::RSA, cert.public_key)
+    assert_equal(@rsa1.public_to_der, cert.public_key.public_to_der)
+    cert = OpenSSL::X509::Certificate.new(cert.to_der)
+    assert_equal(@rsa1.public_to_der, cert.public_key.public_to_der)
   end
 
   def test_validity
     now = Time.at(Time.now.to_i + 0.9)
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil,
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil,
                       not_before: now, not_after: now+3600)
     assert_equal(Time.at(now.to_i), cert.not_before)
     assert_equal(Time.at(now.to_i+3600), cert.not_after)
 
     now = Time.at(now.to_i)
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil,
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil,
                       not_before: now, not_after: now+3600)
     assert_equal(now.getutc, cert.not_before)
     assert_equal((now+3600).getutc, cert.not_after)
 
     now = Time.at(0)
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil,
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil,
                       not_before: now, not_after: now)
     assert_equal(now.getutc, cert.not_before)
     assert_equal(now.getutc, cert.not_after)
 
     now = Time.at(0x7fffffff)
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil,
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil,
                       not_before: now, not_after: now)
     assert_equal(now.getutc, cert.not_before)
     assert_equal(now.getutc, cert.not_after)
@@ -75,7 +68,7 @@ def test_extension_factory
       ["subjectKeyIdentifier","hash",false],
       ["authorityKeyIdentifier","issuer:always,keyid:always",false],
     ]
-    ca_cert = issue_cert(@ca, @rsa2048, 1, ca_exts, nil, nil)
+    ca_cert = issue_cert(@ca, @rsa1, 1, ca_exts, nil, nil)
     ca_cert.extensions.each_with_index{|ext, i|
       assert_equal(ca_exts[i].first, ext.oid)
       assert_equal(ca_exts[i].last, ext.critical?)
@@ -88,7 +81,7 @@ def test_extension_factory
       ["extendedKeyUsage","clientAuth, emailProtection, codeSigning",false],
       ["subjectAltName","email:ee1@ruby-lang.org",false],
     ]
-    ee1_cert = issue_cert(@ee1, @rsa1024, 2, ee1_exts, ca_cert, @rsa2048)
+    ee1_cert = issue_cert(@ee1, @rsa2, 2, ee1_exts, ca_cert, @rsa1)
     assert_equal(ca_cert.subject.to_der, ee1_cert.issuer.to_der)
     ee1_cert.extensions.each_with_index{|ext, i|
       assert_equal(ee1_exts[i].first, ext.oid)
@@ -97,39 +90,39 @@ def test_extension_factory
   end
 
   def test_akiski
-    ca_cert = generate_cert(@ca, @rsa2048, 4, nil)
+    ca_cert = generate_cert(@ca, @rsa1, 4, nil)
     ef = OpenSSL::X509::ExtensionFactory.new(ca_cert, ca_cert)
     ca_cert.add_extension(
       ef.create_extension("subjectKeyIdentifier", "hash", false))
     ca_cert.add_extension(
       ef.create_extension("authorityKeyIdentifier", "issuer:always,keyid:always", false))
-    ca_cert.sign(@rsa2048, "sha256")
+    ca_cert.sign(@rsa1, "sha256")
 
     ca_keyid = get_subject_key_id(ca_cert.to_der, hex: false)
     assert_equal ca_keyid, ca_cert.authority_key_identifier
     assert_equal ca_keyid, ca_cert.subject_key_identifier
 
-    ee_cert = generate_cert(@ee1, Fixtures.pkey("p256"), 5, ca_cert)
+    ee_cert = generate_cert(@ee1, @rsa2, 5, ca_cert)
     ef = OpenSSL::X509::ExtensionFactory.new(ca_cert, ee_cert)
     ee_cert.add_extension(
       ef.create_extension("subjectKeyIdentifier", "hash", false))
     ee_cert.add_extension(
       ef.create_extension("authorityKeyIdentifier", "issuer:always,keyid:always", false))
-    ee_cert.sign(@rsa2048, "sha256")
+    ee_cert.sign(@rsa1, "sha256")
 
     ee_keyid = get_subject_key_id(ee_cert.to_der, hex: false)
     assert_equal ca_keyid, ee_cert.authority_key_identifier
     assert_equal ee_keyid, ee_cert.subject_key_identifier
   end
 
   def test_akiski_missing
-    cert = issue_cert(@ee1, @rsa2048, 1, [], nil, nil)
+    cert = issue_cert(@ee1, @rsa1, 1, [], nil, nil)
     assert_nil(cert.authority_key_identifier)
     assert_nil(cert.subject_key_identifier)
   end
 
   def test_crl_uris_no_crl_distribution_points
-    cert = issue_cert(@ee1, @rsa2048, 1, [], nil, nil)
+    cert = issue_cert(@ee1, @rsa1, 1, [], nil, nil)
     assert_nil(cert.crl_uris)
   end
 
@@ -141,10 +134,10 @@ def test_crl_uris
       URI.1 = http://www.example.com/crl
       URI.2 = ldap://ldap.example.com/cn=ca?certificateRevocationList;binary
     _cnf_
-    cdp_cert = generate_cert(@ee1, @rsa2048, 3, nil)
+    cdp_cert = generate_cert(@ee1, @rsa1, 3, nil)
     ef.subject_certificate = cdp_cert
     cdp_cert.add_extension(ef.create_extension("crlDistributionPoints", "@crlDistPts"))
-    cdp_cert.sign(@rsa2048, "sha256")
+    cdp_cert.sign(@rsa1, "sha256")
     assert_equal(
       ["http://www.example.com/crl", "ldap://ldap.example.com/cn=ca?certificateRevocationList;binary"],
       cdp_cert.crl_uris
@@ -158,10 +151,10 @@ def test_crl_uris_multiple_general_names
       [crlDistPts_section]
       fullname = URI:http://www.example.com/crl, URI:ldap://ldap.example.com/cn=ca?certificateRevocationList;binary
     _cnf_
-    cdp_cert = generate_cert(@ee1, @rsa2048, 3, nil)
+    cdp_cert = generate_cert(@ee1, @rsa1, 3, nil)
     ef.subject_certificate = cdp_cert
     cdp_cert.add_extension(ef.create_extension("crlDistributionPoints", "crlDistPts_section"))
-    cdp_cert.sign(@rsa2048, "sha256")
+    cdp_cert.sign(@rsa1, "sha256")
     assert_equal(
       ["http://www.example.com/crl", "ldap://ldap.example.com/cn=ca?certificateRevocationList;binary"],
       cdp_cert.crl_uris
@@ -177,22 +170,22 @@ def test_crl_uris_no_uris
       [dirname_section]
       CN = dirname
     _cnf_
-    cdp_cert = generate_cert(@ee1, @rsa2048, 3, nil)
+    cdp_cert = generate_cert(@ee1, @rsa1, 3, nil)
     ef.subject_certificate = cdp_cert
     cdp_cert.add_extension(ef.create_extension("crlDistributionPoints", "crlDistPts_section"))
-    cdp_cert.sign(@rsa2048, "sha256")
+    cdp_cert.sign(@rsa1, "sha256")
     assert_nil(cdp_cert.crl_uris)
   end
 
   def test_aia_missing
-    cert = issue_cert(@ee1, @rsa2048, 1, [], nil, nil)
+    cert = issue_cert(@ee1, @rsa1, 1, [], nil, nil)
     assert_nil(cert.ca_issuer_uris)
     assert_nil(cert.ocsp_uris)
   end
 
   def test_aia
     ef = OpenSSL::X509::ExtensionFactory.new
-    aia_cert = generate_cert(@ee1, @rsa2048, 4, nil)
+    aia_cert = generate_cert(@ee1, @rsa1, 4, nil)
     ef.subject_certificate = aia_cert
     aia_cert.add_extension(
       ef.create_extension(
@@ -204,7 +197,7 @@ def test_aia
         false
       )
     )
-    aia_cert.sign(@rsa2048, "sha256")
+    aia_cert.sign(@rsa1, "sha256")
     assert_equal(
       ["http://www.example.com/caIssuers", "ldap://ldap.example.com/cn=ca?authorityInfoAccessCaIssuers;binary"],
       aia_cert.ca_issuer_uris
@@ -217,7 +210,7 @@ def test_aia
 
   def test_invalid_extension
     integer = OpenSSL::ASN1::Integer.new(0)
-    invalid_exts_cert = generate_cert(@ee1, @rsa1024, 1, nil)
+    invalid_exts_cert = generate_cert(@ee1, @rsa1, 1, nil)
     ["subjectKeyIdentifier", "authorityKeyIdentifier", "crlDistributionPoints", "authorityInfoAccess"].each do |ext|
       invalid_exts_cert.add_extension(
         OpenSSL::X509::Extension.new(ext, integer.to_der)
@@ -241,82 +234,30 @@ def test_invalid_extension
     }
   end
 
-  def test_sign_and_verify_rsa_sha1
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil, digest: "SHA1")
-    assert_equal(false, cert.verify(@rsa1024))
-    assert_equal(true,  cert.verify(@rsa2048))
-    assert_equal(false, certificate_error_returns_false { cert.verify(@dsa256) })
-    assert_equal(false, certificate_error_returns_false { cert.verify(@dsa512) })
+  def test_sign_and_verify
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil, digest: "SHA256")
+    assert_equal(true, cert.verify(@rsa1))
+    assert_equal(false, cert.verify(@rsa2))
+    assert_equal(false, certificate_error_returns_false { cert.verify(@ec1) })
     cert.serial = 2
-    assert_equal(false, cert.verify(@rsa2048))
-  rescue OpenSSL::X509::CertificateError # RHEL 9 disables SHA1
-  end
-
-  def test_sign_and_verify_rsa_md5
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil, digest: "md5")
-    assert_equal(false, cert.verify(@rsa1024))
-    assert_equal(true, cert.verify(@rsa2048))
-
-    assert_equal(false, certificate_error_returns_false { cert.verify(@dsa256) })
-    assert_equal(false, certificate_error_returns_false { cert.verify(@dsa512) })
-    cert.subject = @ee1
-    assert_equal(false, cert.verify(@rsa2048))
-  rescue OpenSSL::X509::CertificateError # RHEL7 disables MD5
-  end
-
-  def test_sign_and_verify_dsa
-    cert = issue_cert(@ca, @dsa512, 1, [], nil, nil)
-    assert_equal(false, certificate_error_returns_false { cert.verify(@rsa1024) })
-    assert_equal(false, certificate_error_returns_false { cert.verify(@rsa2048) })
-    assert_equal(false, cert.verify(@dsa256))
-    assert_equal(true,  cert.verify(@dsa512))
-    cert.not_after = Time.now
-    assert_equal(false, cert.verify(@dsa512))
+    assert_equal(false, cert.verify(@rsa1))
   end
 
-  def test_sign_and_verify_rsa_dss1
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil, digest: OpenSSL::Digest.new('DSS1'))
-    assert_equal(false, cert.verify(@rsa1024))
-    assert_equal(true, cert.verify(@rsa2048))
-    assert_equal(false, certificate_error_returns_false { cert.verify(@dsa256) })
-    assert_equal(false, certificate_error_returns_false { cert.verify(@dsa512) })
-    cert.subject = @ee1
-    assert_equal(false, cert.verify(@rsa2048))
-  rescue OpenSSL::X509::CertificateError
-  end if defined?(OpenSSL::Digest::DSS1)
-
-  def test_sign_and_verify_dsa_md5
-    assert_raise(OpenSSL::X509::CertificateError){
-      issue_cert(@ca, @dsa512, 1, [], nil, nil, digest: "md5")
-    }
-  end
-
-  def test_sign_and_verify_ed25519
+  def test_sign_and_verify_nil_digest
     # Ed25519 is not FIPS-approved.
     omit_on_fips
     ed25519 = OpenSSL::PKey::generate_key("ED25519")
     cert = issue_cert(@ca, ed25519, 1, [], nil, nil, digest: nil)
     assert_equal(true, cert.verify(ed25519))
   end
 
-  def test_dsa_with_sha2
-    cert = issue_cert(@ca, @dsa256, 1, [], nil, nil, digest: "sha256")
-    assert_equal("dsa_with_SHA256", cert.signature_algorithm)
-    # TODO: need more tests for dsa + sha2
-
-    # SHA1 is allowed from OpenSSL 1.0.0 (0.9.8 requires DSS1)
-    cert = issue_cert(@ca, @dsa256, 1, [], nil, nil, digest: "sha1")
-    assert_equal("dsaWithSHA1", cert.signature_algorithm)
-  rescue OpenSSL::X509::CertificateError # RHEL 9 disables SHA1
-  end
-
   def test_check_private_key
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
-    assert_equal(true, cert.check_private_key(@rsa2048))
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil)
+    assert_equal(true, cert.check_private_key(@rsa1))
   end
 
   def test_read_from_file
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil)
     Tempfile.create("cert") { |f|
       f << cert.to_pem
       f.rewind
@@ -325,28 +266,28 @@ def test_read_from_file
   end
 
   def test_read_der_then_pem
-    cert1 = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
+    cert1 = issue_cert(@ca, @rsa1, 1, [], nil, nil)
     exts = [
       # A new line before PEM block
       ["nsComment", "Another certificate:\n" + cert1.to_pem],
     ]
-    cert2 = issue_cert(@ca, @rsa2048, 2, exts, nil, nil)
+    cert2 = issue_cert(@ca, @rsa1, 2, exts, nil, nil)
 
     assert_equal cert2, OpenSSL::X509::Certificate.new(cert2.to_der)
     assert_equal cert2, OpenSSL::X509::Certificate.new(cert2.to_pem)
   end
 
   def test_eq
     now = Time.now
-    cacert = issue_cert(@ca, @rsa1024, 1, [], nil, nil,
+    cacert = issue_cert(@ca, @rsa1, 1, [], nil, nil,
                         not_before: now, not_after: now + 3600)
-    cert1 = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024,
+    cert1 = issue_cert(@ee1, @rsa2, 2, [], cacert, @rsa1,
                        not_before: now, not_after: now + 3600)
-    cert2 = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024,
+    cert2 = issue_cert(@ee1, @rsa2, 2, [], cacert, @rsa1,
                        not_before: now, not_after: now + 3600)
-    cert3 = issue_cert(@ee1, @rsa2048, 3, [], cacert, @rsa1024,
+    cert3 = issue_cert(@ee1, @rsa2, 3, [], cacert, @rsa1,
                        not_before: now, not_after: now + 3600)
-    cert4 = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024,
+    cert4 = issue_cert(@ee1, @rsa2, 2, [], cacert, @rsa1,
                        digest: "sha512", not_before: now, not_after: now + 3600)
 
     assert_equal false, cert1 == 12345
@@ -358,9 +299,9 @@ def test_eq
 
   def test_marshal
     now = Time.now
-    cacert = issue_cert(@ca, @rsa1024, 1, [], nil, nil,
+    cacert = issue_cert(@ca, @rsa1, 1, [], nil, nil,
       not_before: now, not_after: now + 3600)
-    cert = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024,
+    cert = issue_cert(@ee1, @rsa2, 2, [], cacert, @rsa1,
       not_before: now, not_after: now + 3600)
     deserialized = Marshal.load(Marshal.dump(cert))
 
@@ -378,8 +319,8 @@ def test_load_file_empty_pem
   end
 
   def test_load_file_fullchain_pem
-    cert1 = issue_cert(@ee1, @rsa2048, 1, [], nil, nil)
-    cert2 = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
+    cert1 = issue_cert(@ee1, @rsa1, 1, [], nil, nil)
+    cert2 = issue_cert(@ca, @rsa2, 1, [], nil, nil)
 
     Tempfile.create("fullchain.pem") do |f|
       f.puts cert1.to_pem
@@ -394,7 +335,7 @@ def test_load_file_fullchain_pem
   end
 
   def test_load_file_certificate_der
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil)
     Tempfile.create("certificate.der", binmode: true) do |f|
       f.write cert.to_der
       f.close
@@ -419,7 +360,7 @@ def test_load_file_fullchain_garbage
   end
 
   def test_tbs_precert_bytes
-    cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
+    cert = issue_cert(@ca, @rsa1, 1, [], nil, nil)
     seq = OpenSSL::ASN1.decode(cert.tbs_bytes)
 
     assert_equal 7, seq.value.size