mirror/openvpn-android
0
0
Fork 0
mirror of https://github.com/schwabe/ics-openvpn.git synced 2024-09-20 12:02:28 +02:00
Code

Fix crl-verify if the crl path has spaces in it.

Browse Source
This commit is contained in:
Arne Schwabe 2015-08-17 17:21:23 +02:00
parent 760a17bfc3
commit a34b7a56fb
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java
View File

@ -185,14 +185,6 @@ public class ConfigConverter extends Activity implements FileSelectCallback, Vie
if (!TextUtils.isEmpty(mEmbeddedPwFile))
ConfigParser.useEmbbedUserAuth(mResult, mEmbeddedPwFile);
// Only use crl on import if it is found
ConfigParser.removeCRLCustomOption(mResult);
if (!TextUtils.isEmpty(mCrlFileName)) {
// TODO: Convert this to a real config option that is parsed
mResult.mCustomConfigOptions += "\ncrl-verify " + mCrlFileName;
}
vpl.addProfile(mResult);
vpl.saveProfile(this, mResult);
vpl.saveProfileList(this);
@ -518,6 +510,15 @@ public class ConfigConverter extends Activity implements FileSelectCallback, Vie
mEmbeddedPwFile = cp.getAuthUserPassFile();
mEmbeddedPwFile = embedFile(cp.getAuthUserPassFile(), Utils.FileType.USERPW_FILE, false);
mCrlFileName = embedFile(cp.getCrlVerifyFile(), Utils.FileType.CRL_FILE, true);
ConfigParser.removeCRLCustomOption(mResult);
if (!TextUtils.isEmpty(mCrlFileName)) {
// TODO: Convert this to a real config option that is parsed
ConfigParser.removeCRLCustomOption(mResult);
mResult.mCustomConfigOptions += "\ncrl-verify " + VpnProfile.openVpnEscape(mCrlFileName);
} else if (!TextUtils.isEmpty(cp.getCrlVerifyFile())) {
mResult.mCustomConfigOptions += "\n#crl-verify " + VpnProfile.openVpnEscape(cp.getCrlVerifyFile());
}
}
@Override