Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/nightly-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,11 @@ jobs:
- { scalaVersion: "2.13", jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '' }
- { scalaVersion: "2.13", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '' }
- { scalaVersion: "2.13", jdkVersion: "1.21.0", jvmName: "temurin:1.21", extraOpts: '' }
- { scalaVersion: "2.13", jdkVersion: "1.24.0", jvmName: "temurin:1.24", extraOpts: '' }

# { scalaVersion: "3.3", jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '' }
- { scalaVersion: "3.3", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '' }
- { scalaVersion: "3.3", jdkVersion: "1.24.0", jvmName: "temurin:1.24", extraOpts: '' }
steps:
- name: Checkout
# https://github.com/actions/checkout/releases
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,7 @@ class TcpSpec extends StreamSpec("""
val engine = sslContext.createSSLEngine()

engine.setUseClientMode(role == akka.stream.Client)
engine.setEnabledCipherSuites(Array("TLS_RSA_WITH_AES_128_CBC_SHA"))
engine.setEnabledCipherSuites(Array("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"))
engine.setEnabledProtocols(Array("TLSv1.2"))

engine
Expand Down
8 changes: 3 additions & 5 deletions akka-stream-tests/src/test/scala/akka/stream/io/TlsSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -392,11 +392,9 @@ class TlsSpec extends StreamSpec(TlsSpec.configOverrides) with WithLogCapturing
LHSIgnoresBoth,
BothSidesIgnoreBoth) ++
(if (protocol == "TLSv1.2")
Seq(
SessionRenegotiationBySender,
SessionRenegotiationByReceiver,
SessionRenegotiationFirstOne,
SessionRenegotiationFirstTwo)
Seq(SessionRenegotiationBySender, SessionRenegotiationByReceiver, SessionRenegotiationFirstTwo) ++
// RSA cipher suites disabled by default in JDK 24 and later
(if (JavaVersion.majorVersion < 24) Seq(SessionRenegotiationFirstOne) else Nil)
else // TLSv1.3 doesn't support renegotiation
Nil)

Expand Down
Loading