Skip to content

Commit 504d27c

Browse files
authored
Merge pull request #123 from dwijnand/public
Make parts of FakeKeyStore public for Play/Lagom
2 parents d695f63 + b02dc89 commit 504d27c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

ssl-config-core/src/main/scala/com/typesafe/sslconfig/ssl/FakeKeyStore.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,9 @@ object FakeKeyStore {
4242
* Generate a fresh KeyStore object in memory. This KeyStore
4343
* is not saved to disk. If you want that, then call `keyManagerFactory`.
4444
*
45-
* This method has has `private[ssl]` access so it can be used for
46-
* testing.
45+
* This method is public only for consumption by Play/Lagom.
4746
*/
48-
private[ssl] def generateKeyStore: KeyStore = {
47+
def generateKeyStore: KeyStore = {
4948
// Create a new KeyStore
5049
val keyStore: KeyStore = KeyStore.getInstance("JKS")
5150

@@ -235,7 +234,8 @@ final class FakeKeyStore(mkLogger: LoggerFactory) {
235234
}
236235
}
237236

238-
private[ssl] def keyManagerFactory(appPath: File): KeyManagerFactory = {
237+
/** Public only for consumption by Play/Lagom. */
238+
def keyManagerFactory(appPath: File): KeyManagerFactory = {
239239
val keyStore = createKeyStore(appPath)
240240

241241
// Load the key and certificate into a key manager factory

0 commit comments

Comments
 (0)