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: 6230c5989a0d
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: 85b43600092c
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 4, 2016

  1. Copy the full SHA
    38f26c0 View commit details
  2. Copy the full SHA
    f1ea77b View commit details
  3. Copy the full SHA
    85b4360 View commit details
Showing with 13 additions and 13 deletions.
  1. +12 −12 .travis.yml
  2. +1 −1 src/main/java/org/jruby/ext/openssl/SecurityHelper.java
24 changes: 12 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@ env:
- TEST_PROFILE=test-1.7.18
#- TEST_PROFILE=test-1.7.22
#- TEST_PROFILE=test-1.7.24
#- TEST_PROFILE=test-1.7.25
- TEST_PROFILE=test-1.7.26
- TEST_PROFILE=test-9.0.1.0
- TEST_PROFILE=test-9.0.5.0
- TEST_PROFILE=test-9.1.1.0
- TEST_PROFILE=test-9.1.2.0
- TEST_PROFILE=test-9.1.5.0

install: if [[ -v BUNDLE_INSTALL ]]; then jruby -S bundle install; else echo ""; fi

@@ -31,14 +31,14 @@ matrix:
rvm: jruby-1.7.18
include:
- jdk: oraclejdk7
env: TEST_COMMAND="jruby -S rake test" BUNDLE_INSTALL=true
rvm: jruby-1.7.22
- jdk: oraclejdk7
env: TEST_COMMAND="jruby -S rake test" BUNDLE_INSTALL=true
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -S rake test" BUNDLE_INSTALL=true
rvm: jruby-1.7.24
- jdk: oraclejdk7
env: TEST_COMMAND="jruby -S rake test" BUNDLE_INSTALL=true
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -S rake test" BUNDLE_INSTALL=true
rvm: jruby-1.7.25
- jdk: oraclejdk7
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -S rake test" BUNDLE_INSTALL=true
rvm: jruby-1.7.26
#
- jdk: openjdk6
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn verify -P test-1.6.8" BUNDLE_INSTALL=true RUBY_MAVEN_VERSION=3.3.8
@@ -53,15 +53,15 @@ matrix:
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn verify -P test-1.7.18" BUNDLE_INSTALL=true RUBY_MAVEN_VERSION=3.3.8
rvm: jruby-1.7.22
- jdk: openjdk6
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn verify -P test-1.7.22" BUNDLE_INSTALL=true RUBY_MAVEN_VERSION=3.3.8
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn verify -P test-1.7.24" BUNDLE_INSTALL=true RUBY_MAVEN_VERSION=3.3.8
rvm: jruby-1.7.22
- jdk: openjdk6
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn verify -P test-1.7.24" BUNDLE_INSTALL=true RUBY_MAVEN_VERSION=3.3.8
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn verify -P test-1.7.26" BUNDLE_INSTALL=true RUBY_MAVEN_VERSION=3.3.8
rvm: jruby-1.7.22
#
- jdk: oraclejdk8
env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-1.7.24
rvm: jruby-1.7.26
- jdk: oraclejdk7
env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-1.7.18
@@ -70,10 +70,10 @@ matrix:
rvm: jruby-9.0.5.0
- jdk: oraclejdk7
env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-9.1.1.0
rvm: jruby-9.1.2.0
- jdk: oraclejdk8
env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-9.1.2.0
rvm: jruby-9.1.5.0
notifications:
irc:
channels:
2 changes: 1 addition & 1 deletion src/main/java/org/jruby/ext/openssl/SecurityHelper.java
Original file line number Diff line number Diff line change
@@ -202,7 +202,7 @@ static CertificateFactory getCertificateFactory(final String type, final Provide
final CertificateFactorySpi spi;
boolean addedBC = false;
synchronized(SecurityHelper.class) {
try {
try { // TODO fixed since BC 1.55 (only needed on 1.54) and should be removed eventually ...
if (provider.getName().equals(BC_PROVIDER_NAME) && Security.getProvider(BC_PROVIDER_NAME) == null) {
Security.addProvider(provider);
addedBC = true;