This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/pekko.git
The following commit(s) were added to refs/heads/1.3.x by this push:
new 594e0572e1 don't test SessionRenegotiationFirstOne on java 24 (#2003)
(#2508)
594e0572e1 is described below
commit 594e0572e135ff01733ee85d0e3ae0c38ebd2c3b
Author: PJ Fanning <[email protected]>
AuthorDate: Sun Nov 16 11:17:13 2025 +0100
don't test SessionRenegotiationFirstOne on java 24 (#2003) (#2508)
---
.../apache/pekko/stream/io/DeprecatedTlsSpec.scala | 19 +++++++++++----
.../scala/org/apache/pekko/stream/io/TlsSpec.scala | 27 ++++++++++++++--------
2 files changed, 32 insertions(+), 14 deletions(-)
diff --git
a/stream-tests/src/test/scala/org/apache/pekko/stream/io/DeprecatedTlsSpec.scala
b/stream-tests/src/test/scala/org/apache/pekko/stream/io/DeprecatedTlsSpec.scala
index a108b30457..828d371c2a 100644
---
a/stream-tests/src/test/scala/org/apache/pekko/stream/io/DeprecatedTlsSpec.scala
+++
b/stream-tests/src/test/scala/org/apache/pekko/stream/io/DeprecatedTlsSpec.scala
@@ -357,6 +357,19 @@ class DeprecatedTlsSpec extends
StreamSpec(DeprecatedTlsSpec.configOverrides) wi
def output = ByteString("TLS_ECDHE_RSA_WITH_AES_128_CBC_SHAhello")
}
+ val renegotiationScenarios = if (JavaVersion.majorVersion <= 21)
+ Seq(
+ SessionRenegotiationBySender,
+ SessionRenegotiationByReceiver,
+ SessionRenegotiationFirstOne,
+ SessionRenegotiationFirstTwo)
+ else
+ // skip SessionRenegotiationFirstOne as it uses a weak cipher suite and
the test will fail
+ Seq(
+ SessionRenegotiationBySender,
+ SessionRenegotiationByReceiver,
+ SessionRenegotiationFirstTwo)
+
val scenarios =
Seq(
SingleBytes,
@@ -369,11 +382,7 @@ class DeprecatedTlsSpec extends
StreamSpec(DeprecatedTlsSpec.configOverrides) wi
CancellingRHS,
CancellingRHSIgnoresBoth,
LHSIgnoresBoth,
- BothSidesIgnoreBoth,
- SessionRenegotiationBySender,
- SessionRenegotiationByReceiver,
- SessionRenegotiationFirstOne,
- SessionRenegotiationFirstTwo)
+ BothSidesIgnoreBoth) ++ renegotiationScenarios
for {
commPattern <- communicationPatterns
diff --git
a/stream-tests/src/test/scala/org/apache/pekko/stream/io/TlsSpec.scala
b/stream-tests/src/test/scala/org/apache/pekko/stream/io/TlsSpec.scala
index 6c99b74bd9..1e47f4d198 100644
--- a/stream-tests/src/test/scala/org/apache/pekko/stream/io/TlsSpec.scala
+++ b/stream-tests/src/test/scala/org/apache/pekko/stream/io/TlsSpec.scala
@@ -390,6 +390,23 @@ class TlsSpec extends StreamSpec(TlsSpec.configOverrides)
with WithLogCapturing
def output = ByteString("TLS_ECDHE_RSA_WITH_AES_128_CBC_SHAhello")
}
+ val renegotiationScenarios = if (protocol == "TLSv1.2") {
+ if (JavaVersion.majorVersion <= 21)
+ Seq(
+ SessionRenegotiationBySender,
+ SessionRenegotiationByReceiver,
+ SessionRenegotiationFirstOne,
+ SessionRenegotiationFirstTwo)
+ else
+ // skip SessionRenegotiationFirstOne as it uses a weak cipher suite
and the test will fail
+ Seq(
+ SessionRenegotiationBySender,
+ SessionRenegotiationByReceiver,
+ SessionRenegotiationFirstTwo)
+ } else
+ // TLSv1.3 doesn't support renegotiation
+ Nil
+
val scenarios =
Seq(
SingleBytes,
@@ -402,15 +419,7 @@ class TlsSpec extends StreamSpec(TlsSpec.configOverrides)
with WithLogCapturing
CancellingRHS,
CancellingRHSIgnoresBoth,
LHSIgnoresBoth,
- BothSidesIgnoreBoth) ++
- (if (protocol == "TLSv1.2")
- Seq(
- SessionRenegotiationBySender,
- SessionRenegotiationByReceiver,
- SessionRenegotiationFirstOne,
- SessionRenegotiationFirstTwo)
- else // TLSv1.3 doesn't support renegotiation
- Nil)
+ BothSidesIgnoreBoth) ++ renegotiationScenarios
for {
commPattern <- communicationPatterns
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
