diff options
| -rw-r--r-- | main/src/main/cpp/CMakeLists.txt | 1 | ||||
| m--------- | main/src/main/cpp/openvpn | 0 | ||||
| m--------- | main/src/main/cpp/openvpn3 | 0 | ||||
| -rw-r--r-- | main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java | 2 | ||||
| -rw-r--r-- | main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java | 5 | 
5 files changed, 7 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) {
 diff --git a/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java b/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java index c74281e7..4c96e4d6 100644 --- a/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java +++ b/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java @@ -13,6 +13,7 @@ import net.openvpn.ovpn3.ClientAPI_DynamicChallenge;  import java.nio.charset.Charset;  import java.nio.charset.StandardCharsets; +import java.util.Locale;  import static de.blinkt.openvpn.VpnProfile.AUTH_RETRY_NOINTERACT; @@ -228,6 +229,8 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable              pkcs1padding = true;          else if (signreq.getAlgorithm().equals("RSA_NO_PADDING"))              pkcs1padding = false; +        else if (signreq.getAlgorithm().equals("ECDSA")) +            pkcs1padding = false;          else              throw new IllegalArgumentException("Illegal padding in sign request" + signreq.getAlgorithm());          signreq.setSig(mVp.getSignedData(mService, signreq.getData(), pkcs1padding)); @@ -288,6 +291,8 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable              } else {                  VpnStatus.logInfo(R.string.info_from_server, info);              } +        } else if (name.equals("COMPRESSION_ENABLED")) { +            VpnStatus.logInfo(String.format(Locale.US, "%s: %s", name, info));          } else {              VpnStatus.updateStateString(name, info);          }  | 
