diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-08-23 12:35:11 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2013-08-23 12:35:11 +0200 |
| commit | f481f5508518f172a39c81829264df8686fe7872 (patch) | |
| tree | be54184cb59a856c4e666e52509e9d43f31d2e23 /src/de/blinkt/openvpn | |
| parent | 1f9cffc79e8d17b1c8b0bb28a7bf667a86f94bb9 (diff) | |
Fix TLS 1.2 and Android 4.1
Diffstat (limited to 'src/de/blinkt/openvpn')
| -rw-r--r-- | src/de/blinkt/openvpn/VpnProfile.java | 1 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/core/OpenVpnManagementThread.java | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java index a8c6825f..3a2f2bbf 100644 --- a/src/de/blinkt/openvpn/VpnProfile.java +++ b/src/de/blinkt/openvpn/VpnProfile.java @@ -838,6 +838,7 @@ public class VpnProfile implements Serializable { int pkey = (Integer) getPkeyContext.invoke(opensslkey); getPkeyContext.setAccessible(false); + // 112 with TLS 1.2 (172 back with 4.3), 36 with TLS 1.0 byte[] signed_bytes = NativeUtils.rsasign(data, pkey); return Base64.encodeToString(signed_bytes, Base64.NO_WRAP); diff --git a/src/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/src/de/blinkt/openvpn/core/OpenVpnManagementThread.java index 7e436f79..9497f18b 100644 --- a/src/de/blinkt/openvpn/core/OpenVpnManagementThread.java +++ b/src/de/blinkt/openvpn/core/OpenVpnManagementThread.java @@ -504,9 +504,15 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement { private void processSignCommand(String b64data) {
String signed_string = mProfile.getSignedData(b64data);
- managmentCommand("rsa-sig\n");
+ if(signed_string==null) {
+ managmentCommand("rsa-sig\n");
+ managmentCommand("\nEND\n");
+ stopOpenVPN();
+ return;
+ }
+ managmentCommand("rsa-sig\n");
managmentCommand(signed_string);
- managmentCommand("\nEND\n");
+ managmentCommand("\nEND\n");
}
@Override
|