raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Use new TLS algorithm defaults in remoting tests (#29074)

Browse source 
* Use the new dafaults in remoting tests

* scalafmt
This commit is contained in:
Ignasi Marimon-Clos 2020-05-18 09:40:22 +02:00 • committed by GitHub
parent 54a9b3189a
commit 36c6bc1d07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
View file

@ -111,10 +111,12 @@ object Configuration {
} }
class Ticket1978SHA1PRNGSpec class Ticket1978SHA1PRNGSpec
extends Ticket1978CommunicationSpec(getCipherConfig("SHA1PRNG", "TLS_RSA_WITH_AES_128_CBC_SHA")) extends Ticket1978CommunicationSpec(
getCipherConfig("SHA1PRNG", "TLS_RSA_WITH_AES_128_CBC_SHA", "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"))
class Ticket1978DefaultRNGSecureSpec class Ticket1978DefaultRNGSecureSpec
extends Ticket1978CommunicationSpec(getCipherConfig("", "TLS_RSA_WITH_AES_128_CBC_SHA")) extends Ticket1978CommunicationSpec(
getCipherConfig("", "TLS_RSA_WITH_AES_128_CBC_SHA", "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"))
class Ticket1978CrappyRSAWithMD5OnlyHereToMakeSureThingsWorkSpec class Ticket1978CrappyRSAWithMD5OnlyHereToMakeSureThingsWorkSpec
extends Ticket1978CommunicationSpec(getCipherConfig("", "SSL_RSA_WITH_NULL_MD5")) extends Ticket1978CommunicationSpec(getCipherConfig("", "SSL_RSA_WITH_NULL_MD5"))

4
akka-remote/src/test/scala/akka/remote/artery/tcp/TlsTcpSpec.scala
View file

@ -33,7 +33,7 @@ class TlsTcpWithSHA1PRNGSpec
extends TlsTcpSpec(ConfigFactory.parseString(""" extends TlsTcpSpec(ConfigFactory.parseString("""
akka.remote.artery.ssl.config-ssl-engine { akka.remote.artery.ssl.config-ssl-engine {
random-number-generator = "SHA1PRNG" random-number-generator = "SHA1PRNG"
enabled-algorithms = ["TLS_RSA_WITH_AES_128_CBC_SHA"] enabled-algorithms = ["TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"]
} }
""")) """))
@ -41,7 +41,7 @@ class TlsTcpWithDefaultRNGSecureSpec
extends TlsTcpSpec(ConfigFactory.parseString(""" extends TlsTcpSpec(ConfigFactory.parseString("""
akka.remote.artery.ssl.config-ssl-engine { akka.remote.artery.ssl.config-ssl-engine {
random-number-generator = "" random-number-generator = ""
enabled-algorithms = ["TLS_RSA_WITH_AES_128_CBC_SHA"] enabled-algorithms = ["TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"]
} }
""")) """))

2
akka-remote/src/test/scala/akka/remote/classic/RemotingSpec.scala
View file

@ -73,7 +73,7 @@ object RemotingSpec {
key-password = "changeme" key-password = "changeme"
trust-store-password = "changeme" trust-store-password = "changeme"
protocol = "TLSv1.2" protocol = "TLSv1.2"
enabled-algorithms = [TLS_RSA_WITH_AES_128_CBC_SHA] enabled-algorithms = [TLS_RSA_WITH_AES_128_CBC_SHA, TLS_DHE_RSA_WITH_AES_256_GCM_SHA384]
} }
common-netty-settings { common-netty-settings {