summaryrefslogtreecommitdiffstats
path: root/src/network/ssl
Commit message (Expand)AuthorAgeFilesLines
* Fix resolution of OPENSSL_LIBS in ssl.priKai Koehne2016-10-141-0/+2
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-291-1/+1
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-281-1/+1
| |\
| | * QSslSocket: respect read buffer's max size (SecureTransport)Timur Pocheptsov2016-09-271-1/+1
* | | Modularize configure.json/.priLars Knoll2016-09-151-1/+1
* | | Merge dev into 5.8Oswald Buddenhagen2016-08-227-40/+57
|\ \ \
| * | | Add support for Apple watchOSJake Petroules2016-08-191-2/+2
| * | | Use qtConfig throughout in qtbaseLars Knoll2016-08-191-3/+3
| * | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-161-1/+1
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-131-1/+1
| | |\ \ | | | |/
| | | * Doc: Change instances of '(Mac) OS X' to 'macOS'Topi Reinio2016-08-121-1/+1
| * | | QSslDiffieHellmanParameters: make fit for releaseMarc Mutz2016-08-123-33/+50
| * | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-091-2/+2
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-051-2/+2
| | |\ \ | | | |/
| | | * Remove unneeded ';' after some macrosKai Pastor2016-08-041-2/+2
* | | | Standardize some "We mean it" commentsFriedemann Kleint2016-08-175-15/+15
* | | | Fix qdoc warningsFriedemann Kleint2016-08-171-1/+1
|/ / /
* | | QSslDiffieHellmanParameters_dummy - remove Q_UNIMPLEMENTEDTimur Pocheptsov2016-07-291-2/+0
* | | Store QSslKey in specific key format to provide more details for keyLars Schmertmann2016-07-283-8/+22
* | | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-07-192-11/+21
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-151-6/+5
| |\ \ | | |/
| | * QSslSocketBackendPrivate: Remove QString warningsGabriel de Dietrich2016-07-121-6/+5
| * | Use QStringLiteral more judiciouslyAnton Kudryavtsev2016-07-081-1/+1
| * | QSslSocket: reset connection parameters on disconnectAlex Trotsenko2016-07-051-0/+7
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-042-4/+8
| |\ \ | | |/
| | * QSslSocket: improve documentation of the supported protocolsGiuseppe D'Angelo2016-07-011-1/+2
| | * QSslSocket::transmit (macOS/iOS) - do not use invalid contextTimur Pocheptsov2016-06-301-3/+6
* | | HTTP2 protocol handlerTimur Pocheptsov2016-07-082-0/+2
* | | Add qtnetworkglobal.h and qtnetworkglobal_p.hLars Knoll2016-07-0325-7/+27
* | | 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