Merge branch 'ky/x509-implement-eq'

* ky/x509-implement-eq:
  test/test_x509crl: fix random failure
  test/test_x509cert: fix flaky test

Author: rhenium

test/test_x509cert.rb

@@ -170,11 +170,17 @@ def test_read_from_file
   end
 
   def test_eq
-    cacert = issue_cert(@ca, @rsa1024, 1, [], nil, nil)
-    cert1 = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024)
-    cert2 = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024)
-    cert3 = issue_cert(@ee1, @rsa2048, 3, [], cacert, @rsa1024)
-    cert4 = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024, digest: "sha512")
+    now = Time.now
+    cacert = issue_cert(@ca, @rsa1024, 1, [], nil, nil,
+                        not_before: now, not_after: now + 3600)
+    cert1 = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024,
+                       not_before: now, not_after: now + 3600)
+    cert2 = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024,
+                       not_before: now, not_after: now + 3600)
+    cert3 = issue_cert(@ee1, @rsa2048, 3, [], cacert, @rsa1024,
+                       not_before: now, not_after: now + 3600)
+    cert4 = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024,
+                       digest: "sha512", not_before: now, not_after: now + 3600)
 
     assert_equal false, cert1 == 12345
     assert_equal true, cert1 == cert2

test/test_x509crl.rb

@@ -221,11 +221,13 @@ def test_revoked_to_der
   end
 
   def test_eq
+    now = Time.now
+
     cacert = issue_cert(@ca, @rsa1024, 1, [], nil, nil)
-    crl1 = issue_crl([], 1, Time.now, Time.now + 3600, [], cacert, @rsa1024, "sha256")
+    crl1 = issue_crl([], 1, now, now + 3600, [], cacert, @rsa1024, "sha256")
     rev1 = OpenSSL::X509::Revoked.new.tap { |rev|
       rev.serial = 1
-      rev.time = Time.now
+      rev.time = now
     }
     crl1.add_revoked(rev1)
     crl2 = OpenSSL::X509::CRL.new(crl1.to_der)
@@ -235,7 +237,7 @@ def test_eq
     assert_equal true, crl1 == crl2
     rev2 = OpenSSL::X509::Revoked.new.tap { |rev|
       rev.serial = 2
-      rev.time = Time.now
+      rev.time = now
     }
     crl2.add_revoked(rev2)
     assert_equal false, crl1 == crl2