--- a/src/network/ssl/qsslcertificate_openssl.cpp
+++ b/src/network/ssl/qsslcertificate_openssl.cpp
@@ -125,9 +125,9 @@
     if (d->serialNumberString.isEmpty() && d->x509) {
         ASN1_INTEGER *serialNumber = q_X509_get_serialNumber(d->x509);
         QByteArray hexString;
-        hexString.reserve(serialNumber->length * 3);
-        for (int a = 0; a < serialNumber->length; ++a) {
-            hexString += QByteArray::number(serialNumber->data[a], 16).rightJustified(2, '0');
+        hexString.reserve(q_ASN1_STRING_length(serialNumber) * 3);
+        for (int a = 0; a < q_ASN1_STRING_length(serialNumber); ++a) {
+            hexString += QByteArray::number(q_ASN1_STRING_get0_data(serialNumber)[a], 16).rightJustified(2, '0');
             hexString += ':';
         }
         hexString.chop(1);
@@ -251,10 +251,10 @@
                 QHostAddress ipAddress;
                 switch (len) {
                 case 4: // IPv4
-                    ipAddress = QHostAddress(qFromBigEndian(*reinterpret_cast<quint32 *>(genName->d.iPAddress->data)));
+                    ipAddress = QHostAddress(qFromBigEndian<quint32>(q_ASN1_STRING_get0_data(genName->d.iPAddress)));
                     break;
                 case 16: // IPv6
-                    ipAddress = QHostAddress(reinterpret_cast<quint8 *>(genName->d.iPAddress->data));
+                    ipAddress = QHostAddress(q_ASN1_STRING_get0_data(genName->d.iPAddress));
                     break;
                 default: // Unknown IP address format
                     break;
@@ -511,8 +511,8 @@
 
             // keyid
             if (auth_key->keyid) {
-                QByteArray keyid(reinterpret_cast<const char *>(auth_key->keyid->data),
-                                 auth_key->keyid->length);
+                QByteArray keyid(reinterpret_cast<const char *>(q_ASN1_STRING_get0_data(auth_key->keyid)),
+                                 q_ASN1_STRING_length(auth_key->keyid));
                 result[QLatin1String("keyid")] = keyid.toHex();
             }
 
--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -244,7 +244,8 @@
 
 DEFINEFUNC(long, ASN1_INTEGER_get, ASN1_INTEGER *a, a, return 0, return)
 DEFINEFUNC2(int, ASN1_INTEGER_cmp, const ASN1_INTEGER *a, a, const ASN1_INTEGER *b, b, return 1, return)
-DEFINEFUNC(int, ASN1_STRING_length, ASN1_STRING *a, a, return 0, return)
+DEFINEFUNC(int, ASN1_STRING_length, const ASN1_STRING *a, a, return 0, return)
+DEFINEFUNC(int, ASN1_STRING_type, const ASN1_STRING *a, a, return 0, return)
 DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return)
 DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return)
 DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return)
@@ -408,31 +409,63 @@
 DEFINEFUNC4(int, X509_digest, const X509 *x509, x509, const EVP_MD *type, type, unsigned char *md, md, unsigned int *len, len, return -1, return)
 DEFINEFUNC(X509 *, X509_dup, X509 *a, a, return nullptr, return)
 DEFINEFUNC2(void, X509_print, BIO *a, a, X509 *b, b, return, DUMMYARG);
+#if defined(QT_LINKED_OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x40000000L
+ASN1_OBJECT * q_X509_EXTENSION_get_object(X509_EXTENSION *a) { return const_cast<ASN1_OBJECT *>(X509_EXTENSION_get_object(a)); }
+#else
 DEFINEFUNC(ASN1_OBJECT *, X509_EXTENSION_get_object, X509_EXTENSION *a, a, return nullptr, return)
+#endif
 DEFINEFUNC(void, X509_free, X509 *a, a, return, DUMMYARG)
 //Q_AUTOTEST_EXPORT ASN1_TIME *q_X509_gmtime_adj(ASN1_TIME *s, long adj);
 DEFINEFUNC2(ASN1_TIME *, X509_gmtime_adj, ASN1_TIME *s, s, long adj, adj, return nullptr, return)
 DEFINEFUNC(void, ASN1_TIME_free, ASN1_TIME *t, t, return, DUMMYARG)
+#if defined(QT_LINKED_OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x40000000L
+X509_EXTENSION * q_X509_get_ext(X509 *a, int b) { return const_cast<X509_EXTENSION *>(X509_get_ext(a, b)); }
+#else
 DEFINEFUNC2(X509_EXTENSION *, X509_get_ext, X509 *a, a, int b, b, return nullptr, return)
+#endif
 DEFINEFUNC(int, X509_get_ext_count, X509 *a, a, return 0, return)
 DEFINEFUNC4(void *, X509_get_ext_d2i, X509 *a, a, int b, b, int *c, c, int *d, d, return nullptr, return)
 DEFINEFUNC(const X509V3_EXT_METHOD *, X509V3_EXT_get, X509_EXTENSION *a, a, return nullptr, return)
 DEFINEFUNC(void *, X509V3_EXT_d2i, X509_EXTENSION *a, a, return nullptr, return)
 DEFINEFUNC(int, X509_EXTENSION_get_critical, X509_EXTENSION *a, a, return 0, return)
+#if defined(QT_LINKED_OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x40000000L
+ASN1_OCTET_STRING * q_X509_EXTENSION_get_data(X509_EXTENSION *a) { return const_cast<ASN1_OCTET_STRING *>(X509_EXTENSION_get_data(a)); }
+#else
 DEFINEFUNC(ASN1_OCTET_STRING *, X509_EXTENSION_get_data, X509_EXTENSION *a, a, return nullptr, return)
