@@ -24,33 +24,35 @@ def test_add_file_path
24
24
cert2 = issue_cert ( cert2_subj , cert2_key , 1 , ca_exts , nil , nil )
25
25
26
26
# X509::Store#add_file reads concatenated PEM file
27
- tmpfile = Tempfile . open { |f | f << cert1 . to_pem << cert2 . to_pem ; f }
28
- store = OpenSSL ::X509 ::Store . new
29
- assert_equal false , store . verify ( cert1 )
30
- assert_equal false , store . verify ( cert2 )
31
- store . add_file ( tmpfile . path )
32
- assert_equal true , store . verify ( cert1 )
33
- assert_equal true , store . verify ( cert2 )
34
-
35
- # X509::Store#add_path
36
- Dir . mktmpdir do |dir |
37
- hash1 = "%08x.%d" % [ cert1_subj . hash , 0 ]
38
- File . write ( File . join ( dir , hash1 ) , cert1 . to_pem )
39
- store = OpenSSL ::X509 ::Store . new
40
- store . add_path ( dir )
27
+ Tempfile . open { |tmpfile |
28
+ tmpfile << cert1 . to_pem << cert2 . to_pem
29
+ tmpfile . close
41
30
42
- assert_equal true , store . verify ( cert1 )
31
+ store = OpenSSL ::X509 ::Store . new
32
+ assert_equal false , store . verify ( cert1 )
43
33
assert_equal false , store . verify ( cert2 )
44
- end
34
+ store . add_file ( tmpfile . path )
35
+ assert_equal true , store . verify ( cert1 )
36
+ assert_equal true , store . verify ( cert2 )
37
+
38
+ # X509::Store#add_path
39
+ Dir . mktmpdir do |dir |
40
+ hash1 = "%08x.%d" % [ cert1_subj . hash , 0 ]
41
+ File . write ( File . join ( dir , hash1 ) , cert1 . to_pem )
42
+ store = OpenSSL ::X509 ::Store . new
43
+ store . add_path ( dir )
45
44
46
- # OpenSSL < 1.1.1 leaks an error on a duplicate certificate
47
- assert_nothing_raised { store . add_file ( tmpfile . path ) }
48
- assert_equal [ ] , OpenSSL . errors
45
+ assert_equal true , store . verify ( cert1 )
46
+ assert_equal false , store . verify ( cert2 )
47
+ end
49
48
50
- # Non-String is given
51
- assert_raise ( TypeError ) { store . add_file ( nil ) }
52
- ensure
53
- tmpfile and tmpfile . close!
49
+ # OpenSSL < 1.1.1 leaks an error on a duplicate certificate
50
+ assert_nothing_raised { store . add_file ( tmpfile . path ) }
51
+ assert_equal [ ] , OpenSSL . errors
52
+
53
+ # Non-String is given
54
+ assert_raise ( TypeError ) { store . add_file ( nil ) }
55
+ }
54
56
end
55
57
56
58
def test_verify_simple
0 commit comments