summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Hartmann <phartmann@rim.com>2013-01-14 09:28:58 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-14 14:09:17 (GMT)
commit1e1486b9cf49e1bb26f44cde7f7a6667614585b0 (patch)
tree8139ad0e70e8243b5a8444514ab8ea30baaa0a0b
parent22c7167904a813b4e2179719b071e5846e130e47 (diff)
downloadQt-1e1486b9cf49e1bb26f44cde7f7a6667614585b0.zip
Qt-1e1486b9cf49e1bb26f44cde7f7a6667614585b0.tar.gz
Qt-1e1486b9cf49e1bb26f44cde7f7a6667614585b0.tar.bz2
BlackBerry: change SSL root cert folder
Currently /etc/openssl/certs is symlinked to /var/certmgr/web/user_trusted, but this will be changed in the future. /etc/openssl/certs is the folder to be used to read the root certs. (cherry picked from commit 4c8d8a72ec65f409394075ef50401265e495c1dd) Change-Id: I80820374586b5a9038e8b69206b6c9b05f486a07 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--src/network/ssl/qsslsocket.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 7f1edb6..668449a 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -2305,7 +2305,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
+ << "/etc/openssl/certs/" // BlackBerry
<< "/opt/openssl/certs/"; // HP-UX
}