arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-16 17:42:03 +00:00
Code Issues Releases Wiki Activity

SNI support for Android <4.2, too (see issue #9)

Browse Source
This commit is contained in:
rfc2822 2014-03-29 17:02:02 +01:00
parent f92d114c01
commit 65f7053c02
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -5,6 +5,7 @@ Please see the [DAVdroid Web site](http://davdroid.bitfire.at).
USED THIRD-PARTY LIBRARIES
==========================
* [Apache HttpClient](http://hc.apache.org) ([Apache License](http://www.apache.org/licenses/))
* [iCal4j](http://ical4j.sourceforge.net/) ([New BSD License](http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE))
* [ez-vcard](https://code.google.com/p/ez-vcard/) ([New BSD License](http://opensource.org/licenses/BSD-3-Clause))
* [Simple XML Serialization](http://simple.sourceforge.net/) ([Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0))

12
src/at/bitfire/davdroid/webdav/TlsSniSocketFactory.java
View File

@ -56,10 +56,18 @@ public class TlsSniSocketFactory implements LayeredConnectionSocketFactory {
// set up SNI before the handshake
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
// Android 4.2+, use documented way to set SNI host name
Log.d(TAG, "Setting SNI hostname");
sslSocketFactory.setHostname(ssl, host.getHostName());
} else
Log.i(TAG, "No SNI support below Android 4.2!");
} else {
Log.d(TAG, "No documented SNI support on Android <4.2, trying with reflection");
try {
java.lang.reflect.Method setHostnameMethod = ssl.getClass().getMethod("setHostname", String.class);
setHostnameMethod.invoke(ssl, host.getHostName());
} catch (Exception e) {
Log.w(TAG, "SNI not useable", e);
}
}
// verify hostname and certificate
SSLSession session = ssl.getSession();

10
test/src/at/bitfire/davdroid/webdav/test/WebDavResourceTest.java
View File

@ -166,20 +166,14 @@ public class WebDavResourceTest extends InstrumentationTestCase {
public void testGetHttpsWithSni() throws URISyntaxException, HttpException, IOException, DavException {
WebDavResource file = new WebDavResource(httpClient, new URI("https://sni.velox.ch"), false);
boolean sniWorking;
boolean sniWorking = false;
try {
file.get();
sniWorking = true;
} catch (SSLPeerUnverifiedException e) {
sniWorking = false;
}
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
// SNI should be available in Android 4.2+
assertTrue(sniWorking);
} else
Log.i(TAG, "SNI not tested (only available in Android 4.2+)");
assertTrue(sniWorking);
}
public void testMultiGet() throws DavException, IOException, HttpException {