diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2009-10-05 14:28:27 (GMT) |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@nokia.com> | 2009-10-05 15:44:30 (GMT) |
| commit | b6313e00291a42e1e888a40b0c589ac5be497707 (patch) | |
| tree | 62c100aab4f007d43656df022a79575df1324de8 /src/network/ssl/qsslcertificate.cpp | |
| parent | c62d9f723347e448033bbb66b281b647166e89f4 (diff) | |
| download | Qt-b6313e00291a42e1e888a40b0c589ac5be497707.zip Qt-b6313e00291a42e1e888a40b0c589ac5be497707.tar.gz Qt-b6313e00291a42e1e888a40b0c589ac5be497707.tar.bz2 | |
OpenSSL wrapping: compile when configured with -openssl-linked
we were calling sk_pop_free from OpenSSL with a wrong signature.
Reviewed-by: Olivier Goffart
Diffstat (limited to 'src/network/ssl/qsslcertificate.cpp')
| -rw-r--r-- | src/network/ssl/qsslcertificate.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index 821d7c6..4bd6ff3 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -395,11 +395,7 @@ QMultiMap<QSsl::AlternateNameEntryType, QString> QSslCertificate::alternateSubje else if (genName->type == GEN_EMAIL) result.insert(QSsl::EmailEntry, altName); } -#if OPENSSL_VERSION_NUMBER >= 0x10000000L q_sk_pop_free((STACK*)altNames, reinterpret_cast<void(*)(void*)>(q_sk_free)); -#else - q_sk_pop_free((STACK*)altNames, q_sk_free); -#endif } return result; |