summaryrefslogtreecommitdiffstats
path: root/src/network/ssl
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-232-2/+14
|\
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-301-1/+13
| |\
| | * QSslSocket::waitForDisconnected(): flush write buffer before waitingAlex Trotsenko2017-10-271-1/+13
* | | QSslSocketPrivate (SecureTransport) - add ALPN supportTimur Pocheptsov2017-11-141-1/+63
* | | QSsl: use QT_CONFIG(feature) instead of hardcoded constantTimur Pocheptsov2017-11-072-4/+6
* | | Merge remote-tracking branch 'origin/5.10' into devAllan Sandfeld Jensen2017-10-241-1/+1
|\| |
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-161-1/+1
| |\|
| | * Replace 'an unique' with 'a unique'Kai Koehne2017-10-111-1/+1
* | | QSslSocket: implement skip() overloadAlex Trotsenko2017-10-072-0/+15
* | | Change qrand() to QRandomGenerator in the SSL backendSamuel Gaist2017-09-301-4/+3
* | | Qt Network: Remove code for Windows < 7Friedemann Kleint2017-09-291-2/+1
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-09-265-2/+35
|\| |
| * | Fix loadOpenSslWin32Timur Pocheptsov2017-09-211-0/+18
| * | Fix OpenSSL 1.1 buildTimur Pocheptsov2017-09-141-2/+3
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-09-063-0/+14
| |\|
| | * Forward the readChannelFinished from the plain socket to the ssl socketAlbert Astals Cid2017-09-013-0/+14
* | | Replace Q_NULLPTR with nullptr where possibleKevin Funk2017-09-195-8/+8
* | | Replace Q_DECL_OVERRIDE with override where possibleKevin Funk2017-09-195-47/+47
|/ /
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-312-1/+4
|\|
| * Fix crash when reading a PKCS12 file with no private keyEdward Welbourne2017-08-172-1/+4
* | QSslSocketBackendPrivate::transmit(): improve writing to OpenSSLAlex Trotsenko2017-08-271-3/+2
* | QSslSocket: stabilize triggering for writeAlex Trotsenko2017-08-032-1/+11
* | QSslSocketBackendPrivate::transmit(): improve reading from OpenSSLAlex Trotsenko2017-07-271-4/+5
* | Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-07-191-3/+31
|\|
| * QAsn1Element - fix toDateTime functionTimur Pocheptsov2017-07-181-3/+31
* | QSslCertificatePrivate: make use of QByteArray::toHex(separator)Andre Hartmann2017-07-101-11/+6
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-07-061-2/+2
|\|
| * QSslSocket - fix two memory management issues (Secure Transport)Timur Pocheptsov2017-07-041-2/+2
* | QSslSocket: OpenSSL 1.1 backendRichard J. Moore2017-07-0417-1047/+2221
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-191-2/+4
|\|
| * qsslsocket_mac - check that SecCertificateRef is not nullTimur Pocheptsov2017-06-131-2/+4
* | QSSLSocket::readData return -1 when socket is not connectedAlbert Astals Cid2017-06-081-0/+2
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-072-4/+28
|\|
| * Ssl socket - fix broken certificate verificationTimur Pocheptsov2017-06-021-2/+25
| * QSslCertificate: don't init() if SSL is not supportedJüri Valdmann2017-05-301-2/+3
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-05-291-1/+10
|\|
| * QSslSocket (OpenSSL) make supportsSsl return false, if v >= 1.1Timur Pocheptsov2017-05-211-1/+10
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-05-071-1/+2
|\|
| * QSslSocket (SecureTransport) - use anchors only from QSslConfigurationTimur Pocheptsov2017-04-261-1/+2
* | Use list-initialization moreMarc Mutz2017-04-201-2/+1
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-201-2/+2
|\|
| * Move Q_REQUIRED_RESULT to its correct positionThiago Macieira2017-04-201-2/+2
| * Allow Secure Transport backend to use a temporary keychainTimur Pocheptsov2017-04-042-6/+125
* | QSslSocket/macOS: optimize QUuid usageMarc Mutz2017-04-101-10/+8
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-282-7/+21
|\|
| * Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-272-7/+21
| |\
| | * QSslSocket: fix connection to a international domain nameOlivier Goffart2017-03-232-7/+21
* | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-203-68/+87
|\| |
| * | Secure Transport - add a missing cipherTimur Pocheptsov2017-03-161-58/+79
| * | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-132-10/+8
| |\|