Remove qt from enable-all as its defines are disruptive for most OSP's

Author: julek-wolfssl

configure.ac

@@ -1300,9 +1300,6 @@ then
             test "$enable_openvpn" = "" && enable_openvpn=yes
             test "$enable_asio" = "" && enable_asio=yes
             test "$enable_libwebsockets" = "" && enable_libwebsockets=yes
-            if test "$ENABLED_FIPS" = "no" || test "$HAVE_FIPS_VERSION" -le 5; then
-                test "$enable_qt" = "" && enable_qt=yes
-            fi
         fi
     fi
 

src/ocsp.c

@@ -1995,12 +1995,18 @@ int wolfSSL_OCSP_id_get0_info(WOLFSSL_ASN1_STRING **name,
             ser->dataMax = WOLFSSL_ASN1_INTEGER_MAX;
         }
 
-        ser->data[i++] = ASN_INTEGER;
-        i += SetLength(cid->status->serialSz, ser->data + i);
-        XMEMCPY(&ser->data[i], cid->status->serial,
-            (size_t)cid->status->serialSz);
-        ser->length = i + cid->status->serialSz;
-
+        #if defined(WOLFSSL_QT) || defined(WOLFSSL_HAPROXY)
+            /* Serial number starts at 0 index of ser->data */
+            XMEMCPY(&ser->data[i], cid->status->serial,
+                (size_t)cid->status->serialSz);
+            ser->length = cid->status->serialSz;
+        #else
+            ser->data[i++] = ASN_INTEGER;
+            i += SetLength(cid->status->serialSz, ser->data + i);
+            XMEMCPY(&ser->data[i], cid->status->serial,
+                (size_t)cid->status->serialSz);
+            ser->length = i + cid->status->serialSz;
+        #endif
         cid->status->serialInt = ser;
         *serial = ser;
     }

src/x509.c

@@ -11005,10 +11005,15 @@ WOLFSSL_ASN1_INTEGER* wolfSSL_X509_get_serialNumber(WOLFSSL_X509* x509)
         a->dataMax = WOLFSSL_ASN1_INTEGER_MAX;
     }
 
-    a->data[i++] = ASN_INTEGER;
-    i += SetLength(x509->serialSz, a->data + i);
-    XMEMCPY(&a->data[i], x509->serial, x509->serialSz);
-    a->length = x509->serialSz + 2;
+    #if defined(WOLFSSL_QT) || defined(WOLFSSL_HAPROXY)
+        XMEMCPY(&a->data[i], x509->serial, x509->serialSz);
+        a->length = x509->serialSz;
+    #else
+        a->data[i++] = ASN_INTEGER;
+        i += SetLength(x509->serialSz, a->data + i);
+        XMEMCPY(&a->data[i], x509->serial, x509->serialSz);
+        a->length = x509->serialSz + 2;
+    #endif
 
     x509->serialNumber = a;