summaryrefslogtreecommitdiffstats
path: root/src/network/ssl
Commit message (Collapse)AuthorAgeFilesLines
* Fix regression with SSL connections failing on symbianShane Kearns2010-08-111-1/+1
| | | | | | | | | Due to a wrong ifdef sequence, the unix code was being compiled instead of the symbian code for retrieving the system certificates. Task-number: QTBUG-12718 Reviewed-by: Peter Hartmann (cherry picked from commit 8229eded4cba85ae53c1b03ce87981ebabd2f3ae)
* QSslSocket: fix security vulnerability with wildcard IP addressesPeter Hartmann2010-08-111-0/+5
| | | | | | | | | | 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 (cherry picked from commit 846f1b44eea4bb34d080d055badb40a4a13d369e)
* Qt does not build with qt_namespace on macosCarlos Manuel Duclos Vergara2010-07-221-2/+2
| | | | | | | | | The problem was that the QT_BEGIN_NAMESPACE was in the wrong place. I moved it 10 lines before and the problem is gone. Task-number: QTBUG-12262 Reviewed-by: Prasanth (cherry picked from commit b0998a44a5dc384a6cf65c1d5910cb3dd40620cf)
* fix build for -no-qt3supportPeter Hartmann2010-07-171-2/+2
| | | | | | QString::lower() is QT3_SUPPORT, the correct method is QString::toLower(). (cherry picked from commit 46175e55c8d053b61a45aea89a3e1b8371207dee)
* QSslSocket: Improve error handlingPeter Hartmann2010-07-161-1/+13
| | | | | | Reviewed-by: Markus Goetz Task-number: QT-3567 (cherry picked from commit c25c7c9bdfade6b906f37ac8bad44f6f0de57597)
* QSslSocket: fix documentation for QSslSocket::setPeerVerifyMode()Peter Hartmann2010-07-161-2/+2
| | | | (cherry picked from commit 2c48de46fdfeb935d1f31ae18f13add52c162ac8)
* Fix handling of SSL certificates with wildcard domain namesRichard J. Moore2010-07-162-4/+39
| | | | | | | Merge-request: 731 Task-number: QTBUG-4455 Reviewed-by: Peter Hartmann (cherry picked from commit 5f6018564668d368f75e431c4cdac88d7421cff0)
* Support QSslSocket::systemCaCertificates() on SymbianSimon Hausmann2010-07-062-0/+198
| | | | | | | | | Implemented access to the unified certificate store on Symbian with Shane and Peter's help. Task-number: QTBUG-11399 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* QSslSocket::systemCaCertificates(): fix for WinCEPeter Hartmann2010-07-052-0/+18
| | | | | | | | on WinCE the function is called "CertOpenStore", and not "CertOpenSystemStoreW". Patch-by: Ismail Donmez Task-number: QTBUG-11905
* QSslSocket::systemCaCertificates(): have one common case for all UnicesPeter Hartmann2010-07-011-7/+4
| | | | Reviewed-by: Simon Hausmann
* SSL backend: correct ordering of root CA certificates in the storePeter Hartmann2010-06-301-2/+14
| | | | | | | | | | | Some CAs have several root certificates with the same SubjectInfo, but different expiration date. This means that OpenSSL needs to choose the valid root certificate over the expired ones when verifying a certificate chain. Apparently, the certs added to the store first are the ones that get used first, so we add the expired ones at the end. Reviewed-by: Thiago Macieira Task-number: QTBUG-11664
* Don't load ciphers and system certificates for QSslSocket::supportsSsl()Andreas Kling2010-06-283-12/+50
| | | | | | | Loading these uses about 1 MB of memory and can be be deferred until it's actually needed. Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* Corrected filename case for wincrypt.hMark Brand2010-06-261-1/+1
| | | | | | | | The case doesn't matter when building on Windows, but does when cross-compiling on Unix. Merge-request: 709 Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
* Fix warnings in QSslSocketPrivate::systemCaCertificates()Zeno Albisser2010-06-251-8/+8
| | | | Reviewed-by: Markus Goetz
* Temporary fix for regression in QSslCertificate::fromPath()Zeno Albisser2010-06-151-3/+8
| | | | | | | | | | The regression was introduced with 164f347aba7287407615223dc2219a016ebc8248. As soon as possible we should probably rewrite the fromPath() function, to have a proper solution. Nevertheless this might be a bigger change and should not be done so late in release cycle. Reviewed-by: TrustMe
* QSslSocket: fix build for MinGW and VS 2005Peter Hartmann2010-06-141-0/+4
| | | | Reviewed-by: Zeno Albisser
* remove certificate bundlePeter Hartmann2010-06-112-1987/+0
| | | | | | | | | | | | since we now use the system certificates we should not provide our own certificate bundle anymore. Patch-by: Zeno Albisser and Peter Hartmann Reviewed-by: Thiago Task-number: QTBUG-8833 Task-number: QT-3361
* make QSslSocket::systemCaCertificates() use system certsPeter Hartmann2010-06-113-20/+138
| | | | | | | | | | | before, we were shipping our own bundle of CA certificates. Now we read the certificates from the system CA store. Patch-by: Zeno Albisser and Peter Hartmann Reviewed-by: Thiago Task-number: QTBUG-8833 Task-number: QT-3361
* Adjusted RegExp in QSslCertificate::fromPath()Zeno Albisser2010-06-111-1/+1
| | | | | Reviewed-by: Thiago Task-number: QTBUG-2706
* QSslCertificate: support large serial numbersPeter Hartmann2010-06-021-4/+19
| | | | | | | | | | We were calling an OpenSSL function that returned a long for the serial number; sometimes serial numbers are too big to fit into a long (up to 20 octets). In that case, do not convert the serial number to decimal, but just output the hexadecimal value. Reviewed-by: Zeno Albisser Task-number: QTBUG-9973
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-141-1/+1
|\ | | | | | | | | Conflicts: src/script/api/qscriptengine.cpp
| * Fix typos, there is no QT_NO_SSLMarkus Goetz2010-04-131-1/+1
| | | | | | | | | | Reviewed-by: thiago Reviewed-by: andreas
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-131-0/+10
|\ \ | |/
| * Document Symbian platform security requirements on Qt APIsFrans Englich2010-04-121-0/+10
| | | | | | | | | | | | | | | | | | Work done jointly by Gareth and me. Yields no qdoc errors. Task-number: QTBUG-9342 Task-number: QTBUG-9120 Reviewed-by: Gareth Stockwell Reviewed-by: David Boddie
* | improve mingw 64 bit supportThierry Bastian2010-03-261-1/+1
| |
* | Rename QTimestamp to QElapsedTimerThiago Macieira2010-03-171-5/+5
| |
* | Port QtNetwork uses of QTime as a stopwatch to QTimestamp.Thiago Macieira2010-03-171-5/+5
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-154-3/+21
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits) different approach to fixing "the other" aliasing issue fix aliasing issue in node_construct() detach in fewer cases, remove redundant calculation SSL: Fix memleak related to local certificate Improve keyboard layout detection on X11 Compile on ARM with -Werror -Wold-style-cast Use the vista-style native dialog for QFileDialog::getExistingDirectory Apply the stdset attribute for resource properties doc: Completed sentence about HideNameFilterDetails Doc fix in QLocale Doc for for QGestureRecognizer::create. Fix broken setCollectionFile (creating multiple models instead reusing) Enable the fast paths when converting to Rgb565 qdoc: ifdefed out all the debug code. Add missing QtScript API shims Further fix license whitespace. Remove NetworkManager test-bed application. Remove configure test for NetworkManager. Fix QDir::entryList regression Add DEFINES to mingw32/windres.exe command line. ...
| * SSL: Fix memleak related to local certificateMarkus Goetz2010-03-154-3/+21
| | | | | | | | | | | | | | | | Task-number: QTBUG-6504 Task-number: QTBUG-8924 Task-number: QTBUG-5645 Reviewed-by: andreas Reviewed-by: Peter Hartmann
* | QSslKey: Do not make OpenSSL prompt for a password on stdinMarkus Goetz2010-03-151-3/+1
|/ | | | | Task-number: QTBUG-2515 Reviewed-by: Andreas Aardal Hanssen
* Fix some foreach usage to use const refsMarkus Goetz2010-01-282-2/+2
| | | | Reviewed-by: joao
* Core classes, examples, demos: Some changes from string to charMarkus Goetz2010-01-281-2/+2
| | | | Reviewed-by: Peter Hartmann
* QSslSocket: Take better care on how we use the SSL buffersMarkus Goetz2010-01-211-3/+23
| | | | | | .. and breaking out of a loop where we should. Reviewed-by: thiago
* SSL Certificate: don't crash when the END CERTIFICATE line ends without CRLFThiago Macieira2010-01-211-4/+4
| | | | | | | | | | | If the file/data ends in the END CERTIFICATE line without a newline, the certificate is still valid. If it's followed by anything other than a newline, then it's no longer valid. Also add another test for the BEGIN CERTIFICATE ending without newline, to ensure we don't crash there either. Reviewed-By: Peter Hartmann
* Fix QSslCertificate issuesMarkus Goetz2010-01-181-2/+12
| | | | | | | Thank you Matthew Cattell for the fix! Task-number: QTBUG-6466 Reviewed-by: joao
* QSslSocket: Remove writeBuffer,readBuffer and use from QAbstractSocketMarkus Goetz2010-01-131-3/+0
| | | | | | | We're using the ones from our parent class instead of own instance. Reviewed-by: Thiago Reviewed-by: joao
* Update copyright year to 2010Jason McDonald2010-01-0623-23/+23
| | | | Reviewed-by: Trust Me
* Doc: Fixed qdoc warnings.David Boddie2009-11-041-2/+8
| | | | Reviewed-by: Trust Me
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-032-3/+3
|\ | | | | | | | | | | Conflicts: src/gui/kernel/qevent.cpp src/network/ssl/qsslerror.cpp
| * Doc/i18n: Fixed source strings for translation.David Boddie2009-11-032-3/+3
| | | | | | | | Reviewed-by: Oswald Buddenhagen
* | Merge branch '4.6' into core-4.6Thiago Macieira2009-10-291-29/+28
|\ \
| * | QSslError: Actually make strings show up in the ts fileMarkus Goetz2009-10-281-29/+28
| |/ | | | | | | | | | | | | | | | | I suspect because of missing quotation marks those strings were not showing up. Also, wrapping QT_TRANSLATE_NOOP inside a tr() call makes no sense. Also changed the class from QObject to QSslSocket. Task-number: QTBUG-5059 Reviewed-by: ossi
* | Merge remote branch 'origin/4.6' into core-4.6Thiago Macieira2009-10-281-0/+6
|\ \ | |/
| * QSslSocket: Add \reimp to the socket option functionsMarkus Goetz2009-10-261-0/+6
| | | | | | | | Reviewed-by: Thiago
* | QAbstractSocket: wait with closing until all bytes have been writtenPeter Hartmann2009-10-271-0/+2
|/ | | | | | | | | | | | only disconnect from host when all bytes have been written; i.e. not only check whether the write buffer is empty, but also check whether the socket engine has still bytes to write. This is necessary for HTTP and SOCKS5 socket engine, because they both contain an inner TCP socket which also does buffering. For the native socket engine, there is no difference with this patch. Reviewed-by: Markus Goetz Reviewed-by: Thiago Macieira
* QSslSocket: Trigger a SSL transmission when reading from the socket.Markus Goetz2009-10-223-0/+17
| | | | | | | | | In certain cases a SSL transfer stalled when a readBufferSize was set. This change triggers a SSL transmission when there is data on the socket waiting to be decrypted. Task-number: QTBUG-3860 Reviewed-by: Thiago
* QSslSocket: Also handle setSocketOptionMarkus Goetz2009-10-192-0/+20
| | | | | | | Handle setSocketOption and forward it to the plainSocket that QSslSocket is using internally. Reviewed-by: Thiago
* QSslSocket: Documentation enhancementMarkus Goetz2009-10-151-0/+7
| | | | | | Clarify about bytesWritten() and encryptedBytesWritten() Reviewed-by: David Boddie
* OpenSSL wrapping: compile when configured with -openssl-linkedPeter Hartmann2009-10-053-8/+2
| | | | | | we were calling sk_pop_free from OpenSSL with a wrong signature. Reviewed-by: Olivier Goffart
* Fix unresolved reference to q_sk_free with openssl 1.0Bernhard Rosenkraenzer2009-09-093-3/+10
| | | | | | | Previous fix introduced an unresolved reference in the lib Merge-request: 1409 Reviewed-by: Peter Hartmann <peter.hartmann@trolltech.com>
generated by cgit v0.12 at 2025-04-18 13:14:55 (GMT)