diff --git a/android/src/main/java/com/asterinet/react/tcpsocket/SSLCertificateHelper.java b/android/src/main/java/com/asterinet/react/tcpsocket/SSLCertificateHelper.java index 1e0622f..8cd3d0b 100644 --- a/android/src/main/java/com/asterinet/react/tcpsocket/SSLCertificateHelper.java +++ b/android/src/main/java/com/asterinet/react/tcpsocket/SSLCertificateHelper.java @@ -63,8 +63,8 @@ static SSLSocketFactory createBlindSocketFactory() throws GeneralSecurityExcepti return ctx.getSocketFactory(); } - static SSLServerSocketFactory createServerSocketFactory(Context context, @NonNull final String keyStoreResourceUri) throws GeneralSecurityException, IOException { - char[] password = "".toCharArray(); + static SSLServerSocketFactory createServerSocketFactory(Context context, @NonNull final String keyStoreResourceUri, final String passphrase) throws GeneralSecurityException, IOException { + char[] password = (passphrase != null) ? passphrase.toCharArray() : "".toCharArray(); InputStream keyStoreInput = getRawResourceStream(context, keyStoreResourceUri); KeyStore keyStore = KeyStore.getInstance("PKCS12"); diff --git a/android/src/main/java/com/asterinet/react/tcpsocket/TcpSocketServer.java b/android/src/main/java/com/asterinet/react/tcpsocket/TcpSocketServer.java index 2f13fdf..16ddfd3 100644 --- a/android/src/main/java/com/asterinet/react/tcpsocket/TcpSocketServer.java +++ b/android/src/main/java/com/asterinet/react/tcpsocket/TcpSocketServer.java @@ -40,8 +40,9 @@ public TcpSocketServer(final Context context, final ConcurrentHashMap