Skip to content

Commit f9456a2

Browse files
committed
Remove qt from enable-all as its defines are disruptive for most OSP's
1 parent a4cfc52 commit f9456a2

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

configure.ac

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,9 +1300,6 @@ then
13001300
test "$enable_openvpn" = "" && enable_openvpn=yes
13011301
test "$enable_asio" = "" && enable_asio=yes
13021302
test "$enable_libwebsockets" = "" && enable_libwebsockets=yes
1303-
if test "$ENABLED_FIPS" = "no" || test "$HAVE_FIPS_VERSION" -le 5; then
1304-
test "$enable_qt" = "" && enable_qt=yes
1305-
fi
13061303
fi
13071304
fi
13081305

src/x509.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10847,10 +10847,15 @@ WOLFSSL_ASN1_INTEGER* wolfSSL_X509_get_serialNumber(WOLFSSL_X509* x509)
1084710847
a->dataMax = WOLFSSL_ASN1_INTEGER_MAX;
1084810848
}
1084910849

10850+
#if defined(WOLFSSL_QT) || defined(WOLFSSL_HAPROXY)
10851+
XMEMCPY(&a->data[i], x509->serial, x509->serialSz);
10852+
a->length = x509->serialSz;
10853+
#else
1085010854
a->data[i++] = ASN_INTEGER;
1085110855
i += SetLength(x509->serialSz, a->data + i);
1085210856
XMEMCPY(&a->data[i], x509->serial, x509->serialSz);
1085310857
a->length = x509->serialSz + 2;
10858+
#endif
1085410859

1085510860
x509->serialNumber = a;
1085610861

0 commit comments

Comments
 (0)