summaryrefslogtreecommitdiffstats
path: root/src/network/ssl
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-11-272-91/+310
|\|
| * Secure Transport - make it work on OS X 10.7Timur Pocheptsov2015-11-231-79/+212
| * Secure Transport backend - make it work on OS X 10.7Timur Pocheptsov2015-11-232-13/+103
* | Doc: replaced mentions of deprecated functionNico Vertriest2015-11-031-10/+9
* | QtNetwork: convert some QDateTime::currentDateTime() to currentDateTimeUtc()Marc Mutz2015-10-273-3/+6
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-232-4/+4
|\|
| * Doc: Edit description of QSslSocket::AddCaCertificates()Topi Reinio2015-10-232-4/+4
* | Libraries: Fix single-character string literals.Friedemann Kleint2015-10-133-4/+4
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-022-5/+2
|\|
| * Doc: Corrected link issues in qtbaseNico Vertriest2015-09-042-5/+2
* | Fix missing "We mean it" in qtbase private headersThiago Macieira2015-10-011-0/+11
* | Clean up some Apple-related includes and declarations.Jake Petroules2015-09-221-0/+4
* | QAbstractSocket: Consolidate error reportingKai Koehne2015-09-145-124/+73
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-08-262-0/+15
|\|
| * Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5Oswald Buddenhagen2015-08-122-0/+15
| |\
| | * Merge remote-tracking branch 'origin/5.4' into 5.5Oswald Buddenhagen2015-07-172-0/+15
| | |\
| | | * Network: Fix up previous corruption patchMarkus Goetz2015-07-082-0/+15
* | | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-065-8/+75
|\| | |
| * | | QSslSocket: Update error string in setSocketDescriptor()Kai Koehne2015-08-031-0/+1
| * | | ssl: add support for EC keys to non-OpenSSL backendsJeremy Lainé2015-07-313-1/+70
| * | | Fix SNI for TlsV1_0OrLater, TlsV1_1OrLater and TlsV1_2OrLaterAndré Klitzing2015-07-301-6/+3
| * | | ssl: fix native parsing of certificates with DSA keysJeremy Lainé2015-07-281-1/+1
| |/ /
* | | ssl: add openssl-based QSslKeyPrivate::encrypt / decryptJeremy Lainé2015-07-204-9/+86
* | | QtNetwork: Use Q_NULLPTR instead of 0 in all public headersMarc Mutz2015-07-192-2/+2
* | | Merge remote-tracking branch 'origin/5.5' into HEADSimon Hausmann2015-07-172-47/+59
|\| |
| * | Define friend functions of QSslEllipticCurve outside of classKai Koehne2015-07-161-4/+8
| * | ssl: improve SecureTransport error loggingJeremy Lainé2015-07-151-42/+45
| * | ssl: fix SecureTransport handling of remote host disconnectJeremy Lainé2015-07-131-1/+6
* | | QSslSocket: remove code duplicationMarc Mutz2015-07-131-19/+13
* | | QSslSocket: use function objects and algorithms when sorting library pathsMarc Mutz2015-07-131-24/+26
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-07-018-170/+126
|\| |
| * | Replace MAC OS X with OS XNico Vertriest2015-06-301-1/+1
| * | Merge remote-tracking branch 'origin/5.5.0' into 5.5Liang Qi2015-06-278-169/+125
| |\ \
| | * | QSslSocket: move default cipher, EC and default CA APIs to QSslConfigurationGiuseppe D'Angelo2015-06-117-157/+113
| | * | Unexport QSslPreSharedKeyAuthenticatorMarc Mutz2015-06-091-12/+12
* | | | QtNetwork: make all Q_DECLARE_SHARED types nothrow move-assignableMarc Mutz2015-06-307-16/+29
* | | | Use QVector::reserve() all over the place.Sérgio Martins2015-06-291-0/+1
* | | | Also add support for linked OpenSSL without SSL v2 & v3 supportDaniel Molkentin2015-06-282-0/+20
* | | | network: Use QList::reserve(), reduces reallocations.Sérgio Martins2015-06-272-3/+8
* | | | Define openssl symbol resolution warning function only if necessaryUlf Hermann2015-06-221-0/+3
* | | | Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-06-034-29/+32
|\| | |
| * | | Merge "Merge remote-tracking branch 'origin/5.5.0' into 5.5" into refs/stagin...Liang Qi2015-06-021-1/+4
| |\| |
| | * | Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-06-011-1/+4
| | |\|
| | | * Avoid false positives from google by storing OpenSSL version as Unicode.Richard J. Moore2015-05-251-1/+4
| * | | Don't assign iterator to const_iteratorSérgio Martins2015-06-021-26/+26
| |/ /
| * | MSVC2015: Compile fixMaurice Kalinowski2015-05-221-1/+1
| * | Make data tables const.Volker Krause2015-05-051-1/+1
* | | Remove unsafe random seeding fallback path.Richard J. Moore2015-05-291-24/+2