Skip to content

Commit 3598f52

Browse files
kareskares
committed
[test] refactor issue_cert to use updated format
1 parent b16bcdd commit 3598f52

File tree

8 files changed

+35
-60
lines changed

8 files changed

+35
-60
lines changed

‎src/test/ruby/ssl/test_helper.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ def setup;
2424
[ "keyUsage", "keyEncipherment,digitalSignature", true ],
2525
]
2626
now = Time.at(Time.now.to_i)
27-
@ca_cert = issue_cert(@ca, @ca_key, 1, now, now + 3600, ca_exts, nil, nil, OpenSSL::Digest::SHA256.new)
28-
@svr_cert = issue_cert(@svr, @svr_key, 2, now, now + 1800, ee_exts, @ca_cert, @ca_key, OpenSSL::Digest::SHA256.new)
29-
@cli_cert = issue_cert(@cli, @cli_key, 3, now, now + 1800, ee_exts, @ca_cert, @ca_key, OpenSSL::Digest::SHA256.new)
27+
@ca_cert = issue_cert(@ca, @ca_key, 1, ca_exts, nil, nil, not_before: now, not_after: now + 3600)
28+
@svr_cert = issue_cert(@svr, @svr_key, 2, ee_exts, @ca_cert, @ca_key, not_before: now, not_after: now + 1800)
29+
@cli_cert = issue_cert(@cli, @cli_key, 3, ee_exts, @ca_cert, @ca_key, not_before: now, not_after: now + 1800)
3030
@server = nil
3131
end
3232

‎src/test/ruby/ssl/test_ocsp.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,27 @@ def setup
1919
["basicConstraints", "CA:TRUE", true],
2020
["keyUsage", "cRLSign,keyCertSign", true],
2121
]
22-
@ca_cert = issue_cert(ca_subj, @ca_key, 1, now, now+1800, ca_exts, nil, nil, OpenSSL::Digest::SHA1.new)
22+
@ca_cert = issue_cert(ca_subj, @ca_key, 1, ca_exts, nil, nil, not_before: now, not_after: now + 1800, digest: OpenSSL::Digest::SHA1.new)
2323

2424
cert_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA2")
2525
@cert_key = OpenSSL::PKey::RSA.new TEST_KEY_RSA1
2626
cert_exts = [
2727
["basicConstraints", "CA:TRUE", true],
2828
["keyUsage", "cRLSign,keyCertSign", true],
2929
]
30-
@cert = issue_cert(cert_subj, @cert_key, 5, now, now+1800, cert_exts, @ca_cert, @ca_key, OpenSSL::Digest::SHA1.new)
30+
@cert = issue_cert(cert_subj, @cert_key, 5, cert_exts, @ca_cert, @ca_key, not_before: now, not_after: now + 1800, digest: OpenSSL::Digest::SHA1.new)
3131

3232
cert2_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCert")
3333
@cert2_key = OpenSSL::PKey::RSA.new TEST_KEY_RSA1
3434
cert2_exts = []
35-
@cert2 = issue_cert(cert2_subj, @cert2_key, 10, now, now+1800, cert2_exts, @cert, @cert_key, OpenSSL::Digest::SHA1.new)
35+
@cert2 = issue_cert(cert2_subj, @cert2_key, 10, cert2_exts, @cert, @cert_key, not_before: now, not_after: now + 1800, digest: OpenSSL::Digest::SHA1.new)
3636

3737
ocsp_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCAOCSP")
3838
@ocsp_key = OpenSSL::PKey::RSA.new TEST_KEY_RSA2
3939
ocsp_exts = [
4040
["extendedKeyUsage", "OCSPSigning", true],
4141
]
42-
@ocsp_cert = issue_cert(ocsp_subj, @ocsp_key, 100, now, now+1800, ocsp_exts, @cert, @cert_key, OpenSSL::Digest::SHA1.new)
42+
@ocsp_cert = issue_cert(ocsp_subj, @ocsp_key, 100, ocsp_exts, @cert, @cert_key, not_before: now, not_after: now + 1800, digest: OpenSSL::Digest::SHA1.new)
4343
end
4444

4545
def test_new_certificate_id

