summaryrefslogtreecommitdiffstats
path: root/tests/auto/qsslsocket
Commit message (Collapse)AuthorAgeFilesLines
* Updated year in copyright headerKai Koehne2014-03-261-1/+1
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* SSL internals: do not write after shutting down the socketPeter Hartmann2013-04-241-1/+2
| | | | | | | | | | ... but rather throw an error, so the HTTP layer can recover from a SSL shutdown gracefully. In case the other side sent us a shutdown, we tried to send one as well, which results in an error. (backport of commit e145b67fbd54f147dab0f8e460280a9c8533aa7b) Change-Id: I57291a5363cb0f6585dbd6aaa521c748766a1fdf Reviewed-by: Richard J. Moore <rich@kde.org>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-131-1/+1
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix tst_qsslsocket auto test build when OpenSSL is not available.Janne Anttila2012-10-301-0/+2
| | | | | | | | | This is needed to get Qt 4.8 CI passing. OpenSSL is apparently missing from Digia hosted Windows CI machines. OpenSSL to CI Testers will be installed later on to cover also these code paths. Change-Id: I6a4e2b4b1fa6c56692f112f1c5fc47361cb1ea0c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291-24/+24
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-011-2/+2
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix regressions due to partial QSslSocket::peek fixShane Kearns2012-03-301-1/+131
| | | | | | | | | | The fix broke HTTPS transactions with chunked encoding. It also broke use of a QSslSocket in unencrypted mode where peek and read calls are mixed. See change 68b1d5c17aa38d5921bdade2b0e0cb67c6c90513. Change-Id: Ib115b3737b0e4217496f5def10aaaea3c6452ff8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix bug in qsslsocket peek()Kalle Viironen2012-03-191-0/+127
| | | | | | | | | Calling peek() for qsslsocket caused socket data to be copied into qiodevices buffer and therefore make it unaccessible in qsslsocket. Task-number: QTBUG-18498 Change-Id: Ie27a90a468be8158bd8afcd259dbb34483623c36 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* tests: allow unstable tests to be marked with CONFIG+=insignificant_testSergio Ahumada2011-12-281-0/+2
| | | | | | | | | | Marking a test with CONFIG+=insignificant_test will cause the exit code of the test to be discarded during `make check'. This is intended to be used for tests which are valuable to run, but are known to be unstable and are not feasible to immediately fix. Change-Id: Id7b2407d0a13c8de19a58badb78fa7c018c9b50a Reviewed-by: Jo Asplin
* Doc: Fixing typoSergio Ahumada2011-06-301-2/+2
|
* Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-2/+17
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into ↵Qt Continuous Integration System2011-05-181-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: (114 commits) Fixed license header. Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile Remove Q_ASSERT's from qsharedmemory autotest Remove Q_ASSERT's from QNetworkReply autotest Remove Q_ASSERT's from qabstractxmlnodemodel test Remove Q_ASSERT from QXmlStream autotest Remove Q_ASSERT from qxmlquery autotest Remove Q_ASSERT's from QXmlStream autotest Remove Q_ASSERT from QItemModel autotest Remove Q_ASSERT's from qxmlquery autotest Remove Q_ASSERT from qxmlquery autotest Remove Q_ASSERT's from QXmlStream autotest Remove Q_ASSERT from qabstractxmlnodemodel test Remove Q_ASSERT from qscriptvaluegenerated test Remove Q_ASSERT from QVariant autotest Remove Q_ASSERT's from QTreeView autotest Remove Q_ASSERT from qtesselator autotest Remove unused function from qtessellator autotest Remove Q_ASSERT from qscriptvaluegenerated test Remove Q_ASSERT's from qscriptvaluegenerated test ...
| | * Merge remote branch 'origin/4.8' into qa-review-masterRohan McGovern2011-05-164-12/+127
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qaccessibility/tst_qaccessibility.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp
| | * | Remove Q_ASSERT from qsslsocket autotest.Jason McDonald2011-05-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the server thread exit early if the socket is invalid. This will make the test fail gracefully instead of crashing. Change-Id: Ia9564c94dd32d65e6e9bdb4a2410f1512409546c Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| * | | Fix regression that caused waitForXXX(-1) to fail.Thiago Macieira2011-05-161-0/+15
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression was introduced by 8d4cd52b6981a4e6deea7fdb77f56e40c4f3e6ba when it failed to check when msecs == -1. This manifested visibly in KDE failing to connect to any SSL site -- kioslaves are synchronous and use waitForXXX(-1) (in this particular case, waitForEncrypted, which calls waitForReadyRead). Also, take the opportunity to convert these tests in QTcpSocket to use port 80 (a defined service in the test server) instead of port 22. Reviewed-by: Martin Petersson
* / | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
|/ / | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Merge branch 'master' of scm.dev.troll.no:qt/qt-earth-team into ↵Shane Kearns2011-04-113-4/+115
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | symbian-socket-engine Conflicts: src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtNetworku.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtNetworku.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
| * | SSL code: introduce new error value for blacklisted certificatesPeter Hartmann2011-04-071-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | improve error reporting by introducing a new enum value in case the peer certificate is blacklisted. Reviewed-by: Markus Goetz Task-number: QTBUG-18338
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-073-3/+76
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/corelib/thread/qthread_unix.cpp
| | * \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-313-3/+76
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| | | * QSslSocket: add test for blacklisted certificatesPeter Hartmann2011-03-253-3/+74
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Richard J. Moore Task-number: QTBUG-18338
| * | | QSslConfiguration: do not lazily construct the d-pointerPeter Hartmann2011-03-281-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...the private class is cheap anyway; and lazy construction lead to problems like setting an empty default configuration would crash etc. Reviewed-by: Markus Goetz Task-number: QTBUG-17550
* | | | Fix ssl autotest .pro filesShane Kearns2011-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ReadUserData needed to avoid platsec warnings accessing cert store. Removed incorrect deployment from the two new on demand tests. Reviewed-by: Markus Goetz
* | | | Merge remote branch 'earth/master' into symbian-socket-engineShane Kearns2011-03-251-32/+136
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qhttpnetworkconnectionchannel.cpp src/network/socket/qlocalsocket.cpp src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtTestu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def
| * | | SSL: send SNI extension only if not connecting to an IPPeter Hartmann2011-03-221-2/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | otherwise the host name and the name we send in the SNI header (the IP) would not match. Reviewed-by: Thiago Macieira Reviewed-by: Richard J. Moore Task-number: QTBUG-18258
| * | SSL: Switch default version to TlsV1SslV3 (i.e. use TLS 1 or SSL 3)Peter Hartmann2011-03-141-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | ... and introduce a new enum SecureProtocols. Switching the default version is better for compatibility (e.g. servers using this option will understand both TLS and SSL 3). Reviewed-by: Markus Goetz
| * | SSL: introduce new option TlsV1SslV3 for SSL communicationPeter Hartmann2011-03-141-30/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | currently there are 3 supported protocols: SSL2, SSL3 and TLS1. SSL2 is considered insecure and should not be used anymore. This commit offers an option to use both TLS1 and SSL3, leaving SSL2 out. Part-of-the-patch-by: Darren Lissimore Reviewed-by: Markus Goetz Task-number: QTBUG-12338
* | | Merge branch 'symbian-socket-engine' of ↵Shane Kearns2011-03-082-7/+9
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | scm.dev.troll.no:qt/qt-symbian-network into symbian-socket-engine Conflicts: src/network/access/qnetworkaccessmanager.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp
| * | Fix symbian test failures for qsslsocketShane Kearns2011-02-241-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Increased timeout on some unstable test cases. Added a Q_EXPECT_FAIL if we can't connect to a server which is inside firewall. Reviewed-by: Markus Goetz
| * | Fix qsslsocket test crashesShane Kearns2011-02-242-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Convert assertions to failure, increase heap size to allow creating 10MB buffers without std::bad_alloc exception or memory allocation error from openssl. Reviewed-by: Markus Goetz
* | | SSL: Switch default version to TLS 1.0Peter Hartmann2011-02-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TLS is backward compatible, so servers only supporting SSL 3 should still work. All browsers send a TLS 1.0 Client Hello these days. However, some servers apparently have problems with a TLS handshake (and a SNI message); for now, wait and see how many of them are broken and either add a fallback to SSLv3 or blacklist them (i.e. set the used SSL version for those servers explicitly). Reviewed-by: Markus Goetz
* | | SSL backend: loat root certificates on demand on Unix (excluding Mac)Peter Hartmann2011-02-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, on initializing the first QSslSocket, we read all root certificates into memory (~ 150 files). Now, we tell OpenSSL where to find the root certificates, so that they can be loaded on demand (if supported, see 'man c_rehash' for details). Reviewed-by: Markus Goetz Task-number: QTBUG-14016
* | | do not test against imap.trolltech.comPeter Hartmann2011-02-211-5/+0
|/ / | | | | | | | | | | | | The host seems to have closed the port and we should not use that server for testing anyway. Reviewed-by: Markus Goetz
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-111-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * network tests: make IMAP, FTP testdata more flexible.Rohan McGovern2011-01-101-1/+2
| | | | | | | | | | | | | | | | Move all hardcoded IMAP/FTP fixtures into network-settings.h. Make it work with new and old network test server. Reviewed-by: Markus Goetz Task: QTBUG-15114
* | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-081-2/+2
|/ | | | | | | | | | Complement previous commit by aligning Qt itself to use .files consistently for DEPLOYMENT as well as INSTALLS. This excludes changes to webkit. Task-number: QTBUG-3216 Reviewed-by: axis
* QSslConfiguration: fix crash when accessing null pointerPeter Hartmann2010-08-301-0/+16
| | | | | | | | We were accessing the d-pointer of a QSslConfiguration which is initialized lazily. Reviewed-by: Markus Goetz Task-number: QTBUG-13265
* QSslSocket: fix security vulnerability with wildcard IP addressesPeter Hartmann2010-08-101-0/+2
| | | | | | | | | This fixes Westpoint Security issue with Advisory ID#: wp-10-0001. Before, we would allow wildcards in IP addresses like *.2.3.4 ; now, IP addresses must match excatly. Patch-by: Richard J. Moore <rich@kde.org> Task-number: QT-3704
* Added $$MW_LAYER_SYSTEMINCLUDE to some autotestsMiikka Heikkinen2010-08-061-0/+1
| | | | | | | These autotests couldn't find e32svr.h in Symbian^3 env because that header has moved. Reviewed-by: TrustMe
* Fix handling of SSL certificates with wildcard domain namesRichard J. Moore2010-07-091-0/+24
| | | | | | Merge-request: 731 Task-number: QTBUG-4455 Reviewed-by: Peter Hartmann
* Run autotests with minimal capabilitiesShane Kearns2010-05-101-1/+1
| | | | | | | | | | | The autotests were previously run with ALL-Tcb capability which gives them more access to the filesystem etc. than a typical Qt application. To have more realistic testing environmnent, tests are run with no capabilities other than those required for the Qt APIs they use. i.e. NetworkServices for network tests, None for others. Reviewed-by: Liang Qi
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-121-3/+2
|\ | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/gui/image/qimage.cpp src/openvg/qwindowsurface_vgegl.cpp
| * Autotest: moved these to the qtest/ dirThiago Macieira2010-04-111-3/+2
| |
* | Merge branch '4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-091-0/+1
|\|
| * Autotest: fix paths on the test server after update.Thiago Macieira2010-04-091-0/+1
| | | | | | | | Reviewed-by: Trust Me
* | SSL: Fix memleak related to local certificateMarkus Goetz2010-03-151-0/+15
|/ | | | | | | | Task-number: QTBUG-6504 Task-number: QTBUG-8924 Task-number: QTBUG-5645 Reviewed-by: andreas Reviewed-by: Peter Hartmann
* QAbstractSocket: Use new faster DNS functionMarkus Goetz2010-03-022-1/+7
| | | | | | | Use qt_qhostinfo_lookup which avoids the event loop when the DNS result is already cached. Reviewed-by: Thiago
* Update copyright year to 2010Jason McDonald2010-01-071-1/+1
| | | | Reviewed-by: Trust Me
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 18:02:45 +0000