Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5f167cb476e4
Choose a base ref
...
head repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 036dc0fd8d6f
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Jul 28, 2017

  1. Copy the full SHA
    f37398f View commit details
  2. prepare for 0.9.21

    kares committed Jul 28, 2017
    Copy the full SHA
    db0823f View commit details
  3. Copy the full SHA
    036dc0f View commit details
Showing with 26 additions and 15 deletions.
  1. +15 −3 History.md
  2. +1 −1 lib/jopenssl/load.rb
  3. +1 −8 lib/jopenssl/version.rb
  4. +9 −3 pom.xml
18 changes: 15 additions & 3 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
## 0.9.21.dev

* add support for renegotiation_cb on SSLContext (#121)
## 0.9.21

* adjust X.509 value handling to parse subjectAltName recursively (#134)
* SKI expected to be always octet wrapped - do not check for length (#131)
* respect jruby.preferred.prng and use/tune its SecureRandom defaults
trying to avoid BC generator's constant attempts for seeding itself
as an attempt to 'fix' low-entropy systems wating for */dev/random*
* Random#add; Random#egd shall return true on JVM
* move "DEFAULT" special case handling to match OpenSSL behaviour (#136)
(jruby/jruby#2193)
* If data is not provided, extract it from the PKCS7 instance (#132)
* Add cipher suite strings for IBM JRE (#126) - thanks @ysohda
* use the helper to printStackTrace (no System.err printing by default)
* add OCSP support (#124) - thanks so very much @lampad
* add support for renegotiation_cb on SSLContext (#121) - thanks @lampad

## 0.9.20

2 changes: 1 addition & 1 deletion lib/jopenssl/load.rb
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@

# NOTE: assuming user does pull in BC .jars from somewhere else on the CP
unless ENV_JAVA['jruby.openssl.load.jars'].eql?('false')
version = Jopenssl::Version::BOUNCY_CASTLE_VERSION
version = Jopenssl::BOUNCY_CASTLE_VERSION
bc_jars = nil
begin
require 'jar-dependencies'
9 changes: 1 addition & 8 deletions lib/jopenssl/version.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
module Jopenssl
VERSION = '0.9.21.dev'
VERSION = '0.10.0.dev'
BOUNCY_CASTLE_VERSION = '1.56'
# @deprecated
module Version
# @private
VERSION = Jopenssl::VERSION
# @private
BOUNCY_CASTLE_VERSION = Jopenssl::BOUNCY_CASTLE_VERSION
end
end
12 changes: 9 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
<modelVersion>4.0.0</modelVersion>
<groupId>rubygems</groupId>
<artifactId>jruby-openssl</artifactId>
<version>0.9.21.dev-SNAPSHOT</version>
<version>0.10.0.dev-SNAPSHOT</version>
<packaging>gem</packaging>
<name>JRuby OpenSSL</name>
<description>JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.</description>
@@ -58,6 +58,7 @@ DO NOT MODIFIY - GENERATED CODE
</distributionManagement>
<properties>
<bc.versions></bc.versions>
<mavengem.wagon.version>0.2.0</mavengem.wagon.version>
<jruby.plugins.version>1.0.10</jruby.plugins.version>
<invoker.skip>${maven.test.skip}</invoker.skip>
<jruby.version>1.7.18</jruby.version>
@@ -116,8 +117,8 @@ DO NOT MODIFIY - GENERATED CODE
</dependencies>
<repositories>
<repository>
<id>rubygems-releases</id>
<url>http://rubygems-proxy.torquebox.org/releases</url>
<id>mavengems</id>
<url>mavengem:https://rubygems.org</url>
</repository>
<repository>
<releases>
@@ -132,6 +133,11 @@ DO NOT MODIFIY - GENERATED CODE
</repositories>
<build>
<extensions>
<extension>
<groupId>org.torquebox.mojo</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>${mavengem.wagon.version}</version>
</extension>
<extension>
<groupId>de.saumya.mojo</groupId>
<artifactId>gem-with-jar-extension</artifactId>