Skip to content

Commit 480832b

Browse files
kareskares
committed
drop support for BC 1.54 to, finally, get rid off ugly hack
reverts commit ea229e0.
1 parent 98e4360 commit 480832b

File tree

4 files changed

+20
-35
lines changed

4 files changed

+20
-35
lines changed

‎Mavenfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ plugin :deploy, '2.8.1' do
100100
execute_goals( :deploy, :skip => false )
101101
end
102102

103-
supported_bc_versions = %w{ 1.54 1.55 1.56 1.57 1.58 1.59 }
103+
supported_bc_versions = %w{ 1.55 1.56 1.57 1.58 1.59 }
104104

105105
default_bc_version = File.expand_path('lib/jopenssl/version.rb', File.dirname(__FILE__))
106106
default_bc_version = default_bc_version[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1]

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ the JRuby [mailing list][1] or the [bug tracker][2].
2222
| 0.9.14 | 1.6.8-9.1.5 | Java 6-8 | 1.49-1.54 |
2323
| 0.9.17 | 1.6.8-9.1.5 | Java 6-8 | 1.50-1.54 |
2424
| ~>0.9.18 | 1.6.8-9.1.x | Java 6-8 | 1.50-1.55 |
25-
| 0.10.0 | 1.7.20-9.2.x | Java 7-10 | 1.54-1.59 |
25+
| 0.10.0 | 1.7.20-9.2.x | Java 7-10 | 1.55-1.59 |
2626

2727
NOTE: backwards JRuby compatibility was not handled for versions <= **0.9.6**
2828

‎pom.xml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ DO NOT MODIFIY - GENERATED CODE
417417
</plugins>
418418
</build>
419419
<properties>
420-
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
420+
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
421421
<jruby.modes>1.9,2.0</jruby.modes>
422422
<jruby.versions>1.7.18</jruby.versions>
423423
</properties>
@@ -455,7 +455,7 @@ DO NOT MODIFIY - GENERATED CODE
455455
</plugins>
456456
</build>
457457
<properties>
458-
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
458+
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
459459
<jruby.modes>1.9,2.0</jruby.modes>
460460
<jruby.versions>1.7.20</jruby.versions>
461461
</properties>
@@ -493,7 +493,7 @@ DO NOT MODIFIY - GENERATED CODE
493493
</plugins>
494494
</build>
495495
<properties>
496-
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
496+
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
497497
<jruby.modes>1.9,2.0</jruby.modes>
498498
<jruby.versions>1.7.22</jruby.versions>
499499
</properties>
@@ -531,7 +531,7 @@ DO NOT MODIFIY - GENERATED CODE
531531
</plugins>
532532
</build>
533533
<properties>
534-
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
534+
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
535535
<jruby.modes>1.9,2.0</jruby.modes>
536536
<jruby.versions>1.7.23</jruby.versions>
537537
</properties>
@@ -569,7 +569,7 @@ DO NOT MODIFIY - GENERATED CODE
569569
</plugins>
570570
</build>
571571
<properties>
572-
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
572+
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
573573
<jruby.modes>1.9,2.0</jruby.modes>
574574
<jruby.versions>1.7.24</jruby.versions>
575575
</properties>
@@ -607,7 +607,7 @@ DO NOT MODIFIY - GENERATED CODE
607607
</plugins>
608608
</build>
609609
<properties>
610-
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
610+
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
611611
<jruby.modes>1.9,2.0</jruby.modes>
612612
<jruby.versions>1.7.25</jruby.versions>
613613
</properties>
@@ -645,7 +645,7 @@ DO NOT MODIFIY - GENERATED CODE
645645
</plugins>
646646
</build>
647647
<properties>
648-
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
648+
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
649649
<jruby.modes>1.9,2.0</jruby.modes>
650650
<jruby.versions>1.7.26</jruby.versions>
651651
</properties>
@@ -683,7 +683,7 @@ DO NOT MODIFIY - GENERATED CODE
683683
</plugins>
684684
</build>
685685
<properties>
686-
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
686+
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
687687
<jruby.modes>1.9,2.0</jruby.modes>
688688
<jruby.versions>1.7.27</jruby.versions>
689689
</properties>
@@ -721,7 +721,7 @@ DO NOT MODIFIY - GENERATED CODE
721721
</plugins>
722722
</build>
723723
<properties>
724-
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
724+
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
725725
<jruby.version>9.0.1.0</jruby.version>
726726
<jruby.versions>9.0.1.0</jruby.versions>
727727
</properties>
@@ -759,7 +759,7 @@ DO NOT MODIFIY - GENERATED CODE
759759
</plugins>
760760
</build>
761761
<properties>
762-
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
762+
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
763763
<jruby.version>9.0.5.0</jruby.version>
764764
<jruby.versions>9.0.5.0</jruby.versions>
765765
</properties>
@@ -797,7 +797,7 @@ DO NOT MODIFIY - GENERATED CODE
797797
</plugins>
798798
</build>
799799
<properties>
800-
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
800+
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
801801
<jruby.version>9.1.2.0</jruby.version>
802802
<jruby.versions>9.1.2.0</jruby.versions>
803803
</properties>
@@ -835,7 +835,7 @@ DO NOT MODIFIY - GENERATED CODE
835835
</plugins>
836836
</build>
837837
<properties>
838-
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
838+
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
839839
<jruby.version>9.1.5.0</jruby.version>
840840
<jruby.versions>9.1.5.0</jruby.versions>
841841
</properties>
@@ -873,7 +873,7 @@ DO NOT MODIFIY - GENERATED CODE
873873
</plugins>
874874
</build>
875875
<properties>
876-
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
876+
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
877877
<jruby.version>9.1.8.0</jruby.version>
878878
<jruby.versions>9.1.8.0</jruby.versions>
879879
</properties>
@@ -911,7 +911,7 @@ DO NOT MODIFIY - GENERATED CODE
911911
</plugins>
912912
</build>
913913
<properties>
914-
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
914+
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
915915
<jruby.version>9.1.12.0</jruby.version>
916916
<jruby.versions>9.1.12.0</jruby.versions>
917917
</properties>
@@ -949,7 +949,7 @@ DO NOT MODIFIY - GENERATED CODE
949949
</plugins>
950950
</build>
951951
<properties>
952-
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
952+
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
953953
<jruby.version>9.1.13.0</jruby.version>
954954
<jruby.versions>9.1.13.0</jruby.versions>
955955
</properties>
@@ -987,7 +987,7 @@ DO NOT MODIFIY - GENERATED CODE
987987
</plugins>
988988
</build>
989989
<properties>
990-
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
990+
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
991991
<jruby.version>9.1.16.0</jruby.version>
992992
<jruby.versions>9.1.16.0</jruby.versions>
993993
</properties>
@@ -1025,7 +1025,7 @@ DO NOT MODIFIY - GENERATED CODE
10251025
</plugins>
10261026
</build>
10271027
<properties>
1028-
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
1028+
<bc.versions>1.55,1.56,1.57,1.58,1.59</bc.versions>
10291029
<jruby.version>9.1.17.0</jruby.version>
10301030
<jruby.versions>9.1.17.0</jruby.versions>
10311031
</properties>

