From f4b9c3edf8d35c7246853dac72eecd57b248e97f Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Sat, 2 Feb 2013 16:08:52 +0100 Subject: Give the hint of android bug with alphanumeric Keystore Aliases. (closes issue #132) --- src/de/blinkt/openvpn/OpenVpnManagementThread.java | 2 +- src/de/blinkt/openvpn/VpnProfile.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/de/blinkt/openvpn') 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; } -- cgit v1.2.3