jruby-openssl 0.10.1-java → 0.10.2-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ade549d7f3aa3abc46be8284b770710b54be15c7
4
- data.tar.gz: ebeb42397480403b859ddc8df78382228c5ad5d0
3
+ metadata.gz: 343b359b46d39883800a0aaba541f0f84ca42a2c
4
+ data.tar.gz: eb5936b080874abf7656fa8d0b27d6198248aa7c
5
5
  SHA512:
6
- metadata.gz: 90a72129e758c1296a5e9f99835b9321da3ce2542c4079647b5d9eef0ac8754b437378b0b088c6a6b5800495dda0f1d359cf470b6335bc288ddf184cd3cbaebc
7
- data.tar.gz: b706b8ed3d904e7ab69c50f2696aed1b20fd1cc42de1381f7e4db62992d975aa22bfb87a150c576d8a034688b009fe28a78d8b9cf3abb13fe708e72020a03191
6
+ metadata.gz: 05e7c1241d7762a10aef45024cd518ae3b7ac33642a5ff06868dcac49c0949cf4c5d376d7cede4f5bf86b2660318ac767af1fd2bae90bd2bc6a1855228980a88
7
+ data.tar.gz: 12ed4b28cc7a408d72e6f9b46120468c1d5d14f35cde805528d4793d8392d3ad73ed420b0350a2967b5613c38aab4adde4e19836101c73050be2f82305bb4352
data/History.md CHANGED
@@ -1,3 +1,12 @@
1
+ ## 0.10.2
2
+
3
+ * update Bouncy-Castle to 1.61 (and handle supported BC compatibility)
4
+ * [fix] avoid NPE when CRL fails to parse (invalid str) (jruby/jruby#5619)
5
+ * hide (deprecated) Jopenssl constant
6
+ * default OpenSSL.warn to warnings-enabled flag
7
+ * only un-restrict jce when its restricted
8
+ * OpenSSL::Cipher#update additional buffer argument (#170) (jruby/jruby#5242)
9
+
1
10
  ## 0.10.1
2
11
 
3
12
  * loading JOpenSSL's native ext part the JRuby 9.2 (internal) way
data/Mavenfile CHANGED
@@ -49,6 +49,7 @@ plugin( :compiler, '3.1',
49
49
  :source => '1.7', :target => java_target,
50
50
  :encoding => 'UTF-8', :debug => true,
51
51
  :showWarnings => true, :showDeprecation => true,
52
+ :excludes => [ 'module-info.java' ],
52
53
 
53
54
  :generatedSourcesDirectory => gen_sources,
54
55
  :annotationProcessors => [ 'org.jruby.anno.AnnotationBinder' ],
@@ -67,6 +68,11 @@ plugin( :compiler, '3.1',
67
68
  # NOTE: maybe '-J-Xbootclasspath/p:${unsafe.jar}' ... as well ?!
68
69
  end
69
70
 
71
+ profile 'module-info' do
72
+ activation { jdk '[9,)' }
73
+ plugin :compiler, '3.1', :source => '9', :target => java_target, :includes => [ 'module-info.java' ]
74
+ end
75
+
70
76
  plugin :clean do
71
77
  execute_goals( 'clean', :id => 'default-clean', :phase => 'clean',
72
78
  'filesets' => [
@@ -92,25 +98,24 @@ plugin :deploy, '2.8.1' do
92
98
  execute_goals( :deploy, :skip => false )
93
99
  end
94
100
 
95
- supported_bc_versions = %w{ 1.55 1.56 1.57 1.58 1.59 }
101
+ supported_bc_versions = %w{ 1.55 1.56 1.57 1.58 1.59 1.60 1.61 }
96
102
 
97
103
  default_bc_version = File.read File.expand_path('lib/jopenssl/version.rb', File.dirname(__FILE__))
98
104
  default_bc_version = default_bc_version[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1]
99
105
 
100
- properties( 'jruby.plugins.version' => '1.0.10',
101
- 'jruby.versions' => '1.7.20',
106
+ properties( 'jruby.plugins.version' => '1.1.6',
107
+ 'jruby.versions' => '9.1.17.0',
108
+ 'jruby.switches' => '-W0', # https://github.com/torquebox/jruby-maven-plugins/issues/94
102
109
  'bc.versions' => default_bc_version,
103
110
  'invoker.test' => '${bc.versions}',
104
111
  # allow to skip all tests with -Dmaven.test.skip
105
112
  'invoker.skip' => '${maven.test.skip}',
106
113
  'runit.dir' => 'src/test/ruby/**/test_*.rb',
107
114
  # use this version of jruby for ALL the jruby-maven-plugins
108
- 'jruby.version' => '1.7.20',
115
+ 'jruby.version' => '9.1.17.0', # Java 7 compatible till supporting JRuby 1.7
109
116
  # dump pom.xml as readonly when running 'rmvn'
110
117
  'polyglot.dump.pom' => 'pom.xml',
111
- 'polyglot.dump.readonly' => true,
112
- 'tesla.dump.pom' => 'pom.xml',
113
- 'tesla.dump.readonly' => true )
118
+ 'polyglot.dump.readonly' => true )
114
119
 
115
120
  # make sure we have the embedded jars in place before we run runit plugin
116
121
  plugin! :dependency do
@@ -137,34 +142,35 @@ invoker_run_options = {
137
142
  'runit.dir' => '${runit.dir}' }
138
143
  }
139
144
 
140
- jruby_1_7_versions = %w{ 1.7.18 1.7.20 1.7.22 1.7.23 1.7.24 1.7.25 1.7.26 1.7.27 }
145
+ jruby_1_7_versions = %w{ 1.7.20 1.7.22 1.7.23 1.7.24 1.7.25 1.7.26 1.7.27 }
141
146
 
142
147
  jruby_1_7_versions.each { |version|
143
148
  profile :id => "test-#{version}" do
144
149
  plugin :invoker, '1.8' do
145
150
  execute_goals( :install, :run, invoker_run_options )
146
151
  end
147
- properties 'jruby.versions' => version, 'jruby.modes' => '1.9,2.0',
152
+ properties 'jruby.versions' => version,
153
+ 'jruby.modes' => '1.9,2.0',
148
154
  'bc.versions' => supported_bc_versions.join(',')
149
155
  end
150
156
  }
151
157
 
152
- jruby_9_K_versions = %w{ 9.0.1.0 9.0.5.0 9.1.2.0 9.1.8.0 9.1.12.0 9.1.16.0 9.1.17.0 9.2.0.0 }
158
+ jruby_9_K_versions = %w{ 9.0.1.0 9.0.5.0 9.1.2.0 9.1.8.0 9.1.12.0 9.1.16.0 9.1.17.0 }
159
+ jruby_9_K_versions += %w{ 9.2.0.0 9.2.5.0 9.2.6.0 }
153
160
 
154
161
  jruby_9_K_versions.each { |version|
155
162
  profile :id => "test-#{version}" do
156
163
  plugin :invoker, '1.8' do
157
164
  execute_goals( :install, :run, invoker_run_options )
158
165
  end
159
- # NOTE: we're work-around 9K maven-runit version bug (due minitest changes) !
160
- # ... still can not build with 9K : https://github.com/jruby/jruby/issues/3184
161
- properties 'jruby.version' => version, 'jruby.versions' => version,
166
+ properties 'jruby.version' => version,
167
+ 'jruby.versions' => version,
162
168
  'bc.versions' => supported_bc_versions.join(',')
163
169
  end
164
170
  }
165
171
 
166
172
  profile :id => 'release' do
167
- plugin :gpg, '1.5' do
173
+ plugin :gpg, '1.6' do
168
174
  execute_goal :sign, :phase => :verify
169
175
  end
170
176
  end
Binary file
@@ -1,5 +1,9 @@
1
1
  module JOpenSSL
2
- VERSION = '0.10.1'
3
- BOUNCY_CASTLE_VERSION = '1.59'
2
+ VERSION = '0.10.2'
3
+ BOUNCY_CASTLE_VERSION = '1.61'
4
4
  end
5
- Jopenssl = JOpenSSL
5
+
6
+ Object.class_eval do
7
+ Jopenssl = JOpenSSL
8
+ private_constant :Jopenssl if respond_to?(:private_constant)
9
+ end
@@ -316,20 +316,15 @@ module OpenSSL::Buffering
316
316
  @wbuffer << s
317
317
  @wbuffer.force_encoding(Encoding::BINARY)
318
318
  @sync ||= false
319
- if @sync or @wbuffer.size > BLOCK_SIZE or idx = @wbuffer.rindex($/)
320
- remain = idx ? idx + $/.size : @wbuffer.length
321
- nwritten = 0
322
- while remain > 0
323
- str = @wbuffer[nwritten,remain]
319
+ if @sync or @wbuffer.size > BLOCK_SIZE
320
+ until @wbuffer.empty?
324
321
  begin
325
- nwrote = syswrite(str)
322
+ nwrote = syswrite(@wbuffer)
326
323
  rescue Errno::EAGAIN
327
324
  retry
328
325
  end
329
- remain -= nwrote
330
- nwritten += nwrote
326
+ @wbuffer[0, nwrote] = ""
331
327
  end
332
- @wbuffer[0,nwritten] = ""
333
328
  end
334
329
  end
335
330
 
@@ -409,9 +404,7 @@ module OpenSSL::Buffering
409
404
  end
410
405
  args.each{|arg|
411
406
  s << arg.to_s
412
- if $/ && /\n\z/ !~ s
413
- s << "\n"
414
- end
407
+ s.sub!(/(?<!\n)\z/, "\n")
415
408
  }
416
409
  do_write(s)
417
410
  nil
@@ -17,55 +17,55 @@ module OpenSSL
17
17
  module SSL
18
18
  class SSLContext
19
19
  unless const_defined? :DEFAULT_PARAMS # JRuby does it in Java
20
- DEFAULT_PARAMS = { # :nodoc:
21
- :min_version => OpenSSL::SSL::TLS1_VERSION,
22
- :verify_mode => OpenSSL::SSL::VERIFY_PEER,
23
- :verify_hostname => true,
24
- :options => -> {
25
- opts = OpenSSL::SSL::OP_ALL
26
- opts &= ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS
27
- opts |= OpenSSL::SSL::OP_NO_COMPRESSION
28
- opts
29
- }.call
30
- }
20
+ DEFAULT_PARAMS = { # :nodoc:
21
+ :min_version => OpenSSL::SSL::TLS1_VERSION,
22
+ :verify_mode => OpenSSL::SSL::VERIFY_PEER,
23
+ :verify_hostname => true,
24
+ :options => -> {
25
+ opts = OpenSSL::SSL::OP_ALL
26
+ opts &= ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS
27
+ opts |= OpenSSL::SSL::OP_NO_COMPRESSION
28
+ opts
29
+ }.call
30
+ }
31
31
 
32
- if !(OpenSSL::OPENSSL_VERSION.start_with?("OpenSSL") &&
33
- OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10100000)
34
- DEFAULT_PARAMS.merge!(
35
- ciphers: %w{
36
- ECDHE-ECDSA-AES128-GCM-SHA256
37
- ECDHE-RSA-AES128-GCM-SHA256
38
- ECDHE-ECDSA-AES256-GCM-SHA384
39
- ECDHE-RSA-AES256-GCM-SHA384
40
- DHE-RSA-AES128-GCM-SHA256
41
- DHE-DSS-AES128-GCM-SHA256
42
- DHE-RSA-AES256-GCM-SHA384
43
- DHE-DSS-AES256-GCM-SHA384
44
- ECDHE-ECDSA-AES128-SHA256
45
- ECDHE-RSA-AES128-SHA256
46
- ECDHE-ECDSA-AES128-SHA
47
- ECDHE-RSA-AES128-SHA
48
- ECDHE-ECDSA-AES256-SHA384
49
- ECDHE-RSA-AES256-SHA384
50
- ECDHE-ECDSA-AES256-SHA
51
- ECDHE-RSA-AES256-SHA
52
- DHE-RSA-AES128-SHA256
53
- DHE-RSA-AES256-SHA256
54
- DHE-RSA-AES128-SHA
55
- DHE-RSA-AES256-SHA
56
- DHE-DSS-AES128-SHA256
57
- DHE-DSS-AES256-SHA256
58
- DHE-DSS-AES128-SHA
59
- DHE-DSS-AES256-SHA
60
- AES128-GCM-SHA256
61
- AES256-GCM-SHA384
62
- AES128-SHA256
63
- AES256-SHA256
64
- AES128-SHA
65
- AES256-SHA
66
- }.join(":"),
67
- )
68
- end
32
+ if !(OpenSSL::OPENSSL_VERSION.start_with?("OpenSSL") &&
33
+ OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10100000)
34
+ DEFAULT_PARAMS.merge!(
35
+ ciphers: %w{
36
+ ECDHE-ECDSA-AES128-GCM-SHA256
37
+ ECDHE-RSA-AES128-GCM-SHA256
38
+ ECDHE-ECDSA-AES256-GCM-SHA384
39
+ ECDHE-RSA-AES256-GCM-SHA384
40
+ DHE-RSA-AES128-GCM-SHA256
41
+ DHE-DSS-AES128-GCM-SHA256
42
+ DHE-RSA-AES256-GCM-SHA384
43
+ DHE-DSS-AES256-GCM-SHA384
44
+ ECDHE-ECDSA-AES128-SHA256
45
+ ECDHE-RSA-AES128-SHA256
46
+ ECDHE-ECDSA-AES128-SHA
47
+ ECDHE-RSA-AES128-SHA
48
+ ECDHE-ECDSA-AES256-SHA384
49
+ ECDHE-RSA-AES256-SHA384
50
+ ECDHE-ECDSA-AES256-SHA
51
+ ECDHE-RSA-AES256-SHA
52
+ DHE-RSA-AES128-SHA256
53
+ DHE-RSA-AES256-SHA256
54
+ DHE-RSA-AES128-SHA
55
+ DHE-RSA-AES256-SHA
56
+ DHE-DSS-AES128-SHA256
57
+ DHE-DSS-AES256-SHA256
58
+ DHE-DSS-AES128-SHA
59
+ DHE-DSS-AES256-SHA
60
+ AES128-GCM-SHA256
61
+ AES256-GCM-SHA384
62
+ AES128-SHA256
63
+ AES256-SHA256
64
+ AES128-SHA
65
+ AES256-SHA
66
+ }.join(":"),
67
+ )
68
+ end
69
69
  end
70
70
 
71
71
  if defined?(OpenSSL::PKey::DH)
@@ -111,6 +111,21 @@ YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3
111
111
  # callback must return an SSLContext for the server name or nil.
112
112
  attr_accessor :servername_cb
113
113
 
114
+ # call-seq:
115
+ # SSLContext.new -> ctx
116
+ # SSLContext.new(:TLSv1) -> ctx
117
+ # SSLContext.new("SSLv23") -> ctx
118
+ #
119
+ # Creates a new SSL context.
120
+ #
121
+ # If an argument is given, #ssl_version= is called with the value. Note
122
+ # that this form is deprecated. New applications should use #min_version=
123
+ # and #max_version= as necessary.
124
+ # def initialize(version = nil)
125
+ # self.options |= OpenSSL::SSL::OP_ALL
126
+ # self.ssl_version = version if version
127
+ # end
128
+
114
129
  ##
115
130
  # call-seq:
116
131
  # ctx.set_params(params = {}) -> params
@@ -14,6 +14,54 @@
14
14
 
15
15
  module OpenSSL
16
16
  module X509
17
+ # class ExtensionFactory
18
+ # def create_extension(*arg)
19
+ # if arg.size > 1
20
+ # create_ext(*arg)
21
+ # else
22
+ # send("create_ext_from_"+arg[0].class.name.downcase, arg[0])
23
+ # end
24
+ # end
25
+ #
26
+ # def create_ext_from_array(ary)
27
+ # raise ExtensionError, "unexpected array form" if ary.size > 3
28
+ # create_ext(ary[0], ary[1], ary[2])
29
+ # end
30
+ #
31
+ # def create_ext_from_string(str) # "oid = critical, value"
32
+ # oid, value = str.split(/=/, 2)
33
+ # oid.strip!
34
+ # value.strip!
35
+ # create_ext(oid, value)
36
+ # end
37
+ #
38
+ # def create_ext_from_hash(hash)
39
+ # create_ext(hash["oid"], hash["value"], hash["critical"])
40
+ # end
41
+ # end
42
+ #
43
+ # class Extension
44
+ # def ==(other)
45
+ # return false unless Extension === other
46
+ # to_der == other.to_der
47
+ # end
48
+ #
49
+ # def to_s # "oid = critical, value"
50
+ # str = self.oid
51
+ # str << " = "
52
+ # str << "critical, " if self.critical?
53
+ # str << self.value.gsub(/\n/, ", ")
54
+ # end
55
+ #
56
+ # def to_h # {"oid"=>sn|ln, "value"=>value, "critical"=>true|false}
57
+ # {"oid"=>self.oid,"value"=>self.value,"critical"=>self.critical?}
58
+ # end
59
+ #
60
+ # def to_a
61
+ # [ self.oid, self.value, self.critical? ]
62
+ # end
63
+ # end
64
+
17
65
  class Name
18
66
  module RFC2253DN
19
67
  Special = ',=+<>#;'
@@ -117,6 +165,13 @@ module OpenSSL
117
165
  end
118
166
  end
119
167
 
168
+ # class Attribute
169
+ # def ==(other)
170
+ # return false unless Attribute === other
171
+ # to_der == other.to_der
172
+ # end
173
+ # end
174
+
120
175
  class StoreContext
121
176
  def cleanup
122
177
  warn "(#{caller.first}) OpenSSL::X509::StoreContext#cleanup is deprecated with no replacement" if $VERBOSE
@@ -135,5 +190,19 @@ module OpenSSL
135
190
  }
136
191
  end
137
192
  end
193
+
194
+ # class CRL
195
+ # def ==(other)
196
+ # return false unless CRL === other
197
+ # to_der == other.to_der
198
+ # end
199
+ # end
200
+
201
+ # class Request
202
+ # def ==(other)
203
+ # return false unless Request === other
204
+ # to_der == other.to_der
205
+ # end
206
+ # end
138
207
  end
139
208
  end
data/pom.xml CHANGED
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
11
11
  <modelVersion>4.0.0</modelVersion>
12
12
  <groupId>rubygems</groupId>
13
13
  <artifactId>jruby-openssl</artifactId>
14
- <version>0.10.1</version>
14
+ <version>0.10.2</version>
15
15
  <packaging>gem</packaging>
16
16
  <name>JRuby OpenSSL</name>
17
17
  <description>JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.</description>
@@ -34,9 +34,12 @@ DO NOT MODIFIY - GENERATED CODE
34
34
  </license>
35
35
  </licenses>
36
36
  <developers>
37
+ <developer>
38
+ <name>Karol Bucek</name>
39
+ <email>self+jruby-openssl@kares.org</email>
40
+ </developer>
37
41
  <developer>
38
42
  <name>Ola Bini</name>
39
- <email>ola.bini@gmail.com</email>
40
43
  </developer>
41
44
  <developer>
42
45
  <name>JRuby contributors</name>
@@ -57,17 +60,17 @@ DO NOT MODIFIY - GENERATED CODE
57
60
  </snapshotRepository>
58
61
  </distributionManagement>
59
62
  <properties>
60
- <bc.versions>1.59</bc.versions>
61
- <jruby.plugins.version>1.0.10</jruby.plugins.version>
63
+ <bc.versions>1.61</bc.versions>
62
64
  <invoker.skip>${maven.test.skip}</invoker.skip>
63
- <jruby.version>1.7.20</jruby.version>
64
- <runit.dir>src/test/ruby/**/test_*.rb</runit.dir>
65
- <jruby.versions>1.7.20</jruby.versions>
66
- <polyglot.dump.readonly>true</polyglot.dump.readonly>
67
- <tesla.dump.pom>pom.xml</tesla.dump.pom>
68
- <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
69
- <tesla.dump.readonly>true</tesla.dump.readonly>
70
65
  <invoker.test>${bc.versions}</invoker.test>
66
+ <jruby.plugins.version>1.1.6</jruby.plugins.version>
67
+ <jruby.switches>-W0</jruby.switches>
68
+ <jruby.version>9.1.17.0</jruby.version>
69
+ <jruby.versions>9.1.17.0</jruby.versions>
70
+ <mavengem.wagon.version>0.2.1</mavengem.wagon.version>
71
+ <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
72
+ <polyglot.dump.readonly>true</polyglot.dump.readonly>
73
+ <runit.dir>src/test/ruby/**/test_*.rb</runit.dir>
71
74
  </properties>
72
75
  <dependencies>
73
76
  <dependency>
@@ -94,17 +97,17 @@ DO NOT MODIFIY - GENERATED CODE
94
97
  <dependency>
95
98
  <groupId>org.bouncycastle</groupId>
96
99
  <artifactId>bcprov-jdk15on</artifactId>
97
- <version>1.59</version>
100
+ <version>1.61</version>
98
101
  </dependency>
99
102
  <dependency>
100
103
  <groupId>org.bouncycastle</groupId>
101
104
  <artifactId>bcpkix-jdk15on</artifactId>
102
- <version>1.59</version>
105
+ <version>1.61</version>
103
106
  </dependency>
104
107
  <dependency>
105
108
  <groupId>org.bouncycastle</groupId>
106
109
  <artifactId>bctls-jdk15on</artifactId>
107
- <version>1.59</version>
110
+ <version>1.61</version>
108
111
  </dependency>
109
112
  <dependency>
110
113
  <groupId>org.jruby</groupId>
@@ -121,12 +124,17 @@ DO NOT MODIFIY - GENERATED CODE
121
124
  </dependencies>
122
125
  <repositories>
123
126
  <repository>
124
- <id>rubygems-releases</id>
125
- <url>http://rubygems-proxy.torquebox.org/releases</url>
127
+ <id>mavengems</id>
128
+ <url>mavengem:https://rubygems.org</url>
126
129
  </repository>
127
130
  </repositories>
128
131
  <build>
129
132
  <extensions>
133
+ <extension>
134
+ <groupId>org.torquebox.mojo</groupId>
135
+ <artifactId>mavengem-wagon</artifactId>
136
+ <version>${mavengem.wagon.version}</version>
137
+ </extension>
130
138
  <extension>
131
139
  <groupId>de.saumya.mojo</groupId>
132
140
  <artifactId>gem-with-jar-extension</artifactId>
@@ -278,6 +286,9 @@ DO NOT MODIFIY - GENERATED CODE
278
286
  <debug>true</debug>
279
287
  <showWarnings>true</showWarnings>
280
288
  <showDeprecation>true</showDeprecation>
289
+ <excludes>
290
+ <exclude>module-info.java</exclude>
291
+ </excludes>
281
292
  <generatedSourcesDirectory>${basedir}/target/generated-sources</generatedSourcesDirectory>
282
293
  <annotationProcessors>
283
294
  <annotationProcessor>org.jruby.anno.AnnotationBinder</annotationProcessor>
@@ -368,43 +379,25 @@ DO NOT MODIFIY - GENERATED CODE
368
379
  </build>
369
380
  <profiles>
370
381
  <profile>
371
- <id>test-1.7.18</id>
382
+ <id>module-info</id>
383
+ <activation>
384
+ <jdk>[9,)</jdk>
385
+ </activation>
372
386
  <build>
373
387
  <plugins>
374
388
  <plugin>
375
- <artifactId>maven-invoker-plugin</artifactId>
376
- <version>1.8</version>
377
- <executions>
378
- <execution>
379
- <id>tests-with-different-bc-versions</id>
380
- <goals>
381
- <goal>install</goal>
382
- <goal>run</goal>
383
- </goals>
384
- <configuration>
385
- <projectsDirectory>integration</projectsDirectory>
386
- <pomIncludes>
387
- <pomInclude>*/pom.xml</pomInclude>
388
- </pomIncludes>
389
- <streamLogs>true</streamLogs>
390
- <properties>
391
- <jruby.versions>${jruby.versions}</jruby.versions>
392
- <jruby.modes>${jruby.modes}</jruby.modes>
393
- <jruby.openssl.version>${project.version}</jruby.openssl.version>
394
- <bc.versions>${bc.versions}</bc.versions>
395
- <runit.dir>${runit.dir}</runit.dir>
396
- </properties>
397
- </configuration>
398
- </execution>
399
- </executions>
389
+ <artifactId>maven-compiler-plugin</artifactId>
390
+ <version>3.1</version>
391
+ <configuration>
392
+ <source>9</source>
393
+ <target>1.7</target>
394
+ <includes>
395
+ <include>module-info.java</include>
396
+ </includes>
397
+ </configuration>
400
398
  </plugin>
401
399
  </plugins>
402
400
  </build>
403
- <properties>
404
- <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
405
- <jruby.modes>1.9,2.0</jruby.modes>
406
- <jruby.versions>1.7.18</jruby.versions>
407
- </properties>
408
401
  </profile>
409
402
  <profile>
410
403
  <id>test-1.7.20</id>
@@ -415,6 +408,7 @@ DO NOT MODIFIY - GENERATED CODE
415
408
  <version>1.8</version>
416
409
  <executions>
417
410
  <execution>
411
+ <id>tests-with-different-bc-versions</id>
418
412
  <goals>
419
413
  <goal>install</goal>
420
414
  <goal>run</goal>
@@ -439,7 +433,7 @@ DO NOT MODIFIY - GENERATED CODE
439
433
  </plugins>
440
434
  </build>
441
435
  <properties>
442
- <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
436
+ <bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
443
437
  <jruby.modes>1.9,2.0</jruby.modes>
444
438
  <jruby.versions>1.7.20</jruby.versions>
445
439
  </properties>
@@ -477,7 +471,7 @@ DO NOT MODIFIY - GENERATED CODE
477
471
  </plugins>
478
472
  </build>
479
473
  <properties>
480
- <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
474
+ <bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
481
475
  <jruby.modes>1.9,2.0</jruby.modes>
482
476
  <jruby.versions>1.7.22</jruby.versions>
483
477
  </properties>
@@ -515,7 +509,7 @@ DO NOT MODIFIY - GENERATED CODE
515
509
  </plugins>
516
510
  </build>
517
511
  <properties>
518
- <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
512
+ <bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
519
513
  <jruby.modes>1.9,2.0</jruby.modes>
520
514
  <jruby.versions>1.7.23</jruby.versions>
521
515
  </properties>
@@ -553,7 +547,7 @@ DO NOT MODIFIY - GENERATED CODE
553
547
  </plugins>
554
548
  </build>
555
549
  <properties>
556
- <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
550
+ <bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
557
551
  <jruby.modes>1.9,2.0</jruby.modes>
558
552
  <jruby.versions>1.7.24</jruby.versions>
559
553
  </properties>
@@ -591,7 +585,7 @@ DO NOT MODIFIY - GENERATED CODE
591
585
  </plugins>
592
586
  </build>
593
587
  <properties>
594
- <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
588
+ <bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
595
589
  <jruby.modes>1.9,2.0</jruby.modes>
596
590
  <jruby.versions>1.7.25</jruby.versions>
597
591
  </properties>
@@ -629,7 +623,7 @@ DO NOT MODIFIY - GENERATED CODE
629
623
  </plugins>
630
624
  </build>
631
625
  <properties>
632
- <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
626
+ <bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
633
627
  <jruby.modes>1.9,2.0</jruby.modes>
634
628
  <jruby.versions>1.7.26</jruby.versions>
635
629
  </properties>
@@ -667,7 +661,7 @@ DO NOT MODIFIY - GENERATED CODE
667
661
  </plugins>
668
662
  </build>
669
663
  <properties>
670
- <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
664
+ <bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
671
665
  <jruby.modes>1.9,2.0</jruby.modes>
672
666
  <jruby.versions>1.7.27</jruby.versions>
673
667
  </properties>
@@ -705,7 +699,7 @@ DO NOT MODIFIY - GENERATED CODE
705
699
  </plugins>
706
700
  </build>
707
701
  <properties>
708
- <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
702
+ <bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
709
703
  <jruby.version>9.0.1.0</jruby.version>
710
704
  <jruby.versions>9.0.1.0</jruby.versions>
711
705
  </properties>
@@ -743,7 +737,7 @@ DO NOT MODIFIY - GENERATED CODE
743
737
  </plugins>
744
738
  </build>
745
739
  <properties>
746
- <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
740
+ <bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
747
741
  <jruby.version>9.0.5.0</jruby.version>
748
742
  <jruby.versions>9.0.5.0</jruby.versions>
749
743
  </properties>
@@ -781,7 +775,7 @@ DO NOT MODIFIY - GENERATED CODE
781
775
  </plugins>
782
776
  </build>
783
777
  <properties>
784
- <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
778
+ <bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
785
779
  <jruby.version>9.1.2.0</jruby.version>
786
780
  <jruby.versions>9.1.2.0</jruby.versions>
787
781
  </properties>
@@ -819,7 +813,7 @@ DO NOT MODIFIY - GENERATED CODE
819
813
  </plugins>
820
814
  </build>
821
815
  <properties>
822
- <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
816
+ <bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
823
817
  <jruby.version>9.1.8.0</jruby.version>
824
818
  <jruby.versions>9.1.8.0</jruby.versions>
825
819
  </properties>
@@ -857,7 +851,7 @@ DO NOT MODIFIY - GENERATED CODE
857
851
  </plugins>
858
852
  </build>
859
853
  <properties>
860
- <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
854
+ <bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
861
855
  <jruby.version>9.1.12.0</jruby.version>
862
856
  <jruby.versions>9.1.12.0</jruby.versions>
863
857
  </properties>
@@ -895,7 +889,7 @@ DO NOT MODIFIY - GENERATED CODE
895
889
  </plugins>
896
890
  </build>
897
891
  <properties>
898
- <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
892
+ <bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
899
893
  <jruby.version>9.1.16.0</jruby.version>
900
894
  <jruby.versions>9.1.16.0</jruby.versions>
901
895
  </properties>
@@ -933,7 +927,7 @@ DO NOT MODIFIY - GENERATED CODE
933
927
  </plugins>
934
928
  </build>
935
929
  <properties>
936
- <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
930
+ <bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
937
931
  <jruby.version>9.1.17.0</jruby.version>
938
932
  <jruby.versions>9.1.17.0</jruby.versions>
939
933
  </properties>
@@ -971,18 +965,94 @@ DO NOT MODIFIY - GENERATED CODE
971
965
  </plugins>
972
966
  </build>
973
967
  <properties>
974
- <bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
968
+ <bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
975
969
  <jruby.version>9.2.0.0</jruby.version>
976
970
  <jruby.versions>9.2.0.0</jruby.versions>
977
971
  </properties>
978
972
  </profile>
973
+ <profile>
974
+ <id>test-9.2.5.0</id>
975
+ <build>
976
+ <plugins>
977
+ <plugin>
978
+ <artifactId>maven-invoker-plugin</artifactId>
979
+ <version>1.8</version>
980
+ <executions>
981
+ <execution>
982
+ <goals>
983
+ <goal>install</goal>
984
+ <goal>run</goal>
985
+ </goals>
986
+ <configuration>
987
+ <projectsDirectory>integration</projectsDirectory>
988
+ <pomIncludes>
989
+ <pomInclude>*/pom.xml</pomInclude>
990
+ </pomIncludes>
991
+ <streamLogs>true</streamLogs>
992
+ <properties>
993
+ <jruby.versions>${jruby.versions}</jruby.versions>
994
+ <jruby.modes>${jruby.modes}</jruby.modes>
995
+ <jruby.openssl.version>${project.version}</jruby.openssl.version>
996
+ <bc.versions>${bc.versions}</bc.versions>
997
+ <runit.dir>${runit.dir}</runit.dir>
998
+ </properties>
999
+ </configuration>
1000
+ </execution>
1001
+ </executions>
1002
+ </plugin>
1003
+ </plugins>
1004
+ </build>
1005
+ <properties>
1006
+ <bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
1007
+ <jruby.version>9.2.5.0</jruby.version>
1008
+ <jruby.versions>9.2.5.0</jruby.versions>
1009
+ </properties>
1010
+ </profile>
1011
+ <profile>
1012
+ <id>test-9.2.6.0</id>
1013
+ <build>
1014
+ <plugins>
1015
+ <plugin>
1016
+ <artifactId>maven-invoker-plugin</artifactId>
1017
+ <version>1.8</version>
1018
+ <executions>
1019
+ <execution>
1020
+ <goals>
1021
+ <goal>install</goal>
1022
+ <goal>run</goal>
1023
+ </goals>
1024
+ <configuration>
1025
+ <projectsDirectory>integration</projectsDirectory>
1026
+ <pomIncludes>
1027
+ <pomInclude>*/pom.xml</pomInclude>
1028
+ </pomIncludes>
1029
+ <streamLogs>true</streamLogs>
1030
+ <properties>
1031
+ <jruby.versions>${jruby.versions}</jruby.versions>
1032
+ <jruby.modes>${jruby.modes}</jruby.modes>
1033
+ <jruby.openssl.version>${project.version}</jruby.openssl.version>
1034
+ <bc.versions>${bc.versions}</bc.versions>
1035
+ <runit.dir>${runit.dir}</runit.dir>
1036
+ </properties>
1037
+ </configuration>
1038
+ </execution>
1039
+ </executions>
1040
+ </plugin>
1041
+ </plugins>
1042
+ </build>
1043
+ <properties>
1044
+ <bc.versions>1.55,1.56,1.57,1.58,1.59,1.60,1.61</bc.versions>
1045
+ <jruby.version>9.2.6.0</jruby.version>
1046
+ <jruby.versions>9.2.6.0</jruby.versions>
1047
+ </properties>
1048
+ </profile>
979
1049
  <profile>
980
1050
  <id>release</id>
981
1051
  <build>
982
1052
  <plugins>
983
1053
  <plugin>
984
1054
  <artifactId>maven-gpg-plugin</artifactId>
985
- <version>1.5</version>
1055
+ <version>1.6</version>
986
1056
  <executions>
987
1057
  <execution>
988
1058
  <phase>verify</phase>
metadata CHANGED
@@ -1,20 +1,21 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jruby-openssl
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.1
4
+ version: 0.10.2
5
5
  platform: java
6
6
  authors:
7
+ - Karol Bucek
7
8
  - Ola Bini
8
9
  - JRuby contributors
9
10
  autorequire:
10
11
  bindir: bin
11
12
  cert_chain: []
12
- date: 2018-06-22 00:00:00.000000000 Z
13
+ date: 2019-03-01 00:00:00.000000000 Z
13
14
  dependencies:
14
15
  - !ruby/object:Gem::Dependency
15
16
  requirement: !ruby/object:Gem::Requirement
16
17
  requirements:
17
- - - ~>
18
+ - - "~>"
18
19
  - !ruby/object:Gem::Version
19
20
  version: '0.1'
20
21
  name: jar-dependencies
@@ -22,13 +23,13 @@ dependencies:
22
23
  type: :development
23
24
  version_requirements: !ruby/object:Gem::Requirement
24
25
  requirements:
25
- - - ~>
26
+ - - "~>"
26
27
  - !ruby/object:Gem::Version
27
28
  version: '0.1'
28
29
  - !ruby/object:Gem::Dependency
29
30
  requirement: !ruby/object:Gem::Requirement
30
31
  requirements:
31
- - - ~>
32
+ - - "~>"
32
33
  - !ruby/object:Gem::Version
33
34
  version: 1.1.0
34
35
  name: mocha
@@ -36,13 +37,13 @@ dependencies:
36
37
  type: :development
37
38
  version_requirements: !ruby/object:Gem::Requirement
38
39
  requirements:
39
- - - ~>
40
+ - - "~>"
40
41
  - !ruby/object:Gem::Version
41
42
  version: 1.1.0
42
43
  - !ruby/object:Gem::Dependency
43
44
  requirement: !ruby/object:Gem::Requirement
44
45
  requirements:
45
- - - ~>
46
+ - - "~>"
46
47
  - !ruby/object:Gem::Version
47
48
  version: '3.0'
48
49
  name: ruby-maven
@@ -50,11 +51,11 @@ dependencies:
50
51
  type: :development
51
52
  version_requirements: !ruby/object:Gem::Requirement
52
53
  requirements:
53
- - - ~>
54
+ - - "~>"
54
55
  - !ruby/object:Gem::Version
55
56
  version: '3.0'
56
57
  description: JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.
57
- email: ola.bini@gmail.com
58
+ email: self+jruby-openssl@kares.org
58
59
  executables: []
59
60
  extensions: []
60
61
  extra_rdoc_files: []
@@ -117,9 +118,9 @@ files:
117
118
  - lib/openssl/ssl.rb
118
119
  - lib/openssl/x509-internal.rb
119
120
  - lib/openssl/x509.rb
120
- - lib/org/bouncycastle/bcpkix-jdk15on/1.59/bcpkix-jdk15on-1.59.jar
121
- - lib/org/bouncycastle/bcprov-jdk15on/1.59/bcprov-jdk15on-1.59.jar
122
- - lib/org/bouncycastle/bctls-jdk15on/1.59/bctls-jdk15on-1.59.jar
121
+ - lib/org/bouncycastle/bcpkix-jdk15on/1.61/bcpkix-jdk15on-1.61.jar
122
+ - lib/org/bouncycastle/bcprov-jdk15on/1.61/bcprov-jdk15on-1.61.jar
123
+ - lib/org/bouncycastle/bctls-jdk15on/1.61/bctls-jdk15on-1.61.jar
123
124
  - pom.xml
124
125
  homepage: https://github.com/jruby/jruby-openssl
125
126
  licenses:
@@ -133,20 +134,20 @@ require_paths:
133
134
  - lib
134
135
  required_ruby_version: !ruby/object:Gem::Requirement
135
136
  requirements:
136
- - - '>='
137
+ - - ">="
137
138
  - !ruby/object:Gem::Version
138
139
  version: 1.9.3
139
140
  required_rubygems_version: !ruby/object:Gem::Requirement
140
141
  requirements:
141
- - - '>='
142
+ - - ">="
142
143
  - !ruby/object:Gem::Version
143
144
  version: 2.4.8
144
145
  requirements:
145
- - jar org.bouncycastle:bcprov-jdk15on, 1.59
146
- - jar org.bouncycastle:bcpkix-jdk15on, 1.59
147
- - jar org.bouncycastle:bctls-jdk15on, 1.59
146
+ - jar org.bouncycastle:bcprov-jdk15on, 1.61
147
+ - jar org.bouncycastle:bcpkix-jdk15on, 1.61
148
+ - jar org.bouncycastle:bctls-jdk15on, 1.61
148
149
  rubyforge_project:
149
- rubygems_version: 2.4.6
150
+ rubygems_version: 2.6.14.1
150
151
  signing_key:
151
152
  specification_version: 4
152
153
  summary: JRuby OpenSSL