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: 098ad46d8ce8
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: af07873c74c1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 11, 2016

  1. LICENSE (c) 2016

    @kares
    kares committed Jan 11, 2016
    Copy the full SHA
    10e2bb2 View commit details

  2. fix compilation clashing on readPrivateKey method name

    @kares
    kares committed Jan 11, 2016
    Copy the full SHA
    af07873 View commit details
Showing with 3 additions and 5 deletions.
  1. +1 −1 LICENSE.txt
  2. +2 −4 src/main/java/org/jruby/ext/openssl/PKey.java
2 changes: 1 addition & 1 deletion LICENSE.txt
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

Copyright (C) 2007-2009 Ola Bini <ola.bini@gmail.com>
Copyright (C) 2009-2015 The JRuby Team
Copyright (C) 2009-2016 The JRuby Team

Alternatively, the contents of this file may be used under the terms of
either of the GNU General Public License Version 2 or later (the "GPL"),
6 changes: 2 additions & 4 deletions src/main/java/org/jruby/ext/openssl/PKey.java
View file
Original file line number Diff line number Diff line change
@@ -64,8 +64,6 @@
import org.jruby.ext.openssl.x509store.PEMInputOutput;
import static org.jruby.ext.openssl.OpenSSL.*;
import org.jruby.ext.openssl.impl.CipherSpec;
import static org.jruby.ext.openssl.impl.PKey.readPrivateKey;
import static org.jruby.ext.openssl.impl.PKey.readPublicKey;

/**
* @author <a href="mailto:ola.bini@ki.se">Ola Bini</a>
@@ -118,7 +116,7 @@ public static IRubyObject read(final ThreadContext context, IRubyObject recv, IR
KeyPair key = null;
// d2i_PrivateKey_bio
try {
key = readPrivateKey(input);
key =org.jruby.ext.openssl.impl.PKey.readPrivateKey(input);
} catch (IOException ioe) {
// ignore
} catch (GeneralSecurityException gse) {
@@ -145,7 +143,7 @@ public static IRubyObject read(final ThreadContext context, IRubyObject recv, IR
PublicKey pubKey = null;
// d2i_PUBKEY_bio
try {
pubKey = readPublicKey(input);
pubKey = org.jruby.ext.openssl.impl.PKey.readPublicKey(input);
} catch (IOException ioe) {
// ignore
} catch (GeneralSecurityException gse) {