summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorsfabry <stephane.fabry@gmail.com>2013-09-27 21:43:30 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-03 23:32:16 +0200
commit1c1771effc8b4ebdb5532bdfef063d292407f8c0 (patch)
treea5c5fc579dfeee329b4727c45322e6e7b1bc7508 /src/network
parentcdf0c5905b3477c6cd01c519f883b7bb55447120 (diff)
Fix ssh root certificates path for Blackberry playbook OS.
This was removed by commit 4c8d8a72ec65f409394075ef50401265e495c1dd But without it Playbook OS 2.1.0.1753 could not access ssh properly. Change-Id: I18e136eaede2a5dffeb10b5fe31023b9aef709cb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/ssl/qsslsocket.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 0e7ac39d14..14063812c4 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -2439,6 +2439,7 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories()
<< "/usr/local/ssl/" // Normal OpenSSL Tarball
<< "/var/ssl/certs/" // AIX
<< "/usr/local/ssl/certs/" // Solaris
+ << "/var/certmgr/web/user_trusted/" // BlackBerry Playbook
<< "/etc/openssl/certs/" // BlackBerry
<< "/opt/openssl/certs/"; // HP-UX
}