jruby-openssl 0.9.16-java → 0.9.17-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 390fcbe6a3e79904d716a3a01d5a0c57b8cb0f51
-  data.tar.gz: ccb36ce879e1f39966118141cc727893b8dea631
+  metadata.gz: 54fe73283dd1bf1d21f0838b07d74d69b9dc2712
+  data.tar.gz: e913cf2109cae61539fa77462ead94bd848b7f49
 SHA512:
-  metadata.gz: 6d7195a55754d197680ad516e1b58fb66537236fa899f3d882ee9c41c57a378d0e86862145a33a11316b07e481ec45c1469b7f2c8a1f79d5b8b6d3cfeb0b2b40
-  data.tar.gz: efdfec47995c72101b7f9bafe6095a1c8a6f451e6f42fe066407897886b52b3d0d1997368192abfbe029c9de6d443d36f894d22d9f312dac2c5c1259fe20698c
+  metadata.gz: 0b7acfce75c719f7493618d9f1a231bc113e753efd1117155970b0175ddfb4bcfa452ac47b64087462885d1c8c8bb1b7c70285e40d9cc4197d7030cdfa8850d2
+  data.tar.gz: e80da49c3c0757fd04f120721fe70b7186ef15f80a830677fbc5d7e8aa0afa16cd4c5933203230a50287b9043442293bd90d2c6a80b06f573f43a3254dc5d1b8

data/History.md

