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: c340a3bd4613
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: c0378b480b89
Choose a head ref

Commits on Jun 1, 2016

  1. Copy the full SHA
    10a1cfc View commit details
  2. Copy the full SHA
    2d8569f View commit details
  3. add an ASN1 encoded EC (private) key reader

    ... including a hack for keeping the curve name oid around
    kares committed Jun 1, 2016
    Copy the full SHA
    f9d390f View commit details
  4. Copy the full SHA
    3748750 View commit details
  5. Copy the full SHA
    c48e3bd View commit details
  6. Copy the full SHA
    5c0aa1b View commit details
  7. Copy the full SHA
    23b6b5d View commit details
  8. Copy the full SHA
    ca28b7e View commit details
  9. Copy the full SHA
    3646eaa View commit details
  10. Copy the full SHA
    dd45cbf View commit details
  11. Copy the full SHA
    f71cbbd View commit details

Commits on Jun 6, 2016

  1. Copy the full SHA
    4d5bead View commit details
  2. handle OpenSSL::Cipher.new('aes-128-gcm') with IV under JRuby

    ... so that it works ~ more compatibly with C OpenSSL (iv_length == 12)
    kares committed Jun 6, 2016
    Copy the full SHA
    7e53018 View commit details
  3. Copy the full SHA
    9173891 View commit details
  4. Copy the full SHA
    90c4332 View commit details
  5. Copy the full SHA
    a8168e3 View commit details

Commits on Jun 7, 2016

  1. Copy the full SHA
    bc30597 View commit details
  2. Copy the full SHA
    8b4566b View commit details
  3. Copy the full SHA
    ff658db View commit details
  4. Copy the full SHA
    6c29e9a View commit details
  5. Copy the full SHA
    c0378b4 View commit details
20 changes: 20 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
## 0.9.17

* 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
13 changes: 1 addition & 12 deletions Mavenfile
Original file line number Diff line number Diff line change
@@ -100,7 +100,7 @@ plugin :deploy, '2.8.1' do
execute_goals( :deploy, :skip => false )
end

supported_bc_versions = %w{ 1.49 1.50 1.51 1.52 1.53 1.54 }
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]

@@ -185,17 +185,6 @@ profile :id => "test-#{version}" do
end
}

#profile :id => 'test-9000' 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' => '9.0.0.0',
# 'jruby.versions' => '9.0.0.0',
# 'bc.versions' => supported_bc_versions.join(',')
#end

profile :id => 'release' do
plugin :gpg, '1.5' do
execute_goal :sign, :phase => :verify
30 changes: 15 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -412,7 +412,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9</jruby.modes>
<jruby.versions>1.6.8</jruby.versions>
</properties>
@@ -450,7 +450,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9</jruby.modes>
<jruby.versions>1.7.4</jruby.versions>
</properties>
@@ -488,7 +488,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.13</jruby.versions>
</properties>
@@ -526,7 +526,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.15</jruby.versions>
</properties>
@@ -564,7 +564,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.16</jruby.versions>
</properties>
@@ -602,7 +602,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.18</jruby.versions>
</properties>
@@ -640,7 +640,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.20</jruby.versions>
</properties>
@@ -678,7 +678,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.22</jruby.versions>
</properties>
@@ -716,7 +716,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.23</jruby.versions>
</properties>
@@ -754,7 +754,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.24</jruby.versions>
</properties>
@@ -792,7 +792,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.25</jruby.versions>
</properties>
@@ -830,7 +830,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.version>9.0.1.0</jruby.version>
<jruby.versions>9.0.1.0</jruby.versions>
</properties>
@@ -868,7 +868,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.version>9.0.5.0</jruby.version>
<jruby.versions>9.0.5.0</jruby.versions>
</properties>
@@ -906,7 +906,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.version>9.1.0.0</jruby.version>
<jruby.versions>9.1.0.0</jruby.versions>
</properties>
@@ -944,7 +944,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.49,1.50,1.51,1.52,1.53,1.54</bc.versions>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.version>9.1.1.0</jruby.version>
<jruby.versions>9.1.1.0</jruby.versions>
</properties>
2 changes: 1 addition & 1 deletion src/main/java/org/jruby/ext/openssl/ASN1.java
Original file line number Diff line number Diff line change
@@ -28,7 +28,6 @@
package org.jruby.ext.openssl;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
@@ -111,6 +110,7 @@
import org.jruby.ext.openssl.impl.ASN1Registry;

import static org.jruby.ext.openssl.OpenSSL.*;
import org.jruby.ext.openssl.util.ByteArrayOutputStream;

/**
* @author <a href="mailto:ola.bini@ki.se">Ola Bini</a>
Loading