diff options
| author | Bernhard Rosenkraenzer <br@blankpage.ch> | 2009-06-05 10:18:11 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-09 07:05:51 (GMT) |
| commit | 67b3981e249db9c7c570ff9f77a867ca4c8b0dca (patch) | |
| tree | 165d0ec2ccc7f7efb6e409ccdffd9de82f9af6eb /src/network/ssl/qsslcertificate.cpp | |
| parent | bbc0850742f4f926876dc55478ff74aaa121846b (diff) | |
| download | Qt-67b3981e249db9c7c570ff9f77a867ca4c8b0dca.zip Qt-67b3981e249db9c7c570ff9f77a867ca4c8b0dca.tar.gz Qt-67b3981e249db9c7c570ff9f77a867ca4c8b0dca.tar.bz2 | |
Make it possible to compile Qt 4.5 SSL support with OpenSSL 1.0.0
(-beta2, but 1.0.0 final shouldn't be very different)
Merge-request: 449
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'src/network/ssl/qsslcertificate.cpp')
| -rw-r--r-- | src/network/ssl/qsslcertificate.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index 7b554dc..ccb3f06 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -362,7 +362,7 @@ QMultiMap<QSsl::AlternateNameEntryType, QString> QSslCertificate::alternateSubje if (!d->x509) return result; - STACK *altNames = (STACK *)q_X509_get_ext_d2i(d->x509, NID_subject_alt_name, 0, 0); + STACK_OF(GENERAL_NAME) *altNames = (STACK_OF(GENERAL_NAME)*)q_X509_get_ext_d2i(d->x509, NID_subject_alt_name, 0, 0); if (altNames) { for (int i = 0; i < q_sk_GENERAL_NAME_num(altNames); ++i) { @@ -383,7 +383,7 @@ QMultiMap<QSsl::AlternateNameEntryType, QString> QSslCertificate::alternateSubje else if (genName->type == GEN_EMAIL) result.insert(QSsl::EmailEntry, altName); } - q_sk_free(altNames); + q_sk_free((STACK*)altNames); } return result; |