+#endif
 DEFINEFUNC(void, BASIC_CONSTRAINTS_free, BASIC_CONSTRAINTS *a, a, return, DUMMYARG)
 DEFINEFUNC(void, AUTHORITY_KEYID_free, AUTHORITY_KEYID *a, a, return, DUMMYARG)
 DEFINEFUNC(void, GENERAL_NAME_free, GENERAL_NAME *a, a, return, DUMMYARG)
 DEFINEFUNC2(int, ASN1_STRING_print, BIO *a, a, const ASN1_STRING *b, b, return 0, return)
 DEFINEFUNC2(int, X509_check_issued, X509 *a, a, X509 *b, b, return -1, return)
+#if defined(QT_LINKED_OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x40000000L
+X509_NAME * q_X509_get_issuer_name(X509 *a) { return const_cast<X509_NAME *>(X509_get_issuer_name(a)); }
+#else
 DEFINEFUNC(X509_NAME *, X509_get_issuer_name, X509 *a, a, return nullptr, return)
+#endif
+#if defined(QT_LINKED_OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x40000000L
+X509_NAME * q_X509_get_subject_name(X509 *a) { return const_cast<X509_NAME *>(X509_get_subject_name(a)); }
+#else
 DEFINEFUNC(X509_NAME *, X509_get_subject_name, X509 *a, a, return nullptr, return)
+#endif
 DEFINEFUNC(ASN1_INTEGER *, X509_get_serialNumber, X509 *a, a, return nullptr, return)
 DEFINEFUNC(int, X509_verify_cert, X509_STORE_CTX *a, a, return -1, return)
 DEFINEFUNC(int, X509_NAME_entry_count, X509_NAME *a, a, return 0, return)
+#if defined(QT_LINKED_OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x40000000L
+X509_NAME_ENTRY * q_X509_NAME_get_entry(X509_NAME *a, int b) { return const_cast<X509_NAME_ENTRY *>(X509_NAME_get_entry(a, b)); }
+#else
 DEFINEFUNC2(X509_NAME_ENTRY *, X509_NAME_get_entry, X509_NAME *a, a, int b, b, return nullptr, return)
+#endif
+#if defined(QT_LINKED_OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x40000000L
+ASN1_STRING * q_X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *a) { return const_cast<ASN1_STRING *>(X509_NAME_ENTRY_get_data(a)); }
+#else
 DEFINEFUNC(ASN1_STRING *, X509_NAME_ENTRY_get_data, X509_NAME_ENTRY *a, a, return nullptr, return)
+#endif
+#if defined(QT_LINKED_OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x40000000L
+ASN1_OBJECT * q_X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *a) { return const_cast<ASN1_OBJECT *>(X509_NAME_ENTRY_get_object(a)); }
+#else
 DEFINEFUNC(ASN1_OBJECT *, X509_NAME_ENTRY_get_object, X509_NAME_ENTRY *a, a, return nullptr, return)
+#endif
 DEFINEFUNC(EVP_PKEY *, X509_PUBKEY_get, X509_PUBKEY *a, a, return nullptr, return)
 DEFINEFUNC(void, X509_STORE_free, X509_STORE *a, a, return, DUMMYARG)
 DEFINEFUNC(X509_STORE *, X509_STORE_new, DUMMYARG, DUMMYARG, return nullptr, return)
@@ -985,6 +1018,7 @@
     RESOLVEFUNC(ASN1_INTEGER_get)
     RESOLVEFUNC(ASN1_INTEGER_cmp)
     RESOLVEFUNC(ASN1_STRING_length)
+    RESOLVEFUNC(ASN1_STRING_type)
     RESOLVEFUNC(ASN1_STRING_to_UTF8)
     RESOLVEFUNC(BIO_ctrl)
     RESOLVEFUNC(BIO_free)
@@ -1254,13 +1288,13 @@
 //==============================================================================
 QDateTime q_getTimeFromASN1(const ASN1_TIME *aTime)
 {
-    size_t lTimeLength = aTime->length;
-    char *pString = (char *) aTime->data;
+    size_t lTimeLength = q_ASN1_STRING_length(aTime);
+    const char *pString = reinterpret_cast<const char *>(q_ASN1_STRING_get0_data(aTime));
     auto isValidPointer = [pString, lTimeLength](const char *const probe){
         return size_t(probe - pString) < lTimeLength;
     };
 
-    if (aTime->type == V_ASN1_UTCTIME) {
+    if (q_ASN1_STRING_type(aTime) == V_ASN1_UTCTIME) {
 
         char lBuffer[24];
         char *pBuffer = lBuffer;
@@ -1333,7 +1367,7 @@
         result = result.addSecs(lSecondsFromUCT);
         return result;
 
-    } else if (aTime->type == V_ASN1_GENERALIZEDTIME) {
+    } else if (q_ASN1_STRING_type(aTime) == V_ASN1_GENERALIZEDTIME) {
 
         if (lTimeLength < 15)
             return QDateTime(); // hopefully never triggered
--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h
+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -373,7 +373,8 @@
 bool q_resolveOpenSslSymbols();
 long q_ASN1_INTEGER_get(ASN1_INTEGER *a);
 int q_ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y);
-int q_ASN1_STRING_length(ASN1_STRING *a);
+int q_ASN1_STRING_length(const ASN1_STRING *a);
+int q_ASN1_STRING_type(const ASN1_STRING *a);
 int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b);
 long q_BIO_ctrl(BIO *a, int b, long c, void *d);
 Q_AUTOTEST_EXPORT int q_BIO_free(BIO *a);
