summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qsslsocket_p.h
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@digia.com>2013-07-25 14:40:06 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-29 15:38:51 +0200
commit591584d9a940d374e20a62573d71054e0081c6ac (patch)
tree4b460f575c8018b8e80dd27d8f74ce4049067023 /src/network/ssl/qsslsocket_p.h
parent71535ad6bcad71793e29a7cd92197dda5274b331 (diff)
Android: Get SSL root certificates from TrustManager
On Android, when not using Ministro, we cannot read certificates from the file system, so we have to get them through Java APIs instead. Change-Id: I415329fcb45836735c1112dbe832214b3c73dc9a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/network/ssl/qsslsocket_p.h')
-rw-r--r--src/network/ssl/qsslsocket_p.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h
index 9369dab8e7..6ce34ba06f 100644
--- a/src/network/ssl/qsslsocket_p.h
+++ b/src/network/ssl/qsslsocket_p.h
@@ -197,6 +197,9 @@ public:
private:
static bool ensureLibraryLoaded();
static void ensureCiphersAndCertsLoaded();
+#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
+ static QList<QByteArray> fetchSslCertificateData();
+#endif
static bool s_libraryLoaded;
static bool s_loadedCiphersAndCerts;