‎src/main/java/org/jruby/ext/openssl/SecurityHelper.java

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
public abstract class SecurityHelper {
101101

102102
private static String BC_PROVIDER_CLASS = "org.bouncycastle.jce.provider.BouncyCastleProvider";
103-
private static String BC_PROVIDER_NAME = "BC";
104103
static boolean setBouncyCastleProvider = true; // (package access for tests)
105104
static volatile Provider securityProvider; // 'BC' provider (package access for tests)
106105
private static volatile Boolean registerProvider = null;
@@ -256,21 +255,7 @@ public static CertificateFactory getCertificateFactory(final String type)
256255

257256
static CertificateFactory getCertificateFactory(final String type, final Provider provider)
258257
throws CertificateException {
259-
final CertificateFactorySpi spi;
260-
boolean addedBC = false;
261-
synchronized(SecurityHelper.class) {
262-
try { // TODO fixed since BC 1.55 (only needed on 1.54) and should be removed eventually ...
263-
if (provider.getName().equals(BC_PROVIDER_NAME) && Security.getProvider(BC_PROVIDER_NAME) == null) {
264-
Security.addProvider(provider);
265-
addedBC = true;
266-
}
267-
spi = (CertificateFactorySpi) getImplEngine("CertificateFactory", type);
268-
} finally {
269-
if (addedBC) {
270-
Security.removeProvider(BC_PROVIDER_NAME);
271-
}
272-
}
273-
}
258+
final CertificateFactorySpi spi = (CertificateFactorySpi) getImplEngine("CertificateFactory", type);
274259
if ( spi == null ) throw new CertificateException(type + " not found");
275260
return newInstance(CertificateFactory.class,
276261
new Class[]{ CertificateFactorySpi.class, Provider.class, String.class },

0 commit comments

Comments
 (0)