@@ -1,3 +1,24 @@
+## 0.9.17
+
+* temporarily register BC provider on X.509 factory (work-around for #94)
+* support Cipher#auth_tag and auth_data for GCM ciphers (e.g. aes-128-gcm)
+* need to drop support for BC <= 1.50 due EC support (N/A in older BCs)
+* (somehow working) draft at implementing PKey::EC (elliptic curve support)
+  DH encryption expected to behave correctly
+* make sure (initial) BC security provider registration works!
+  ... when **-Djruby.openssl.provider.register=true** (due #94)
+* Make ALL cipherstring match ECDHE cihphers (#91)
+* fix X.509 indexBySubject returning correct index
+* try to handle `SSLContext.session=` and also try answering `session_reused?`
+* handle equals/hashCode on SSL::Session and raise on timeout int overflow
+* Allow DSA private keys to be initialized from parameters. (#83)
+* Instantiate both the private and public keys when setting parameters. (#82)
+
+## 0.9.16
+
+* add hard dependency to jar-dependencies (#74)
+* Recognize Android java.version (#81)
+
 ## 0.9.15
 
 * always return a Fixnum from `OpenSSL::SSL::Session#timeout`, OpenSSL defaults

data/Mavenfile

@@ -0,0 +1,193 @@
+#-*- mode: ruby -*-
+
+gemspec :jar => 'jopenssl', :include_jars => true
+
+sonatype_url = 'https://oss.sonatype.org/content/repositories/snapshots/'
+snapshot_repository :id => 'sonatype', :url => sonatype_url
+
+distribution_management do
+  snapshot_repository :id => :ossrh, :url => 'https://oss.sonatype.org/content/repositories/snapshots'
+  repository :id => :ossrh, :url => 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
+end
+
+java_target = '1.6'
+gen_sources = '${basedir}/target/generated-sources' # hard-coded in AnnotationBinder
+
+plugin( 'org.codehaus.mojo:exec-maven-plugin', '1.3.2' ) do
+
+=begin
+  invoker_main  = '-Djruby.bytecode.version=${compiler.target}'
+  #invoker_main << ' -classpath '
+  invoker_main << ' org.jruby.anno.InvokerGenerator'
+  invoker_main << " #{gen_sources}/annotated_classes.txt ${project.build.outputDirectory}"
+
+  dependency 'org.jruby', 'jruby-core', '${jruby.version}'
+
+  execute_goal :java, :id => 'invoker-generator', :phase => 'process-classes',
+      :mainClass => 'org.jruby.anno.InvokerGenerator', :classpathScope => 'compile',
+      #:arguments => [ '${gen.sources}/annotated_classes.txt', '${project.build.outputDirectory}' ] do
+      :commandlineArgs => "#{gen_sources}/annotated_classes.txt ${project.build.outputDirectory}",
+      :classpathScope => 'runtime', :additionalClasspathElements => [ '${project.build.outputDirectory}' ],
+      :includeProjectDependencies => false, :includePluginDependencies => true do
+
+    #systemProperties do
+    #  property '-Djruby.bytecode.version=${compiler.target}'
+    #end
+=end
+
+  execute_goal :exec, :id => 'invoker-generator', :phase => 'process-classes',
+      :executable => 'java', :classpathScope => 'compile',
+      :arguments => [ "-Djruby.bytecode.version=#{java_target}",
+                      '-classpath', xml( '<classpath/>' ),
+                      'org.jruby.anno.InvokerGenerator',
+                      "#{gen_sources}/annotated_classes.txt",
+                      '${project.build.outputDirectory}' ]
+end
+
+plugin( 'org.codehaus.mojo:build-helper-maven-plugin', '1.9' ) do
+  execute_goal 'add-source', :phase => 'process-classes', :sources => [ gen_sources ]
+end
+
+plugin( :compiler, '3.1',
+        :source => java_target, :target => java_target,
+        :encoding => 'UTF-8', :debug => true,
+        :showWarnings => true, :showDeprecation => true,
+
+        :generatedSourcesDirectory => gen_sources,
+        :annotationProcessors => [ 'org.jruby.anno.AnnotationBinder' ],
+        :compilerArgs => [ '-XDignore.symbol.file=true' ] ) do
+
+  #execute_goal :compile, :id => 'annotation-binder', :phase => 'compile',
+  #    :generatedSourcesDirectory => gen_sources, #:outputDirectory => gen_sources,
+  #    :annotationProcessors => [ 'org.jruby.anno.AnnotationBinder' ],
+  #    :proc => 'only', # :compilerReuseStrategy => 'alwaysNew',
+  #    :useIncrementalCompilation => false, :fork => true, :verbose => true,
+  #    :compilerArgs => [ '-XDignore.symbol.file=true', '-J-Dfile.encoding=UTF-8' ]
+
+  execute_goal :compile, :id => 'compile-populators', :phase => 'process-classes',
+      :includes => [ 'org/jruby/gen/**/*.java' ], :optimize => true,
+      :compilerArgs => [ '-XDignore.symbol.file=true' ]
+      # NOTE: maybe '-J-Xbootclasspath/p:${unsafe.jar}' ... as well ?!
+end
+
+plugin :clean do
+  execute_goals( 'clean', :id => 'default-clean', :phase => 'clean',
+                 'filesets' => [
+                    { :directory => 'lib', :includes => [ 'jopenssl.jar' ] },
+                    { :directory => 'lib/org' },
+                    { :directory => 'target', :includes => [ '*' ] }
+                 ],
+                 'failOnError' =>  'false' )
+end
+
+# NOTE: unfortunately we can not use 1.6.8 to generate invokers ...
+# although we'd like to compile against 1.6 to make sure all is well
+jar 'org.jruby:jruby-core', '1.7.17', :scope => :provided  # 1.6.8
+jar 'junit:junit', '4.11', :scope => :test
+
+jruby_plugin! :gem do
+  # when installing dependent gems we want to use the built in openssl
+  # not the one from this lib directory
+  # we compile against jruby-core-1.7.17 and want to keep this out of
+  # the plugin execution here
+  execute_goal :id => 'default-initialize', :addProjectClasspath => false, :libDirectory => 'something-which-does-not-exists'
+  execute_goals :id => 'default-push', :skip => true
+end
+
+# we want to have the snapshots on oss.sonatype.org and the released gems
+# on maven central
+plugin :deploy, '2.8.1' do
+  execute_goals( :deploy, :skip => false )
+end
+
+supported_bc_versions = %w{ 1.51 1.52 1.53 1.54 } # due EC support dropped <= 1.50
+
+default_bc_version = File.read('lib/jopenssl/version.rb')[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1]
+
+properties( 'jruby.plugins.version' => '1.0.10',
+            'jruby.versions' => '1.7.18',
+            'bc.versions' => default_bc_version,
+            'invoker.test' => '${bc.versions}',
+            # allow to skip all tests with -Dmaven.test.skip
+            'invoker.skip' => '${maven.test.skip}',
+            'runit.dir' => 'src/test/ruby/**/test_*.rb',
+            # use this version of jruby for ALL the jruby-maven-plugins
+            'jruby.version' => '1.7.18',
+            # dump pom.xml as readonly when running 'rmvn'
+            'polyglot.dump.pom' => 'pom.xml',
+            'polyglot.dump.readonly' => true,
+            'tesla.dump.pom' => 'pom.xml',
+            'tesla.dump.readonly' => true )
+
+# make sure we have the embedded jars in place before we run runit plugin
+plugin! :dependency do
+  execute_goal 'copy-dependencies', :phase => 'generate-test-resources', :outputDirectory => '${basedir}/lib', :useRepositoryLayout => true, :includeGroupIds => 'org.bouncycastle'
+end
+
+jruby_plugin(:runit) { execute_goal( :test, :runitDirectory => '${runit.dir}' ) }
+
+invoker_run_options = {
+    :id => 'tests-with-different-bc-versions',
+    :projectsDirectory => 'integration',
+    :pomIncludes => [ '*/pom.xml' ],
+    :streamLogs => true,
+    # pass those properties on to the test project
+    :properties => {
+      'jruby.versions' => '${jruby.versions}',
+      'jruby.modes' => '${jruby.modes}',
+      'jruby.openssl.version' => '${project.version}',
+      'bc.versions' => '${bc.versions}',
+      'runit.dir' => '${runit.dir}' }
+}
+
+profile :id => 'test-1.6.8' do
+  plugin :invoker, '1.8' do
+    execute_goals( :install, :run, invoker_run_options )
+  end
+  properties 'jruby.versions' => '1.6.8', 'jruby.modes' => '1.8,1.9',
+             'bc.versions' => supported_bc_versions.join(',')
+end
+
+profile :id => 'test-1.7.4' do
+  plugin :invoker, '1.8' do
+    execute_goals( :install, :run, invoker_run_options )
+  end
+  properties 'jruby.versions' => '1.7.4', 'jruby.modes' => '1.8,1.9',
+             'bc.versions' => supported_bc_versions.join(',')
+end
+
+jruby_1_7_versions = %w{ 1.7.13 1.7.15 1.7.16 1.7.18 1.7.20 1.7.22 1.7.23 }
+jruby_1_7_versions += %w{ 1.7.24 1.7.25 }
+
+jruby_1_7_versions.each { |version|
+
+profile :id => "test-#{version}" do
+  plugin :invoker, '1.8' do
+    execute_goals( :install, :run, invoker_run_options )
+  end
+  properties 'jruby.versions' => version, 'jruby.modes' => '1.8,1.9,2.0',
+             'bc.versions' => supported_bc_versions.join(',')
+end
+
+}
+
+jruby_9_K_versions = %w{ 9.0.1.0 9.0.5.0 9.1.0.0 9.1.1.0 9.1.2.0 }
+
+jruby_9_K_versions.each { |version|
+profile :id => "test-#{version}" do
+  plugin :invoker, '1.8' do
+    execute_goals( :install, :run, invoker_run_options )
+  end
+  # NOTE: we're work-around 9K maven-runit version bug (due minitest changes) !
+  # ... still can not build with 9K : https://github.com/jruby/jruby/issues/3184
+  properties 'jruby.version' => version, 'jruby.versions' => version,
+             'bc.versions' => supported_bc_versions.join(',')
+end
+}
+
+profile :id => 'release' do
+  plugin :gpg, '1.5' do
+    execute_goal :sign, :phase => :verify
+  end
+end
+# vim: syntax=Ruby

data/Rakefile

@@ -1,7 +1,7 @@
 #-*- mode: ruby -*-
 
 begin
-  require 'maven/ruby/tasks'
+  require 'ruby-maven'
 rescue LoadError
   warn "ruby-maven not available - some tasks will not work " <<
        "either `gem install ruby-maven' or use mvn instead of rake"
@@ -16,20 +16,22 @@ rescue LoadError
     end
   end
 else
-  Rake::Task[:jar].clear
+  #Rake::Task[:jar].clear rescue nil
   desc "Package jopenssl.jar with the compiled classes"
-  task :jar => :maven do
-    maven.prepare_package '-Dmaven.test.skip=true'
+  task :jar do
+    RubyMaven.exec( 'prepare-package -Dmaven.test.skip=true' )
   end
   namespace :jar do
     desc "Package jopenssl.jar file (and dependendent jars)"
-    task :all => :maven do
-      maven.package '-Dmaven.test.skip=true'
+    task :all do
+      RubyMaven.exec( 'package -Dmaven.test.skip=true' )
     end
   end
 end
 
-# the actual build configuration is inside the Mavenfile
+task :build do
+  RubyMaven.exec('package -Dmaven.test.skip')
+end
 
 task :default => :build
 
@@ -64,4 +66,4 @@ namespace :integration do
     lib = [ 'lib', 'src/test/integration' ]
     ruby "-I#{lib.join(':')} -e \"#{loader}\" #{test_files.map { |f| "\"#{f}\"" }.join(' ')}"
   end
-end
+end

data/integration/1.47/pom.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>none</groupId>
+    <artifactId>base</artifactId>
+    <version>0</version>
+  </parent>
+  <artifactId>bouncy-castle</artifactId>
+  <version>1.47</version>
+  <properties>
+    <bc.version>${project.version}</bc.version>
+  </properties>
+</project>

data/integration/1.48/pom.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>none</groupId>
+    <artifactId>base</artifactId>
+    <version>0</version>
+  </parent>
+  <artifactId>bouncy-castle</artifactId>
+  <version>1.48</version>
+  <properties>
+    <bc.version>${project.version}</bc.version>
+  </properties>
+</project>

data/integration/1.49/pom.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>none</groupId>
+    <artifactId>base</artifactId>
+    <version>0</version>
+  </parent>
+  <artifactId>bouncy-castle</artifactId>
+  <version>1.49</version>
+  <properties>
+    <bc.version>${project.version}</bc.version>
+  </properties>
+</project>

data/integration/1.50/pom.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>none</groupId>
+    <artifactId>base</artifactId>
+    <version>0</version>
+  </parent>
+  <artifactId>bouncy-castle</artifactId>
+  <version>1.50</version>
+  <properties>
+    <bc.version>${project.version}</bc.version>
+  </properties>
+</project>

data/integration/Mavenfile

@@ -0,0 +1,57 @@
+#-*- mode: ruby -*-
+
+id 'none:base:0'
+packaging :pom
+
+snapshot_repository :id => 'jruby', :url => 'http://ci.jruby.org/snapshots/maven'
+
+# TODO should be setup whenever a plugin uses gems
+plugin_repository :id => 'rubygems-releases', :url => 'http://rubygems-proxy.torquebox.org/releases'
+
+base_path = File.expand_path('..', File.dirname(__FILE__))
+bc_version = File.read("#{base_path}/lib/jopenssl/version.rb")[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1]
+
+properties( 'bc.version' => bc_version, # to satisfy maven
+            'jruby.openssl.version' => '0.9.7', # to satisfy maven
+            # use the gem-maven-plugin repo for the tests
+            'gem.home' => '${basedir}/../pkg/rubygems',
+            'gem.path' => '${basedir}/../pkg/rubygems',
+            'tesla.dump.pom' => 'pom.xml',
+            'tesla.dump.readonly' => true,
+            'jruby.version' => '1.7.19', # for jruby-maven-plugins
+            'jruby.plugins.version' => '1.0.9' )
+
+jruby_plugin :gem, :gemHomes => { 'gem-maven-plugin' => '${gem.home}' } do
+  execute_goal :initialize
+
+  gem 'jar-dependencies', '0.1.8' # TODO change after 0.1.15 is out
+  spec = Gem::Specification.load "#{base_path}/jruby-openssl.gemspec"
+  spec.development_dependencies.each do |dev_spec|
+    gem dev_spec.name, *dev_spec.requirements_list
+  end
+
+  # make sure we have those in the local repo
+  # BUT not be part of the runit-classloader
+  # otherwise jruby-1.7.x and jruby-1.6.x will not use those
+  # required in the test_*.rb files
+  jar  'org.bouncycastle', 'bcpkix-jdk15on', '${bc.version}'
+  jar  'org.bouncycastle', 'bcprov-jdk15on', '${bc.version}'
+  #spec.requirements.each do |req|
+  #  req = req.sub('jar', '').split(',').each(&:strip!)
+  #  jar req[0], req[1]
+  #end
+
+  gem 'jruby-openssl', '${jruby.openssl.version}'
+
+end
+
+jruby_plugin :runit do
+  execute_goal( :test,
+                :env => { 'BC_VERSION' => '${bc.version}' },
+                :jrubySwitches => '-I../../lib',
+                :runitDirectory => '../../src/test/ruby/**/test_*.rb',
+                :versions => '${jruby.versions}',
+                :modes => '${jruby.modes}' )
+end
+
+# vim: syntax=Ruby

data/integration/pom.xml

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>none</groupId>
+  <artifactId>base</artifactId>
+  <version>0</version>
+  <packaging>pom</packaging>
+  <name>integration</name>
+  <properties>
+    <jruby.version>1.7.19</jruby.version>
+    <tesla.dump.readonly>true</tesla.dump.readonly>
+    <jruby.openssl.version>0.9.7</jruby.openssl.version>
+    <gem.path>${basedir}/../pkg/rubygems</gem.path>
+    <jruby.plugins.version>1.0.9</jruby.plugins.version>
+    <gem.home>${basedir}/../pkg/rubygems</gem.home>
+    <bc.version>1.50</bc.version>
+    <tesla.dump.pom>pom.xml</tesla.dump.pom>
+  </properties>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>jruby</id>
+      <url>http://ci.jruby.org/snapshots/maven</url>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>rubygems-releases</id>
+      <url>http://rubygems-proxy.torquebox.org/releases</url>
+    </pluginRepository>
+  </pluginRepositories>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>de.saumya.mojo</groupId>
+        <artifactId>gem-maven-plugin</artifactId>
+        <version>${jruby.plugins.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>initialize</goal>
+            </goals>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>rubygems</groupId>
+            <artifactId>jar-dependencies</artifactId>
+            <version>0.1.8</version>
+            <type>gem</type>
+          </dependency>
+          <dependency>
+            <groupId>rubygems</groupId>
+            <artifactId>jar-dependencies</artifactId>
+            <version>[0.1.0,0.1.99999]</version>
+            <type>gem</type>
+          </dependency>
+          <dependency>
+            <groupId>rubygems</groupId>
+            <artifactId>mocha</artifactId>
+            <version>[1.1.0,1.1.99999]</version>
+            <type>gem</type>
+          </dependency>
+          <dependency>
+            <groupId>rubygems</groupId>
+            <artifactId>ruby-maven</artifactId>
+            <version>[0,)</version>
+            <type>gem</type>
+          </dependency>
+          <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
+            <version>${bc.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>${bc.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>rubygems</groupId>
+            <artifactId>jruby-openssl</artifactId>
+            <version>${jruby.openssl.version}</version>
+            <type>gem</type>
+          </dependency>
+        </dependencies>
+        <configuration>
+          <gemHomes>
+            <gem-maven-plugin>${gem.home}</gem-maven-plugin>
+          </gemHomes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>de.saumya.mojo</groupId>
+        <artifactId>runit-maven-plugin</artifactId>
+        <version>${jruby.plugins.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <configuration>
+              <env>
+                <BC_VERSION>${bc.version}</BC_VERSION>
+              </env>
+              <jrubySwitches>-I../../lib</jrubySwitches>
+              <runitDirectory>../../src/test/ruby/**/test_*.rb</runitDirectory>
+              <versions>${jruby.versions}</versions>
+              <modes>${jruby.modes}</modes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>