OSDN Git Service
(root)
/
kde
/
Katie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
685e169
)
use ASN1_STRING_get0_data() if available
author
Ivailo Monev
<xakepa10@laimg.moc>
Thu, 28 Nov 2019 07:51:15 +0000
(07:51 +0000)
committer
Ivailo Monev
<xakepa10@laimg.moc>
Thu, 28 Nov 2019 07:51:15 +0000
(07:51 +0000)
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
src/network/ssl/qsslcertificate.cpp
patch
|
blob
|
history
diff --git
a/src/network/ssl/qsslcertificate.cpp
b/src/network/ssl/qsslcertificate.cpp
index
223e765
..
eb7c8e8
100644
(file)
--- a/
src/network/ssl/qsslcertificate.cpp
+++ b/
src/network/ssl/qsslcertificate.cpp
@@
-435,7
+435,11
@@
QMultiMap<QSsl::AlternateNameEntryType, QString> QSslCertificate::alternateSubje
continue;
}
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
const char *altNameStr = reinterpret_cast<const char *>(ASN1_STRING_data(genName->d.ia5));
+#else
+ const char *altNameStr = reinterpret_cast<const char *>(ASN1_STRING_get0_data(genName->d.ia5));
+#endif
const QString altName = QString::fromLatin1(altNameStr, len);
if (genName->type == GEN_DNS)
result.insert(QSsl::DnsEntry, altName);