summaryrefslogtreecommitdiffstats
path: root/src/network/ssl
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ /
* | QtNetwork: don't use Boyer-Moore for single-character needlesMarc Mutz2016-02-241-5/+2
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-182-2/+2
|\|
| * QtNetwork: Silence Clang on Windows.Friedemann Kleint2016-02-171-1/+1
| * Fix QT_DEPRECATED_SINCE usageJędrzej Nowacki2016-02-021-1/+1
* | Merge "Merge dev into 5.7" into refs/staging/5.7Oswald Buddenhagen2016-02-171-4/+1
|\ \
| * | Use QFlags::setFlag where prudent in qtbaseAndre Somers2016-02-121-4/+1
* | | QSslSocket (OpenSSL): replace QList<QPair> by QVector<Struct>Marc Mutz2016-02-172-25/+31
* | | QSslSocket (OpenSSL): use QMutexLockerMarc Mutz2016-02-171-2/+2
|/ /
* | Optimize QSslSocketPrivate::isMatchingHostname()Marc Mutz2016-02-081-7/+8
* | QRingBuffer: add append(const char *, qint64) functionAlex Trotsenko2016-02-013-6/+3
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-211-0/+2
|\|
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-191-0/+2
| |\
| | * Add missing \since to QSslCipher QString overload.Florian Bruhin2015-12-101-0/+2
* | | QSslContext: provide sharedFromConfiguration()Marc Mutz2016-01-203-2/+11
* | | QSslContext: separate creation and initializationMarc Mutz2016-01-192-10/+17