summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qsslsocket.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-121-2/+3
|\
| * QtNetwork: eradicate Q_FOREACH loops [rvalues]Marc Mutz2016-05-041-1/+2
| * QtNetwork: use const (and const APIs) moreAnton Kudryavtsev2016-04-271-1/+1
* | Add support for PSK on server sideAndré Klitzing2016-05-021-0/+1
* | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-03-221-0/+32
|\|
| * Integrate network sockets into the multichannel infrastructureAlex Trotsenko2016-03-011-0/+32
* | QAbstractSocket::flush(): remove manual polymorphismAlex Trotsenko2016-03-011-9/+17
|/
* Optimize QSslSocketPrivate::isMatchingHostname()Marc Mutz2016-02-081-7/+8
* QRingBuffer: add append(const char *, qint64) functionAlex Trotsenko2016-02-011-2/+1
* Updated license headersJani Heikkinen2016-01-151-14/+20
* QIODevice: handle incomplete readsAlex Trotsenko2016-01-121-2/+2
* QSslSocket: evaluate CAs in all keychain categoriesDaniel Molkentin2015-11-241-0/+4
* Doc: replaced mentions of deprecated functionNico Vertriest2015-11-031-10/+9
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-231-2/+2
|\
| * Doc: Edit description of QSslSocket::AddCaCertificates()Topi Reinio2015-10-231-2/+2
* | Libraries: Fix single-character string literals.Friedemann Kleint2015-10-131-1/+1
* | QAbstractSocket: Consolidate error reportingKai Koehne2015-09-141-14/+7
|/
* Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5Oswald Buddenhagen2015-08-121-0/+8
|\
| * Merge remote-tracking branch 'origin/5.4' into 5.5Oswald Buddenhagen2015-07-171-0/+8
| |\
| | * Network: Fix up previous corruption patchMarkus Goetz2015-07-081-0/+8
* | | QSslSocket: Update error string in setSocketDescriptor()Kai Koehne2015-08-031-0/+1
|/ /
* | Replace MAC OS X with OS XNico Vertriest2015-06-301-1/+1
* | QSslSocket: move default cipher, EC and default CA APIs to QSslConfigurationGiuseppe D'Angelo2015-06-111-134/+44
* | Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-04-151-1/+1
|\|
| * QSslSocket: try to send all data on close()Alex Trotsenko2015-04-011-1/+1
* | Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-03-311-17/+4
|\|
| * Introduce qt_subtract_from_timeout to reduce code duplication.Daniel Teske2015-03-091-17/+4
* | Fix bind+connect in both TCP and UDPThiago Macieira2015-03-041-0/+23
* | Remove BlackBerry PlayBook support.Rafael Roquetto2015-02-201-1/+0
* | Update copyright headersJani Heikkinen2015-02-111-7/+7
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-101-0/+2
|\|
| * Merge remote-tracking branch 'origin/5.4.1' into 5.4Frederik Gladhorn2015-01-291-0/+1
| |\
| | * Set pendingClose to false on init in QSslSocketMichael Marley2015-01-191-0/+1
| * | Doc: add missing since 5.4 for new sessionProtocol() methods.David Faure2015-01-191-0/+1
| |/
* | Add SecureTransport based SSL backend for iOS and OS XJeremy Lainé2015-02-021-0/+3
* | QSslSocket: introduce support for TLS PSK (client side)Giuseppe D'Angelo2015-01-231-0/+22
* | Merge remote-tracking branch 'origin/5.4' into devSimon Hausmann2014-12-181-34/+39
|\|
| * Use categorized logging for ssl codeKai Koehne2014-12-101-34/+39
| * Remove incorrect read from QSslSocket::readData()Alex Trotsenko2014-11-061-10/+6
* | SSL: Add support for selecting which curves should be used by an elliptic cipherGiuseppe D'Angelo2014-11-261-0/+157
* | Merge remote-tracking branch 'origin/5.4' into devOswald Buddenhagen2014-09-291-18/+10
|\|
| * Update license headers and add new license filesMatti Paaso2014-09-241-18/+10
* | Remove incorrect read from QSslSocket::readData()Alex Trotsenko2014-09-111-10/+6
* | QSslSocket: remove a useless assignmentGiuseppe D'Angelo2014-09-041-3/+1
|/
* network: Add pending close on disconnect for non-empty write bufferAndrew Knight2014-08-281-1/+3
* ssl: Share the host name matching utilitiesAndrew Knight2014-08-271-0/+59
* Introduce secure transport backend for Windows RuntimeOliver Wolff2014-08-131-0/+3
* SSL: split ssl files into general and "_openssl" implementationOliver Wolff2014-08-091-1/+3
* Merge remote-tracking branch 'origin/stable' into devJ-P Nurmi2014-06-051-1/+4
|\
| * Doc: be more explicit about need to set expected SSL cert in errorsArnaud Bienner2014-05-271-1/+2