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

Merge pull request #29049 from ignasi35/bump-algorithm-defaults

Browse source
This commit is contained in:
Ignasi Marimon-Clos 2020-05-12 21:31:07 +02:00 • committed by GitHub
commit 01b24fb4f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
akka-remote/src/main/resources/reference.conf
View file

@ -661,12 +661,18 @@ akka {
# https://blogs.oracle.com/java-platform-group/entry/java_8_will_use_tls # https://blogs.oracle.com/java-platform-group/entry/java_8_will_use_tls
protocol = "TLSv1.2" protocol = "TLSv1.2"
# Example: ["TLS_RSA_WITH_AES_128_CBC_SHA", "TLS_RSA_WITH_AES_256_CBC_SHA"] # Example: ["TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
# "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
# "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",
# "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"]
# When doing rolling upgrades, make sure to include both the algorithm used
# by old nodes and the preferred algorithm.
# If you use a JDK 8 prior to 8u161 you need to install # If you use a JDK 8 prior to 8u161 you need to install
# the JCE Unlimited Strength Jurisdiction Policy Files to use AES 256. # the JCE Unlimited Strength Jurisdiction Policy Files to use AES 256.
# More info here: # More info here:
# https://www.oracle.com/java/technologies/javase-jce-all-downloads.html # https://www.oracle.com/java/technologies/javase-jce-all-downloads.html
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"]
# There are two options, and the default SecureRandom is recommended: # There are two options, and the default SecureRandom is recommended:
# "" or "SecureRandom" => (default) # "" or "SecureRandom" => (default)
@ -1133,12 +1139,18 @@ akka {
# https://blogs.oracle.com/java-platform-group/entry/java_8_will_use_tls # https://blogs.oracle.com/java-platform-group/entry/java_8_will_use_tls
protocol = "TLSv1.2" protocol = "TLSv1.2"
# Example: ["TLS_RSA_WITH_AES_128_CBC_SHA", "TLS_RSA_WITH_AES_256_CBC_SHA"] # Example: ["TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
# "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
# "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",
# "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"]
# When doing rolling upgrades, make sure to include both the algorithm used
# by old nodes and the preferred algorithm.
# If you use a JDK 8 prior to 8u161 you need to install # If you use a JDK 8 prior to 8u161 you need to install
# the JCE Unlimited Strength Jurisdiction Policy Files to use AES 256. # the JCE Unlimited Strength Jurisdiction Policy Files to use AES 256.
# More info here: # More info here:
# https://www.oracle.com/java/technologies/javase-jce-all-downloads.html # https://www.oracle.com/java/technologies/javase-jce-all-downloads.html
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"]
# There are two options, and the default SecureRandom is recommended: # There are two options, and the default SecureRandom is recommended:
# "" or "SecureRandom" => (default) # "" or "SecureRandom" => (default)

3
akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
View file

@ -130,7 +130,8 @@ class RemoteConfigSpec extends AkkaSpec("""
sslSettings.SSLTrustStore should ===("truststore") sslSettings.SSLTrustStore should ===("truststore")
sslSettings.SSLTrustStorePassword should ===("changeme") sslSettings.SSLTrustStorePassword should ===("changeme")
sslSettings.SSLProtocol should ===("TLSv1.2") sslSettings.SSLProtocol should ===("TLSv1.2")
sslSettings.SSLEnabledAlgorithms should ===(Set("TLS_RSA_WITH_AES_128_CBC_SHA")) sslSettings.SSLEnabledAlgorithms should ===(
Set("TLS_RSA_WITH_AES_128_CBC_SHA", "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"))
sslSettings.SSLRandomNumberGenerator should ===("") sslSettings.SSLRandomNumberGenerator should ===("")
} }

3
akka-remote/src/test/scala/akka/remote/Ticket1978ConfigSpec.scala
View file

@ -23,7 +23,8 @@ class Ticket1978ConfigSpec extends AkkaSpec("""
settings.SSLTrustStore should ===("truststore") settings.SSLTrustStore should ===("truststore")
settings.SSLTrustStorePassword should ===("changeme") settings.SSLTrustStorePassword should ===("changeme")
settings.SSLProtocol should ===("TLSv1.2") settings.SSLProtocol should ===("TLSv1.2")
settings.SSLEnabledAlgorithms should ===(Set("TLS_RSA_WITH_AES_128_CBC_SHA")) settings.SSLEnabledAlgorithms should ===(
Set("TLS_RSA_WITH_AES_128_CBC_SHA", "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"))
settings.SSLRandomNumberGenerator should ===("SecureRandom") settings.SSLRandomNumberGenerator should ===("SecureRandom")
} }
} }