<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/279d7693305477e1209f4aab5a4d22e5a2ba5806">https://github.com/macports/macports-ports/commit/279d7693305477e1209f4aab5a4d22e5a2ba5806</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 279d7693305477e1209f4aab5a4d22e5a2ba5806
</span>Author: David Gilman <davidgilman1@gmail.com>
AuthorDate: Tue Nov 28 20:10:00 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> postgresql16: fix openssl 3.2 support
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/68777
</span>---
databases/postgresql16/Portfile | 6 +-
databases/postgresql16/files/patch-openssl32.diff | 226 ++++++++++++++++++++++
2 files changed, 230 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql16/Portfile b/databases/postgresql16/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 264efa3fc2a..dc7eed6dd0b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql16/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql16/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup legacysupport 1.1
</span>
name postgresql16
version 16.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories databases
maintainers {gmail.com:davidgilman1 @dgilman} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +43,7 @@ platform darwin powerpc {
</span> patchfiles-append patch-icu.diff \
patch-fix-ppc-asm.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-openssl32.diff
</span>
depends_lib port:readline path:lib/libssl.dylib:openssl port:zlib \
port:libxml2 port:libxslt \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +51,8 @@ depends_lib port:readline path:lib/libssl.dylib:openssl port:zlib \
</span> path:lib/libgssapi_krb5.dylib:kerberos5 \
path:lib/libzstd.dylib:zstd \
path:lib/liblz4.dylib:lz4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:bison port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:bison port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:docbook-xml-4.5 port:docbook-xsl-nons
</span> depends_run port:postgresql_select
legacysupport.newest_darwin_requires_legacy \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql16/files/patch-openssl32.diff b/databases/postgresql16/files/patch-openssl32.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..96089d6f70f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql16/files/patch-openssl32.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,226 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d35bb1a3eb324c0d1118ad8cbc6253bf968ff589 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Tom Lane <tgl@sss.pgh.pa.us>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 28 Nov 2023 12:34:03 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Use BIO_{get,set}_app_data instead of BIO_{get,set}_data.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We should have done it this way all along, but we accidentally got
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+away with using the wrong BIO field up until OpenSSL 3.2. There,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the library's BIO routines that we rely on use the "data" field
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+for their own purposes, and our conflicting use causes assorted
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+weird behaviors up to and including core dumps when SSL connections
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+are attempted. Switch to using the approved field for the purpose,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+i.e. app_data.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+While at it, remove our configure probes for BIO_get_data as well
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+as the fallback implementation. BIO_{get,set}_app_data have been
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+there since long before any OpenSSL version that we still support,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+even in the back branches.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Also, update src/test/ssl/t/001_ssltests.pl to allow for a minor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+change in an error message spelling that evidently came in with 3.2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Tristan Partin and Bo Andreson. Back-patch to all supported branches.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Discussion: https://postgr.es/m/CAN55FZ1eDDYsYaL7mv+oSLUij2h_u6hvD4Qmv-7PK7jkji0uyQ@mail.gmail.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ac | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson.build | 1 -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/backend/libpq/be-secure-openssl.c | 11 +++--------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/include/pg_config.h.in | 3 ---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/interfaces/libpq/fe-secure-openssl.c | 10 +++-------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/test/ssl/t/001_ssltests.pl | 6 +++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/tools/msvc/Solution.pm | 2 --
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8 files changed, 11 insertions(+), 26 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git configure configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 82e45657b2..907c777b9c 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12982,7 +12982,7 @@ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # doesn't have these OpenSSL 1.1.0 functions. So check for individual
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # functions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for ac_func in OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data HMAC_CTX_new HMAC_CTX_free
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for ac_func in OPENSSL_init_ssl BIO_meth_new ASN1_STRING_get0_data HMAC_CTX_new HMAC_CTX_free
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fcea0bcab4..ab32bfdd08 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1385,7 +1385,7 @@ if test "$with_ssl" = openssl ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # doesn't have these OpenSSL 1.1.0 functions. So check for individual
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # functions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_CHECK_FUNCS([OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data HMAC_CTX_new HMAC_CTX_free])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_CHECK_FUNCS([OPENSSL_init_ssl BIO_meth_new ASN1_STRING_get0_data HMAC_CTX_new HMAC_CTX_free])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # OpenSSL versions before 1.1.0 required setting callback functions, for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # thread-safety. In 1.1.0, it's no longer required, and CRYPTO_lock()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # function was removed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git meson.build meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 51b5285924..96fc2e139a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1278,7 +1278,6 @@ if sslopt in ['auto', 'openssl']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # doesn't have these OpenSSL 1.1.0 functions. So check for individual
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # functions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ['OPENSSL_init_ssl'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ['BIO_get_data'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ['BIO_meth_new'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ['ASN1_STRING_get0_data'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ['HMAC_CTX_new'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/backend/libpq/be-secure-openssl.c src/backend/libpq/be-secure-openssl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e9c86d08df..49dca0cda9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/backend/libpq/be-secure-openssl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/backend/libpq/be-secure-openssl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -844,11 +844,6 @@ be_tls_write(Port *port, void *ptr, size_t len, int *waitfor)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * to retry; do we need to adopt their logic for that?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef HAVE_BIO_GET_DATA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define BIO_get_data(bio) (bio->ptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define BIO_set_data(bio, data) (bio->ptr = data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static BIO_METHOD *my_bio_methods = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -858,7 +853,7 @@ my_sock_read(BIO *h, char *buf, int size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (buf != NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- res = secure_raw_read(((Port *) BIO_get_data(h)), buf, size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ res = secure_raw_read(((Port *) BIO_get_app_data(h)), buf, size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BIO_clear_retry_flags(h);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (res <= 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -878,7 +873,7 @@ my_sock_write(BIO *h, const char *buf, int size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int res = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- res = secure_raw_write(((Port *) BIO_get_data(h)), buf, size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ res = secure_raw_write(((Port *) BIO_get_app_data(h)), buf, size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BIO_clear_retry_flags(h);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (res <= 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -954,7 +949,7 @@ my_SSL_set_fd(Port *port, int fd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SSLerr(SSL_F_SSL_SET_FD, ERR_R_BUF_LIB);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto err;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BIO_set_data(bio, port);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BIO_set_app_data(bio, port);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BIO_set_fd(bio, fd, BIO_NOCLOSE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SSL_set_bio(port->ssl, bio, bio);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/include/pg_config.h.in src/include/pg_config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6d572c3820..174544630e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/include/pg_config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/include/pg_config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,9 +70,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define to 1 if you have the `backtrace_symbols' function. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef HAVE_BACKTRACE_SYMBOLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* Define to 1 if you have the `BIO_get_data' function. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#undef HAVE_BIO_GET_DATA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define to 1 if you have the `BIO_meth_new' function. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef HAVE_BIO_METH_NEW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/interfaces/libpq/fe-secure-openssl.c src/interfaces/libpq/fe-secure-openssl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 390c888c96..694d32754f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/interfaces/libpq/fe-secure-openssl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/interfaces/libpq/fe-secure-openssl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1830,10 +1830,6 @@ PQsslAttribute(PGconn *conn, const char *attribute_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * to retry; do we need to adopt their logic for that?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef HAVE_BIO_GET_DATA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define BIO_get_data(bio) (bio->ptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define BIO_set_data(bio, data) (bio->ptr = data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static BIO_METHOD *my_bio_methods;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1842,7 +1838,7 @@ my_sock_read(BIO *h, char *buf, int size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int res;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- res = pqsecure_raw_read((PGconn *) BIO_get_data(h), buf, size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ res = pqsecure_raw_read((PGconn *) BIO_get_app_data(h), buf, size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BIO_clear_retry_flags(h);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (res < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1872,7 +1868,7 @@ my_sock_write(BIO *h, const char *buf, int size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int res;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- res = pqsecure_raw_write((PGconn *) BIO_get_data(h), buf, size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ res = pqsecure_raw_write((PGconn *) BIO_get_app_data(h), buf, size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BIO_clear_retry_flags(h);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (res < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1963,7 +1959,7 @@ my_SSL_set_fd(PGconn *conn, int fd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SSLerr(SSL_F_SSL_SET_FD, ERR_R_BUF_LIB);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto err;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BIO_set_data(bio, conn);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BIO_set_app_data(bio, conn);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SSL_set_bio(conn->ssl, bio, bio);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BIO_set_fd(bio, fd, BIO_NOCLOSE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/test/ssl/t/001_ssltests.pl src/test/ssl/t/001_ssltests.pl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 76442de063..9bb28fbc83 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/test/ssl/t/001_ssltests.pl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/test/ssl/t/001_ssltests.pl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -781,7 +781,7 @@ $node->connect_fails(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$common_connstr user=ssltestuser sslcert=ssl/client-revoked.crt "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ . sslkey('client-revoked.key'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "certificate authorization fails with revoked client cert",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- expected_stderr => qr/SSL error: sslv3 alert certificate revoked/,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ expected_stderr => qr|SSL error: ssl[a-z0-9/]* alert certificate revoked|,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporarily(?) skip this check due to timing issue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # log_like => [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qr{Client certificate verification failed at depth 0: certificate revoked},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -886,7 +886,7 @@ $node->connect_fails(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$common_connstr user=ssltestuser sslcert=ssl/client-revoked.crt "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ . sslkey('client-revoked.key'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "certificate authorization fails with revoked client cert with server-side CRL directory",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- expected_stderr => qr/SSL error: sslv3 alert certificate revoked/,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ expected_stderr => qr|SSL error: ssl[a-z0-9/]* alert certificate revoked|,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporarily(?) skip this check due to timing issue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # log_like => [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qr{Client certificate verification failed at depth 0: certificate revoked},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -899,7 +899,7 @@ $node->connect_fails(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$common_connstr user=ssltestuser sslcert=ssl/client-revoked-utf8.crt "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ . sslkey('client-revoked-utf8.key'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "certificate authorization fails with revoked UTF-8 client cert with server-side CRL directory",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- expected_stderr => qr/SSL error: sslv3 alert certificate revoked/,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ expected_stderr => qr|SSL error: ssl[a-z0-9/]* alert certificate revoked|,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporarily(?) skip this check due to timing issue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # log_like => [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qr{Client certificate verification failed at depth 0: certificate revoked},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/tools/msvc/Solution.pm src/tools/msvc/Solution.pm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b6d31c3583..711fae853f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tools/msvc/Solution.pm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tools/msvc/Solution.pm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -225,7 +225,6 @@ sub GenerateFiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_ATOMICS => 1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_ATOMIC_H => undef,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_BACKTRACE_SYMBOLS => undef,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- HAVE_BIO_GET_DATA => undef,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_BIO_METH_NEW => undef,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_COMPUTED_GOTO => undef,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_COPYFILE => undef,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -503,7 +502,6 @@ sub GenerateFiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $define{HAVE_ASN1_STRING_GET0_DATA} = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $define{HAVE_BIO_GET_DATA} = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $define{HAVE_BIO_METH_NEW} = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $define{HAVE_HMAC_CTX_FREE} = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $define{HAVE_HMAC_CTX_NEW} = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>