‎src/test/ruby/ssl/test_ssl.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ def test_post_connection_check
3838
["subjectAltName","DNS:localhost.localdomain",false],
3939
["subjectAltName","IP:127.0.0.1",false],
4040
]
41-
@svr_cert = issue_cert(@svr, @svr_key, 4, now, now + 1800, exts,
42-
@ca_cert, @ca_key, OpenSSL::Digest::SHA1.new)
41+
@svr_cert = issue_cert(@svr, @svr_key, 4, exts, @ca_cert, @ca_key,
42+
not_before: now, not_after: now + 1800, digest: OpenSSL::Digest::SHA1.new)
4343
start_server0(PORT, OpenSSL::SSL::VERIFY_NONE, true) do |server, port|
4444
sock = TCPSocket.new("127.0.0.1", port)
4545
ssl = OpenSSL::SSL::SSLSocket.new(sock)
@@ -62,8 +62,8 @@ def test_post_connection_check
6262
[ "keyUsage", "keyEncipherment,digitalSignature", true ],
6363
[ "subjectAltName", "DNS:*.localdomain", false ],
6464
]
65-
@svr_cert = issue_cert(@svr, @svr_key, 5, now, now + 1800, exts,
66-
@ca_cert, @ca_key, OpenSSL::Digest::SHA1.new)
65+
@svr_cert = issue_cert(@svr, @svr_key, 5, exts, @ca_cert, @ca_key,
66+
not_before: now, not_after: now + 1800, digest: OpenSSL::Digest::SHA1.new)
6767
start_server0(PORT, OpenSSL::SSL::VERIFY_NONE, true) do |server, port|
6868
sock = TCPSocket.new("127.0.0.1", port)
6969
ssl = OpenSSL::SSL::SSLSocket.new(sock)

‎src/test/ruby/test_asn1.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,7 @@ def test_decode
253253
["subjectKeyIdentifier","hash",false],
254254
]
255255
dgst = OpenSSL::Digest::SHA1.new
256-
cert = issue_cert( # OpenSSL::TestUtils.issue_cert
257-
subj, key, s, now, now+3600, exts, nil, nil, dgst)
256+
cert = issue_cert(subj, key, s, exts, nil, nil, not_before: now, not_after: now + 3600, digest: dgst)
258257

259258
asn1 = OpenSSL::ASN1.decode(cert)
260259
assert_equal(OpenSSL::ASN1::Sequence, asn1.class)

‎src/test/ruby/test_helper.rb

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -135,17 +135,7 @@ def jruby?; self.class.jruby? end
135135

136136
def debug(msg); puts msg if $VERBOSE end
137137

138-
def issue_cert(*args)
139-
# def issue_cert(dn, key, serial, not_before, not_after, extensions, issuer, issuer_key, digest)
140-
# def issue_cert(dn, key, serial, extensions, issuer, issuer_key,
141-
# not_before: nil, not_after: nil, digest: "sha256")
142-
if args.length == 9
143-
dn, key, serial, not_before, not_after, extensions, issuer, issuer_key, digest = *args
144-
else
145-
dn, key, serial, extensions, issuer, issuer_key, opts = *args
146-
opts ||= {}
147-
not_before, not_after, digest = opts[:not_before], opts[:not_after], opts[:digest] || "sha256"
148-
end
138+
def issue_cert(dn, key, serial, extensions, issuer, issuer_key, not_before: nil, not_after: nil, digest: 'sha256')
149139
cert = OpenSSL::X509::Certificate.new
150140
issuer = cert unless issuer
151141
issuer_key = key unless issuer_key
@@ -167,8 +157,7 @@ def issue_cert(*args)
167157
cert
168158
end
169159

170-
def issue_crl(revoke_info, serial, lastup, nextup, extensions,
171-
issuer, issuer_key, digest)
160+
def issue_crl(revoke_info, serial, lastup, nextup, extensions, issuer, issuer_key, digest)
172161
crl = OpenSSL::X509::CRL.new
173162
crl.issuer = issuer.subject
174163
crl.version = 1

‎src/test/ruby/x509/test_x509cert.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ def test_resolve_extensions
132132
]
133133

