summaryrefslogtreecommitdiffstats
path: root/src/network/ssl
Commit message (Expand)AuthorAgeFilesLines
* Fix some qdoc-warnings for Qt 5.8.Friedemann Kleint2016-06-282-9/+10
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-231-2/+2
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-231-2/+2
| |\
| | * Fix inconsistency between the #if guards in SSL PSK codeLiang Qi2016-06-221-2/+2
* | | Fix inconsistency between the #if guards in SSL PSK code - Part 2Liang Qi2016-06-221-2/+2
* | | Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/devLiang Qi2016-06-211-0/+5
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-211-0/+5
| |\| |
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-201-0/+5
| | |\|
| | | * QSslSocket (OpenSSL) - handle abort/close on sslErrors emittedTimur Pocheptsov2016-06-141-0/+5
* | | | OpenSSL symbols - resolve ALPN-related functionsTimur Pocheptsov2016-06-201-0/+5
|/ / /
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-132-2/+7
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-101-1/+5
| |\|
| | * QSslSocket: Data is sent after a certificate is downloaded on Windows.Martin Porcelli2016-06-081-1/+5
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-061-1/+2
| |\|
| | * OpenBSD: add /etc/ssl as cert dirRalf Nolden2016-06-011-1/+2
* | | Set ssl in QT_CONFIG when openssl is enabledLars Knoll2016-06-081-29/+29
* | | Remove all code paths related to unsupported Apple platforms.Jake Petroules2016-06-041-177/+2
* | | Doc: Fix documentation warnings for QSslDiffieHellmanParametersTopi Reinio2016-05-261-8/+2
* | | Add settable QSslDiffieHellmanParameters for QSslSocket-based servers.Mikkel Krautz2016-05-2513-20/+829
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-233-1/+4
|\| |
| * | Add ephemeralServerKey to isNull() and operator==André Klitzing2016-05-132-0/+3
| * | QtNetwork: port the last remaining Q_FOREACH loop and add QT_NO_FOREACHMarc Mutz2016-05-121-1/+1
* | | Add support for Apple tvOSMike Krus2016-05-171-4/+4
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-1211-49/+57
|\| |
| * | Prospective MSVC 2013 build fixSimon Hausmann2016-05-101-2/+4
| * | QtNetwork: eradicate Q_FOREACH loops [rvalues]Marc Mutz2016-05-045-8/+16
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-291-1/+0
| |\|
| | * QSslSocket: remove unused variable in q_X509Callback()Marc Mutz2016-04-261-1/+0
| * | QtNetwork: use const (and const APIs) moreAnton Kudryavtsev2016-04-278-16/+16
| * | QtNetwork: eradicate Q_FOREACH loops [needing qAsConst()]Marc Mutz2016-04-255-7/+7
| * | QtNetwork: eradicate Q_FOREACH loops [already const]Marc Mutz2016-04-254-12/+12
| * | QtNetwork: replace Java-style iteratorsAnton Kudryavtsev2016-04-191-3/+2
* | | Add support for PSK on server sideAndré Klitzing2016-05-029-2/+88
* | | qsslsocket/context_openssl - ALPN and NPN, not ALPN or NPNTimur Pocheptsov2016-05-022-6/+7
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-111-1/+1
|\| |
| * | Remove redundant QT_PREPEND_NAMESPACETimur Pocheptsov2016-04-081-1/+1
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-054-21/+19
|\| |
| * | QSslSocket (Mac): optimize string usageAnton Kudryavtsev2016-04-041-10/+10
| * | QtNetwork: use QStringRef to optimize memory allocationAnton Kudryavtsev2016-03-312-7/+7
| * | Remove the traces of the discontinued android-no-sdk platformEirik Aavitsland2016-03-303-4/+2
* | | QtNetwork: use reserve to optimize memory allocationAnton Kudryavtsev2016-03-312-1/+4
* | | QtNetwork: Remove Windows CE.Friedemann Kleint2016-03-292-18/+0
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-03-227-5/+54
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-211-3/+9
| |\|
| | * Don't include by default ciphers that are not supportedAntonio Larrosa2016-03-141-3/+5
| | * Do not send the trailing dot of a hostname as part of the SNIRichard J. Moore2016-03-131-0/+4
| * | QtNetwork: optimize container usageAnton Kudryavtsev2016-03-031-2/+3
| * | Integrate network sockets into the multichannel infrastructureAlex Trotsenko2016-03-016-0/+42
* | | qsslsocket/qsslcontext - add ALPN (OpenSSL only)Timur Pocheptsov2016-03-215-10/+70
* | | QAbstractSocket::flush(): remove manual polymorphismAlex Trotsenko2016-03-013-10/+19
|/ /