diff options
| author | Bernhard Rosenkraenzer <bero@arklinux.ch> | 2009-09-09 11:40:51 (GMT) |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@trolltech.com> | 2009-09-09 11:40:51 (GMT) |
| commit | 342e87fab8d62a8b8795a916ceedba6bba69959f (patch) | |
| tree | 30a938af1919374b22303c48902248fdecfee1ea /src/network/ssl/qsslcertificate.cpp | |
| parent | 67697199f0c9a9890b86d826e7193862aaad03b0 (diff) | |
| download | Qt-342e87fab8d62a8b8795a916ceedba6bba69959f.zip Qt-342e87fab8d62a8b8795a916ceedba6bba69959f.tar.gz Qt-342e87fab8d62a8b8795a916ceedba6bba69959f.tar.bz2 | |
Fix unresolved reference to q_sk_free with openssl 1.0
Previous fix introduced an unresolved reference in the lib
Merge-request: 1409
Reviewed-by: Peter Hartmann <peter.hartmann@trolltech.com>
Diffstat (limited to 'src/network/ssl/qsslcertificate.cpp')
| -rw-r--r-- | src/network/ssl/qsslcertificate.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index 2d5ebcf..821d7c6 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -395,7 +395,11 @@ 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; |