134134
now = Time.now
135-
ca_cert = issue_cert(ca, rsa2048, 1, now, now + 3600, ca_exts,
136-
nil, nil, OpenSSL::Digest::SHA1.new)
135+
ca_cert = issue_cert(ca, rsa2048, 1, ca_exts, nil, nil,
136+
not_before: now, not_after: now + 3600, digest: OpenSSL::Digest::SHA1.new)
137137

138138
assert_equal 5, ca_cert.extensions.size
139139

@@ -180,8 +180,8 @@ def test_extensions
180180
]
181181

182182
now = Time.now
183-
ca_cert = issue_cert(ca, rsa2048, 1, now, now + 3600, ca_exts,
184-
nil, nil, OpenSSL::Digest::SHA1.new)
183+
ca_cert = issue_cert(ca, rsa2048, 1, ca_exts, nil, nil,
184+
not_before: now, not_after: now + 3600, digest: OpenSSL::Digest::SHA1.new)
185185

186186
assert_equal 8, ca_cert.extensions.size
187187
ca_cert.extensions.each_with_index do |ext, i|
@@ -222,7 +222,7 @@ def test_inspect_to_text
222222

223223
dgst = OpenSSL::Digest::SHA1.new # NOTE: does it match MRI ?!
224224

225-
cert = issue_cert(subj, key, s, now, now + 3600, exts, nil, nil, dgst)
225+
cert = issue_cert(subj, key, s, exts, nil, nil, not_before: now, not_after: now + 3600, digest: dgst)
226226

227227
assert cert.inspect.start_with?('#<OpenSSL::X509::Certificate:')
228228
if defined? JRUBY_VERSION

‎src/test/ruby/x509/test_x509crl.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ def test_extension
120120
]
121121

122122
now = Time.now
123-
cert = issue_cert(_ca, _rsa2048, 1, now, now + 3600, cert_exts, nil, nil, OpenSSL::Digest::SHA1.new)
124-
crl = issue_crl([], 1, now, now+1600, crl_exts, cert, _rsa2048, OpenSSL::Digest::SHA1.new)
123+
cert = issue_cert(_ca, _rsa2048, 1, cert_exts, nil, nil, not_before: now, not_after: now + 3600)
124+
crl = issue_crl([], 1, now, now+1600, crl_exts, cert, _rsa2048, OpenSSL::Digest::SHA256.new)
125125

126126
exts = crl.extensions
127127
assert_equal(3, exts.size)

‎src/test/ruby/x509/test_x509store.rb

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def test_add_file_to_store_with_custom_cert_file
7474
store.add_file @pem
7575
cert = OpenSSL::X509::Certificate.new(File.read(@pem))
7676

77-
p cert if $VERBOSE
77+
#p cert if $VERBOSE
7878

7979
verified = store.verify(cert)
8080
assert verified, "verification failed for cert: #{cert.inspect} - #{store.inspect}"
@@ -192,18 +192,12 @@ def test_verify
192192
ee_exts = [
193193
["keyUsage","keyEncipherment,digitalSignature",true],
194194
]
195-
ca1_cert = issue_cert(@ca1, @rsa2048, 1, now, now+3600, ca_exts,
196-
nil, nil, OpenSSL::Digest::SHA1.new)
197-
ca2_cert = issue_cert(@ca2, @rsa1024, 2, now, now+1800, ca_exts,
198-
ca1_cert, @rsa2048, OpenSSL::Digest::SHA1.new)
199-
ee1_cert = issue_cert(@ee1, @dsa256, 10, now, now+1800, ee_exts,
200-
ca2_cert, @rsa1024, OpenSSL::Digest::SHA1.new)
201-
ee2_cert = issue_cert(@ee2, @dsa512, 20, now, now+1800, ee_exts,
202-
ca2_cert, @rsa1024, OpenSSL::Digest::SHA1.new)
203-
ee3_cert = issue_cert(@ee2, @dsa512, 30, now-100, now-1, ee_exts,
204-
ca2_cert, @rsa1024, OpenSSL::Digest::SHA1.new)
205-
ee4_cert = issue_cert(@ee2, @dsa512, 40, now+1000, now+2000, ee_exts,
206-
ca2_cert, @rsa1024, OpenSSL::Digest::SHA1.new)
195+
ca1_cert = issue_cert(@ca1, @rsa2048, 1, ca_exts, nil, nil, not_before: now, not_after: now + 3600)
196+
ca2_cert = issue_cert(@ca2, @rsa1024, 2, ca_exts, ca1_cert, @rsa2048, not_before: now, not_after: now + 1800)
197+
ee1_cert = issue_cert(@ee1, @dsa256, 10, ee_exts, ca2_cert, @rsa1024, not_before: now, not_after: now + 1800)
198+
ee2_cert = issue_cert(@ee2, @dsa512, 20, ee_exts, ca2_cert, @rsa1024, not_before: now, not_after: now + 1800)
199+
ee3_cert = issue_cert(@ee2, @dsa512, 30, ee_exts, ca2_cert, @rsa1024, not_before: now - 100, not_after: now - 1)
200+
ee4_cert = issue_cert(@ee2, @dsa512, 40, ee_exts, ca2_cert, @rsa1024, not_before: now + 1000, not_after: now + 2000)
207201

