<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/2d8a5350c9d5b614e12b991854183eaef9038fb0">https://github.com/macports/macports-ports/commit/2d8a5350c9d5b614e12b991854183eaef9038fb0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2d8a5350c9d5b614e12b991854183eaef9038fb0
</span>Author: David Gilman <davidgilman1@gmail.com>
AuthorDate: Tue Nov 28 20:57:23 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> postgresql15: fix openssl3.2 support
</span>---
databases/postgresql15-doc/Portfile | 2 +
databases/postgresql15/Portfile | 5 +-
databases/postgresql15/files/patch-openssl32.diff | 205 ++++++++++++++++++++++
3 files changed, 210 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql15-doc/Portfile b/databases/postgresql15-doc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4bf6468ace2..4ffa818542d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql15-doc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql15-doc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,7 @@ name postgresql15-doc
</span> conflicts postgresql96-doc postgresql10-doc postgresql11-doc postgresql12-doc \
postgresql13-doc postgresql14-doc
version 15.4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories databases
platforms darwin
maintainers {jwa @jyrkiwahlstedt}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,6 +36,7 @@ configure.args --mandir=${prefix}/share/man \
</span> --without-readline \
--without-zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:docbook-xml-4.5 port:docbook-xsl-nons
</span> build.dir ${worksrcpath}/doc
build.type gnu
build.target
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql15/Portfile b/databases/postgresql15/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 171df178756..5d4720a2515 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql15/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql15/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup muniversal 1.0
</span> #remember to update the -doc and -server as well
name postgresql15
version 15.5
<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;'>@@ -35,7 +35,8 @@ checksums rmd160 3b5202b1a3d1e481f3861b77c1b8bcca8806a39b \
</span> use_bzip2 yes
# do not build man or html files (use postgresqlXY-doc instead)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-no_doc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-no_doc.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-openssl32.diff
</span>
# https://trac.macports.org/ticket/66060
# https://trac.macports.org/ticket/67365
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql15/files/patch-openssl32.diff b/databases/postgresql15/files/patch-openssl32.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..43b111e48a0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql15/files/patch-openssl32.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,205 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 905c907043372b6f1d530ab2076154c64f43fdbf 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;'>+ 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 | 11 ++++-------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/test/ssl/t/001_ssltests.pl | 4 ++--
</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;'>+ 7 files changed, 11 insertions(+), 24 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 d83a402ea1..d55440cd6a 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;'>+@@ -13239,7 +13239,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 570daced81..2bc752ca1a 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;'>+@@ -1347,7 +1347,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 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 f5c5ed210e..aed8a75345 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;'>+@@ -839,11 +839,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;'>+@@ -853,7 +848,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;'>+@@ -873,7 +868,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;'>+@@ -949,7 +944,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 d09e9f9a1c..768e3d719c 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;'>+@@ -77,9 +77,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 af59ff49f7..d4bf40da21 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;'>+@@ -1800,11 +1800,8 @@ 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;'>++/* protected by ssl_config_mutex */
</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;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1812,7 +1809,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;'>+@@ -1842,7 +1839,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;'>+@@ -1933,7 +1930,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 707f4005af..c570b48a1b 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;'>+@@ -682,7 +682,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;'>+ # revoked certificates should not authenticate the user
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ log_unlike => [qr/connection authenticated:/],);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -743,6 +743,6 @@ $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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done_testing();
</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 790f03b05e..a53239fa28 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;'>+@@ -226,7 +226,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_CLOCK_GETTIME => 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;'>+@@ -566,7 +565,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>