Skip to content

Commit 67c976c

Browse files
committed
Merge branch 'crlorentzen-main'
2 parents 6543f9a + 46dccdd commit 67c976c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

tls/src/main/java/org/bouncycastle/jsse/provider/FipsUtils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ abstract class FipsUtils
1515
* A.5 (when GCM is used in TLS 1.2) and a mechanism has been integrated into this API accordingly to
1616
* ensure that is the case.
1717
*/
18-
private static final boolean provAllowGCMCiphersIn12 = false;
18+
private static final boolean provAllowGCMCiphersIn12 = PropertyUtils
19+
.getBooleanSystemProperty("org.bouncycastle.jsse.fips.allowGCMCiphersIn12", false);
1920

2021
private static final boolean provAllowRSAKeyExchange = PropertyUtils
2122
.getBooleanSystemProperty("org.bouncycastle.jsse.fips.allowRSAKeyExchange", false);

0 commit comments

Comments
 (0)