summaryrefslogtreecommitdiffstats
path: root/src/network/ssl
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
| * | | Trailing whitespace and tab/space fixes for QtNetworkJanne Anttila2009-08-032-4/+4
| | | |
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-275-6/+58
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe qmake/Makefile.unix qmake/generators/makefile.cpp src/corelib/global/qglobal.h src/corelib/kernel/kernel.pri src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qaction.cpp src/gui/kernel/qaction.h src/gui/kernel/qaction_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget.h src/gui/kernel/qwidget_mac.mm src/gui/painting/qgraphicssystemfactory.cpp src/gui/styles/qwindowsstyle.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qabstractscrollarea_p.h src/network/access/qnetworkaccessdebugpipebackend.cpp src/network/socket/qlocalsocket_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp src/openvg/qpaintengine_vg.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfile/tst_qfile.cpp tests/auto/qobject/tst_qobject.cpp tests/auto/qpathclipper/qpathclipper.pro tests/auto/qprocess/tst_qprocess.cpp tests/auto/qsettings/tst_qsettings.cpp tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qsqlquerymodel/qsqlquerymodel.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qwidget/tst_qwidget.cpp
| * | QNetworkReply: add possibility to ignore specific SSL errorsPeter Hartmann2009-07-224-5/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the same method was also added to QSslSocket. previously, it was only possible to ignore all SSL errors; now, it is also possible to only ignore specific SSL errors, given by a QList of QSslErrors. Moreover, it is possible to call this newly added method right after connecting, not just when we get the SSL error. Reviewed-by: Thiago Task-number: 257322
| * | Build fix for mingwThierry Bastian2009-07-141-1/+1
| | | | | | | | | | | | | | | we should include qt_windows.h and not windows.h because we have to define WINVER to 0x500.
* | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3023-55/+62
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| * | QSslCertificate: Doc fixMarkus Goetz2009-06-171-3/+4
| | | | | | | | | | | | Change doc that refered to functions that got renamed
| * | Merge license header changes from 4.5Volker Hilsheimer2009-06-1623-47/+47
| |\ \ | | |/
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-1623-46/+46
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Fix wrong comparator in QSslCertificatePrivate::QByteArray_from_X509Markus Goetz2009-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Because less-than instead of less-or-equal-than was used, the last line of a PEM encoding was not built when the raw length was multiple of 64. Task-number: 256066 Reviewed-by: mariusSO
| * | QSslCertificate: lazy loading of some dataMarkus Goetz2009-06-161-5/+11
| | | | | | | | | | | | Reviewed-by: Andreas Aardal Hanssen
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-2510-33/+125
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
| * | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-126-3/+60
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| | * QSslSocket: Wrong warning message in startServerEncryptionMarkus Goetz2009-06-101-1/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Make it possible to compile Qt 4.5 SSL support with OpenSSL 1.0.0Bernhard Rosenkraenzer2009-06-095-2/+59
| | | | | | | | | | | | | | | | | | | | | (-beta2, but 1.0.0 final shouldn't be very different) Merge-request: 449 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-081-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
| | * Doc typo fix in QSslSocketMarkus Goetz2009-06-081-1/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | improved string operations all over the placeThierry Bastian2009-05-285-19/+19
| | | | | | | | | | | | | | | used character operations whenever possible better usage of QLatin1String
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-272-25/+2
| |\ \ | | |/ | | | | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * | QSsl: Renamed testConnection to startHandshakeMarkus Goetz2009-05-122-7/+7
| | |
| * | Small documentation fix for QSslSocketMarkus Goetz2009-05-121-2/+2
| | | | | | | | | | | | Reviewed-by: Kavindra
| * | Merge branch '4.5'Thiago Macieira2009-05-071-3/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qbackingstore.cpp src/gui/painting/qwindowsurface_raster.cpp
| * \ \ Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-061-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| * | | | Small documentation enhancement for QSslSocketMarkus Goetz2009-03-251-2/+5
| | | | | | | | | | | | | | | | | | | | RevBy: TrustMe
| * | | | Long live Qt!Lars Knoll2009-03-2325-0/+10073
| / / /
* | | | More robust handling for stdapis pathsMiikka Heikkinen2009-06-121-5/+1
| | | |
* | | | Make Qt exception safer.Robert Griebl2009-06-108-28/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions, which also contains the full history. Rev-By: Harald Fernengel Rev-By: Ralf Engels
* | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-022-25/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/itemviews/puzzle/puzzle.pro examples/qtconcurrent/imagescaling/imagescaling.pro examples/widgets/movie/movie.pro tools/configure/configureapp.cpp Will rebuild configure.exe in next commit.
| * | | SSL: Remove broken system certificate loading codeMarkus Goetz2009-05-261-24/+1
| | | | | | | | | | | | | | | | | | | | Task-number: 254365 Reviewed-by: Peter Hartmann
| * | | Doc: Miscellaneous documentation fixes for Qt 4.5.x and later.David Boddie2009-05-251-1/+1
| | |/ | |/| | | | | | | Reviewed-by: Trust Me
* | | Oops typo in my previous commit: 8137373.Janne Anttila2009-05-291-1/+1
| | | | | | | | | | | | Correct ordinal for BIO_free symbol is 209.
* | | Support for SSL symbol runtime resolving in Symbian.Janne Anttila2009-05-291-0/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit enables -openssl config in addition to -openssl-linked in Symbian OS platforms. In Symbian OS the symbol names are stripped away from DLLand symbols are are referenced via ordinal numbers. This change resolves the correct ordinals for SSL symbols in Symbian OS. The change is a bit hackish, but is currently only way to resolve symbols at runtime in Symbian OS - if STDDLL targettype is not counted. The problem of STDDLL target type is that it is not supported by S60 3.1 and in addition the SSL libraries in S60 are not currently build with STDDLL target but DLL target. This mechanism should work as long as BC for SSL symbols is kept. And S60 has given binary promise, so we should not have problems...
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-112-4/+7
|\ \ \ | |/ / | | | | | | | | | Conflicts: tests/auto/qtemporaryfile/qtemporaryfile.pro
| * | Fix OpenSSL dynamic loading on OpenBSD.Thiago Macieira2009-05-071-3/+6
| |/ | | | | | | | | | | | | | | | | | | | | OpenBSD's OpenSSL libraries are linked in a bizarre way: libssl.so doesn't link to libcrypto.so, even though it depends on it. I don't claim to understand why, but they do it. So make sure we export its symbols for libssl to see and we load libcrypto first. Task-number: 252042 Patch by: Marc Espie <espie@openbsd.org> Reviewed-by: Peter Hartmann
| * Moved the QT_BEGIN_NAMESPACE macro to the right place in qsslcipher.cppThiago Macieira2009-05-061-1/+1
| | | | | | | | | | Task-number: 252298 Reviewed-by: Peter Hartmann
| * Long live Qt 4.5!Lars Knoll2009-03-2325-0/+10041
|
* Long live Qt for S60!axis2009-04-2425-0/+10078
generated by cgit v0.12 at 2025-08-27 18:10:50 (GMT)