208202
revoke_info = []
209203
crl1 = issue_crl(revoke_info, 1, now, now+1800, [],
@@ -408,20 +402,13 @@ def test_verify_same_subject_ca
408402
ee_exts = [
409403
["keyUsage","keyEncipherment,digitalSignature",true],
410404
]
411-
ca1_cert = issue_cert(@ca_same, @rsa1, 1, not_before, now - 60 * 60, ca_exts1,
412-
nil, nil, OpenSSL::Digest::SHA1.new)
413-
ca2_cert = issue_cert(@ca_same, @rsa2, 2, not_before, not_after, ca_exts2,
414-
nil, nil, OpenSSL::Digest::SHA1.new)
415-
ca3_cert = issue_cert(@ca_other, @rsa3, 3, not_before, not_after, ca_exts1,
416-
nil, nil, OpenSSL::Digest::SHA1.new)
417-
ca4_cert = issue_cert(@ca_same, @rsa4, 4, not_before, not_after, ca_exts1,
418-
nil, nil, OpenSSL::Digest::SHA1.new)
419-
ee1_cert = issue_cert(@ee1, @dsa1, 10, now - 60, now + 1800, ee_exts,
420-
ca1_cert, @rsa1, OpenSSL::Digest::SHA1.new)
421-
ee2_cert = issue_cert(@ee2, @dsa2, 20, now - 60, now + 1800, ee_exts,
422-
ca2_cert, @rsa2, OpenSSL::Digest::SHA1.new)
423-
ee4_cert = issue_cert(@ee4, @dsa2, 20, now - 60, now + 1800, ee_exts,
424-
ca4_cert, @rsa4, OpenSSL::Digest::SHA1.new)
405+
ca1_cert = issue_cert(@ca_same, @rsa1, 1, ca_exts1, nil, nil, not_before: not_before, not_after: now - 60 * 60)
406+
ca2_cert = issue_cert(@ca_same, @rsa2, 2, ca_exts2, nil, nil, not_before: not_before, not_after: not_after)
407+
ca3_cert = issue_cert(@ca_other, @rsa3, 3, ca_exts1, nil, nil, not_before: not_before, not_after: not_after)
408+
ca4_cert = issue_cert(@ca_same, @rsa4, 4, ca_exts1, nil, nil, not_before: not_before, not_after: not_after)
409+
ee1_cert = issue_cert(@ee1, @dsa1, 10, ee_exts, ca1_cert, @rsa1, not_before: now - 60, not_after: now + 1800)
410+
ee2_cert = issue_cert(@ee2, @dsa2, 20, ee_exts, ca2_cert, @rsa2, not_before: now - 60, not_after: now + 1800)
411+
ee4_cert = issue_cert(@ee4, @dsa2, 20, ee_exts, ca4_cert, @rsa4, not_before: now - 60, not_after: now + 1800)
425412

426413
cert_store = OpenSSL::X509::Store.new
427414
cert_store.add_cert ca1_cert

0 commit comments

Comments
 (0)