From dbe72a6bf3e1464049e9f71fed21abe5a70eceb4 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 20 Jun 2012 00:47:11 +0200
Subject: [PATCH] Making AkkaProvider a Scala Object

---
 .../main/scala/akka/remote/netty/NettySSLSupport.scala   | 9 ++++-----
 .../src/main/scala/akka/remote/netty/Settings.scala      | 3 ++-
 .../main/scala/akka/security/provider/AkkaProvider.scala | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettySSLSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettySSLSupport.scala
index 0ab188425c..9a16a1e5f5 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/NettySSLSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/NettySSLSupport.scala
@@ -18,8 +18,7 @@ import akka.security.provider.AkkaProvider
  */
 private[akka] object NettySSLSupport {
 
-  val akka = new AkkaProvider
-  Security.addProvider(akka)
+  Security addProvider AkkaProvider
 
   /**
    * Construct a SSLHandler which can be inserted into a Netty server/client pipeline
@@ -38,7 +37,7 @@ private[akka] object NettySSLSupport {
     val rng = rngName match {
       case Some(r @ ("AES128CounterRNGFast" | "AES128CounterRNGSecure" | "AES256CounterRNGSecure")) ⇒
         log.debug("SSL random number generator set to: {}", r)
-        SecureRandom.getInstance(r, akka)
+        SecureRandom.getInstance(r, AkkaProvider)
       case Some("SHA1PRNG") ⇒
         log.debug("SSL random number generator set to: SHA1PRNG")
         // This needs /dev/urandom to be the source on Linux to prevent problems with /dev/random blocking
@@ -91,7 +90,7 @@ private[akka] object NettySSLSupport {
         new SslHandler({
           val sslEngine = context.createSSLEngine
           sslEngine.setUseClientMode(true)
-          sslEngine.setEnabledCipherSuites(settings.SSLEnabledAlgorithms.toArray.map(_.toString))
+          sslEngine.setEnabledCipherSuites(settings.SSLEnabledAlgorithms.toArray)
           sslEngine
         })
       case None ⇒
@@ -133,7 +132,7 @@ private[akka] object NettySSLSupport {
         log.debug("Using server SSL context to create SSLEngine ...")
         val sslEngine = context.createSSLEngine
         sslEngine.setUseClientMode(false)
-        sslEngine.setEnabledCipherSuites(settings.SSLEnabledAlgorithms.toArray.map(_.toString))
+        sslEngine.setEnabledCipherSuites(settings.SSLEnabledAlgorithms.toArray)
         new SslHandler(sslEngine)
       case None ⇒ throw new GeneralSecurityException(
         """Failed to initialize server SSL because SSL context could not be found.
diff --git a/akka-remote/src/main/scala/akka/remote/netty/Settings.scala b/akka-remote/src/main/scala/akka/remote/netty/Settings.scala
index d168c67eca..ada257f674 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/Settings.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/Settings.scala
@@ -8,6 +8,7 @@ import akka.util.Duration
 import java.util.concurrent.TimeUnit._
 import java.net.InetAddress
 import akka.ConfigurationException
+import scala.collection.JavaConverters.iterableAsScalaIterableConverter
 
 private[akka] class NettySettings(config: Config, val systemName: String) {
 
@@ -106,7 +107,7 @@ private[akka] class NettySettings(config: Config, val systemName: String) {
     case password ⇒ Some(password)
   }
 
-  val SSLEnabledAlgorithms = getStringList("ssl.enabled-algorithms").toArray.toSet
+  val SSLEnabledAlgorithms = iterableAsScalaIterableConverter(getStringList("ssl.enabled-algorithms")).asScala.toSet[String]
 
   val SSLProtocol = getString("ssl.protocol") match {
     case ""       ⇒ None
diff --git a/akka-remote/src/main/scala/akka/security/provider/AkkaProvider.scala b/akka-remote/src/main/scala/akka/security/provider/AkkaProvider.scala
index 1ed93557a6..0b85231348 100644
--- a/akka-remote/src/main/scala/akka/security/provider/AkkaProvider.scala
+++ b/akka-remote/src/main/scala/akka/security/provider/AkkaProvider.scala
@@ -3,13 +3,13 @@
  */
 package akka.security.provider
 
-import java.security.{ PrivilegedAction, AccessController, Provider }
+import java.security.{ PrivilegedAction, AccessController, Provider, Security }
 
 /**
  * A provider that for AES128CounterRNGFast, a cryptographically secure random number generator through SecureRandom
  */
-final class AkkaProvider extends Provider("Akka", 1.0, "Akka provider 1.0 that implements a secure AES random number generator") {
-  AccessController.doPrivileged(new PrivilegedAction[AkkaProvider] {
+object AkkaProvider extends Provider("Akka", 1.0, "Akka provider 1.0 that implements a secure AES random number generator") {
+  AccessController.doPrivileged(new PrivilegedAction[this.type] {
     def run = {
       //SecureRandom
       put("SecureRandom.AES128CounterRNGFast", classOf[AES128CounterRNGFast].getName)