OSDN Git Service

use ASN1_STRING_get0_data() if available
authorIvailo Monev <xakepa10@laimg.moc>
Thu, 28 Nov 2019 07:51:15 +0000 (07:51 +0000)
committerIvailo 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

index 223e765..eb7c8e8 100644 (file)
@@ -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);