database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-08 22:02:03 +03:00
Code

Ooops ... add required configure support.

Browse Source 
The previous commit assumed we have a configure probe for
SSL_CTX_set_cert_cb.  v15 lacks that, so add it now.
(Details borrowed from 36f40ce2d.)

Reported-by: Thomas Munro <thomas.munro@gmail.com>
Author: Tom Lane <tgl@sss.pgh.pa.us>
Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
Discussion: https://postgr.es/m/CA+hUKG+fLqyweHqFSBcErueUVT0vDuSNWui-ySz3+d_APmq7dw@mail.gmail.com
Backpatch-through: 15 only
This commit is contained in:
Tom Lane 2025-05-09 12:24:25 -04:00
parent 1ddb9e14ea
commit 00811a96ac
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -13448,13 +13448,15 @@ else
fi fi
fi fi
# Function introduced in OpenSSL 1.0.2. # Functions introduced in OpenSSL 1.0.2. LibreSSL does not have
for ac_func in X509_get_signature_nid # SSL_CTX_set_cert_cb().
for ac_func in X509_get_signature_nid SSL_CTX_set_cert_cb
do : do :
ac_fn_c_check_func "$LINENO" "X509_get_signature_nid" "ac_cv_func_X509_get_signature_nid" as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
if test "x$ac_cv_func_X509_get_signature_nid" = xyes; then : ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define HAVE_X509_GET_SIGNATURE_NID 1 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF _ACEOF
fi fi

5
configure.ac
View File

@ -1373,8 +1373,9 @@ if test "$with_ssl" = openssl ; then
AC_SEARCH_LIBS(CRYPTO_new_ex_data, [eay32 crypto], [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])]) AC_SEARCH_LIBS(CRYPTO_new_ex_data, [eay32 crypto], [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
AC_SEARCH_LIBS(SSL_new, [ssleay32 ssl], [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])]) AC_SEARCH_LIBS(SSL_new, [ssleay32 ssl], [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
fi fi
# Function introduced in OpenSSL 1.0.2. # Functions introduced in OpenSSL 1.0.2. LibreSSL does not have
AC_CHECK_FUNCS([X509_get_signature_nid]) # SSL_CTX_set_cert_cb().
AC_CHECK_FUNCS([X509_get_signature_nid SSL_CTX_set_cert_cb])
# Functions introduced in OpenSSL 1.1.0. We used to check for # Functions introduced in OpenSSL 1.1.0. We used to check for
# OPENSSL_VERSION_NUMBER, but that didn't work with 1.1.0, because LibreSSL # OPENSSL_VERSION_NUMBER, but that didn't work with 1.1.0, because LibreSSL
# defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it # defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it

3
src/include/pg_config.h.in
View File

@ -515,6 +515,9 @@
/* Define to 1 if you have spinlocks. */ /* Define to 1 if you have spinlocks. */
#undef HAVE_SPINLOCKS #undef HAVE_SPINLOCKS
/* Define to 1 if you have the `SSL_CTX_set_cert_cb' function. */
#undef HAVE_SSL_CTX_SET_CERT_CB
/* Define to 1 if you have the `SSL_CTX_set_num_tickets' function. */ /* Define to 1 if you have the `SSL_CTX_set_num_tickets' function. */
#undef HAVE_SSL_CTX_SET_NUM_TICKETS #undef HAVE_SSL_CTX_SET_NUM_TICKETS

1
src/tools/msvc/Solution.pm
View File

@ -364,6 +364,7 @@ sub GenerateFiles
HAVE_SHM_OPEN => undef, HAVE_SHM_OPEN => undef,
HAVE_SOCKLEN_T => 1, HAVE_SOCKLEN_T => 1,
HAVE_SPINLOCKS => 1, HAVE_SPINLOCKS => 1,
HAVE_SSL_CTX_SET_CERT_CB => 1,
HAVE_SSL_CTX_SET_NUM_TICKETS => undef, HAVE_SSL_CTX_SET_NUM_TICKETS => undef,
HAVE_STDINT_H => 1, HAVE_STDINT_H => 1,
HAVE_STDLIB_H => 1, HAVE_STDLIB_H => 1,