summaryrefslogtreecommitdiff
path: root/main/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'main/src/main')
-rw-r--r--main/src/main/cpp/CMakeLists.txt1
m---------main/src/main/cpp/openvpn0
m---------main/src/main/cpp/openvpn30
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java2
4 files changed, 2 insertions, 1 deletions
diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt
index 655c8aad..1003517a 100644
--- a/main/src/main/cpp/CMakeLists.txt
+++ b/main/src/main/cpp/CMakeLists.txt
@@ -192,6 +192,7 @@ set(openvpn_srcs
src/openvpn/ssl.c
src/openvpn/ssl_openssl.c
src/openvpn/ssl_mbedtls.c
+ src/openvpn/ssl_ncp.c
src/openvpn/ssl_verify.c
src/openvpn/ssl_verify_openssl.c
src/openvpn/ssl_verify_mbedtls.c
diff --git a/main/src/main/cpp/openvpn b/main/src/main/cpp/openvpn
-Subproject 5493c5fa82dd300aae89f228ff7ba8144b54c68
+Subproject 4d0a38d148a24c608b3eb855bd30f02b2d7aa70
diff --git a/main/src/main/cpp/openvpn3 b/main/src/main/cpp/openvpn3
-Subproject 636e3d238f12d0aae6ac567ea112f4726335c8c
+Subproject 3e4e52f456aa20a3dcf6095dc454f50fc88eec1
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
index c8609e41..305ab2a8 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
@@ -760,7 +760,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
String[] arguments = argument.split(",");
- boolean pkcs1padding = arguments[1].equals("PKCS1");
+ boolean pkcs1padding = arguments[1].equals("RSA_PKCS1_PADDING");
String signed_string = mProfile.getSignedData(mOpenVPNService, arguments[0], pkcs1padding);
if (signed_string == null) {