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: 8e894e2e49ea
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: e44559950da3
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Dec 22, 2015

  1. Copy the full SHA
    49b5eb5 View commit details
  2. set next dev SNAPSHOT

    kares committed Dec 22, 2015
    Copy the full SHA
    e445599 View commit details
Showing with 33 additions and 6 deletions.
  1. +27 −0 History.md
  2. +3 −3 README.md
  3. +1 −1 lib/jopenssl/version.rb
  4. +2 −2 pom.xml
27 changes: 27 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
## 0.9.13

JRuby-OpenSSL is the first release that aims to be Ruby **2.3** compatible.

* SSLSocket#sysread do not copy bytes from buffer - re-use the backing array
* handle read_nonblock EOF as nil when exception: false (Ruby 2.3 compatibility)
* start exposing VERSION constant(s) directly on Jopenssl module
* better not throw EOF on SSLSocket#sysclose for compatibility with MRI
* setup "dummy" OpenSSL::OPENSSL_LIBRARY_VERSION constant for compatibility
* Ruby 2.3 compatibility - adjust to changes in MRI's openssl .rb parts
* update openssl/ssl.rb based on MRI 2.2's version
* disable backtrace generation for wait non-block errors (use an empty array)
* support SSLSocket#accept_nonblock/connect_nonblock with exception: false
* support `exception: false` with syswrite_nonblock and sysread_nonblock
* remove 'RSA' from RSA public key headers (#76)

## 0.9.12

* avoid verifying the security provider when creating a cipher instance (#73)
* force US locale for date formatting
otherwise it uses system locale, which is inconsistent with MRI.
* X509::Store.set_default_paths ignores FileNotFound errors like MRI does (#68)
* check type on X509::Store.verify
throw a TypeError if the argument is not a OpenSSL::X509::Certificate (#69)
* keep the default x509 certs and directories in line with MRI, only if
they do not exists fallback on cacerts from the java.home/lib/security/cacerts

## 0.9.11

* add TLSv1_1_client, TLSv1_1_server, TLSv1_2_client and TLSv1_2_server options
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ the JRuby [mailing list][1] or the [bug tracker][2].
Since version **0.9.5** jruby-openssl aims to be compatible with all JRuby versions
**>= 1.6.8** (including 1.7 and 9k), if it's not we consider that a bug, report.

We currently (for 0.9.x) require the Bouncy Castle Java API to be **>= 1.47**,
We currently (for 0.9.x) require the Bouncy Castle Java APIs to be **>= 1.47**,
for JRuby-OpenSSL gem <= 0.9.6 you also need to make sure BC jars **<= 1.50** !

## Testing
@@ -31,7 +31,7 @@ jruby version. to pick a different version and/or modes (1.8, 1.9, 2.0, 2.1) run
for running integration-tests the gem will be first installed and then the same
tests run for each possible bouncy-castle version (see [listing][3]), run with

mvn verify -P test-1.6.8,test-1.7.13
mvn verify -P test-9.0.4.0,test-1.7.22

or pick a bouncy-castle version

@@ -45,7 +45,7 @@ NOTE: you can pick any jruby version which is on [central][4] or on [ci.jruby][5

## License

(c) 2009-2015 JRuby distributed under EPL 1.0/GPL 2.0/LGPL 2.1
(c) 2009-2016 JRuby distributed under EPL 1.0/GPL 2.0/LGPL 2.1

[0]: https://secure.travis-ci.org/jruby/jruby-openssl.png
[1]: http://xircles.codehaus.org/projects/jruby/lists
2 changes: 1 addition & 1 deletion lib/jopenssl/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Jopenssl
VERSION = '0.9.13'
VERSION = '0.9.14.dev'
BOUNCY_CASTLE_VERSION = '1.50'
# @deprecated
module Version
4 changes: 2 additions & 2 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.13</version>
<version>0.9.14.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>
@@ -87,7 +87,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>rubygems</groupId>
<artifactId>ruby-maven</artifactId>
<version>[0,)</version>
<version>[3.0,3.99999]</version>
<type>gem</type>
<scope>test</scope>
</dependency>