diff options
| author | Richard Moore <rich@kde.org> | 2011-12-27 16:09:59 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-03 15:12:24 +0100 |
| commit | 82f9ad6295fb35e138841810a05075214a2f2690 (patch) | |
| tree | 93a6dfacb2733a237f600b2550a75991ac9f377d /dist | |
| parent | 053676a80e6fd3d415fd1915968b22bd5fb87704 (diff) | |
Always load the openssl configuration.
This change makes Qt load the default openssl config always, not just
when compiled with OPENSSL_LOAD_CONF. This means that facilities like
openssl engines (and their configuration) are usable. An alternative
would be to call OPENSSL_config(NULL) ourselves, but that's exactly
what the OPENSSL_add_all_algorithms_conf does for us.
Task-number: QTBUG-16018
Change-Id: I4cda701f82627e0541b6225009f4e1249aec9d47
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-5.0.0 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0 index b16eb666ae..84add0dfcc 100644 --- a/dist/changes-5.0.0 +++ b/dist/changes-5.0.0 @@ -193,6 +193,9 @@ QtNetwork * QSslCertificate::serialNumber() now always returns the serial number in hexadecimal format. +* The openssl network backend now reads the ssl configuration file allowing + the use of openssl engines. + QtOpenGL -------- |