summaryrefslogtreecommitdiff
path: root/src/de/blinkt
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2013-02-02 16:08:52 +0100
committerArne Schwabe <arne@rfc2549.org>2013-02-02 16:08:52 +0100
commitf4b9c3edf8d35c7246853dac72eecd57b248e97f (patch)
treee940fee50b74f5fe378c7ca76b368471b71b5954 /src/de/blinkt
parentefcb835eb288c383d30d0c600c3c86decedac630 (diff)
Give the hint of android bug with alphanumeric Keystore Aliases. (closes issue #132)
Diffstat (limited to 'src/de/blinkt')
-rw-r--r--src/de/blinkt/openvpn/OpenVpnManagementThread.java2
-rw-r--r--src/de/blinkt/openvpn/VpnProfile.java6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/de/blinkt/openvpn/OpenVpnManagementThread.java b/src/de/blinkt/openvpn/OpenVpnManagementThread.java
index dd3708cf..c67d027d 100644
--- a/src/de/blinkt/openvpn/OpenVpnManagementThread.java
+++ b/src/de/blinkt/openvpn/OpenVpnManagementThread.java
@@ -483,7 +483,7 @@ public class OpenVpnManagementThread implements Runnable {
// The Jelly Bean *evil* Hack
// 4.2 implements the RSA/ECB/PKCS1PADDING in the OpenSSLprovider
- if(Build.VERSION.SDK_INT==16){
+ if(Build.VERSION.SDK_INT==Build.VERSION_CODES.JELLY_BEAN){
processSignJellyBeans(privkey,data);
return;
}
diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java
index d8b22ae6..74f01a3b 100644
--- a/src/de/blinkt/openvpn/VpnProfile.java
+++ b/src/de/blinkt/openvpn/VpnProfile.java
@@ -25,6 +25,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
+import android.os.Build;
import android.preference.PreferenceManager;
import android.security.KeyChain;
import android.security.KeyChainException;
@@ -577,6 +578,11 @@ public class VpnProfile implements Serializable{
e.printStackTrace();
} catch (KeyChainException e) {
OpenVPN.logMessage(0,"",context.getString(R.string.keychain_access));
+ if(Build.VERSION.SDK_INT==Build.VERSION_CODES.JELLY_BEAN){
+ if(!mAlias.matches("^[a-zA-Z0-9]$")) {
+ OpenVPN.logError(R.string.jelly_keystore_alphanumeric_bug);
+ }
+ }
}
return false;
}