summaryrefslogtreecommitdiff
path: root/main/src/ovpn3/java
diff options
context:
space:
mode:
authorArne Schwabe <arne@openvpn.net>2019-02-07 17:11:01 +0100
committerArne Schwabe <arne@openvpn.net>2019-02-07 17:11:01 +0100
commit10be307704a6d22e9f7344e6b18066626b0040dd (patch)
tree087d68d76ac60164d6186f7558e7f39aaf9df54e /main/src/ovpn3/java
parent0f3032f97c14424543835f215520a714ac040ffb (diff)
Fix building openvpn3 related files
Also remove noovpn3. I don't use it myself and don't want to spend the time right now to fix it.
Diffstat (limited to 'main/src/ovpn3/java')
-rw-r--r--main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java13
1 files changed, 6 insertions, 7 deletions
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 fab090b7..0384985e 100644
--- a/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
+++ b/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
@@ -5,6 +5,8 @@ import de.blinkt.openvpn.R;
import de.blinkt.openvpn.VpnProfile;
import net.openvpn.ovpn3.*;
+import net.openvpn.ovpn3.ClientAPI_OpenVPNClient;
+
import static net.openvpn.ovpn3.ClientAPI_OpenVPNClient.copyright;
import static net.openvpn.ovpn3.ClientAPI_OpenVPNClient.init_process;
import static net.openvpn.ovpn3.ClientAPI_OpenVPNClient.platform;
@@ -12,9 +14,6 @@ import static net.openvpn.ovpn3.ClientAPI_OpenVPNClient.platform;
public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable, OpenVPNManagement {
static {
- /*System.loadLibrary("crypto");
- System.loadLibrary("ssl");*/
- //System.loadLibrary("polarssl-dynamic");
System.loadLibrary("ovpn3");
}
@@ -223,14 +222,14 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable
@Override
public void external_pki_sign_request(ClientAPI_ExternalPKISignRequest signreq) {
- VpnStatus.logDebug("Got external PKI signing request from OpenVPN core for algorithm " + signreq.getAlgorithm());
+ VpnStatus.logDebug("Got external PKI signing request from OpenVPN core for algorithm " + signreq.getPadding());
boolean pkcs1padding;
- if (signreq.getAlgorithm().equals("RSA_PKCS1_PADDING"))
+ if (signreq.getPadding().equals("RSA_PKCS1_PADDING"))
pkcs1padding = true;
- else if (signreq.getAlgorithm().equals("RSA_NO_PADDING"))
+ else if (signreq.getPadding().equals("RSA_NO_PADDING"))
pkcs1padding = false;
else
- throw new IllegalArgumentException("Illegal padding in sign request" + signreq.getAlgorithm());
+ throw new IllegalArgumentException("Illegal padding in sign request" + signreq.getPadding());
signreq.setSig(mVp.getSignedData(mService, signreq.getData(), pkcs1padding));
}