Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit00811a9

Browse files
committed
Ooops ... add required configure support.
The previous commit assumed we have a configure probe forSSL_CTX_set_cert_cb. v15 lacks that, so add it now.(Details borrowed from36f40ce.)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.comBackpatch-through: 15 only
1 parent1ddb9e1 commit00811a9

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

‎configure

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13448,13 +13448,15 @@ else
1344813448
fi
1344913449

1345013450
fi
13451-
# Function introduced in OpenSSL 1.0.2.
13452-
for ac_func in X509_get_signature_nid
13451+
# Functions introduced in OpenSSL 1.0.2. LibreSSL does not have
13452+
# SSL_CTX_set_cert_cb().
13453+
for ac_func in X509_get_signature_nid SSL_CTX_set_cert_cb
1345313454
do :
13454-
ac_fn_c_check_func "$LINENO" "X509_get_signature_nid" "ac_cv_func_X509_get_signature_nid"
13455-
if test "x$ac_cv_func_X509_get_signature_nid" = xyes; then :
13455+
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
13456+
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
13457+
if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
1345613458
cat >>confdefs.h <<_ACEOF
13457-
#defineHAVE_X509_GET_SIGNATURE_NID 1
13459+
#define`$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
1345813460
_ACEOF
1345913461

1346013462
fi

‎configure.ac

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1373,8 +1373,9 @@ if test "$with_ssl" = openssl ; then
13731373
AC_SEARCH_LIBS(CRYPTO_new_ex_data,[eay32 crypto],[],[AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
13741374
AC_SEARCH_LIBS(SSL_new,[ssleay32 ssl],[],[AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
13751375
fi
1376-
# Function introduced in OpenSSL 1.0.2.
1377-
AC_CHECK_FUNCS([X509_get_signature_nid])
1376+
# Functions introduced in OpenSSL 1.0.2. LibreSSL does not have
1377+
# SSL_CTX_set_cert_cb().
1378+
AC_CHECK_FUNCS([X509_get_signature_nid SSL_CTX_set_cert_cb])
13781379
# Functions introduced in OpenSSL 1.1.0. We used to check for
13791380
# OPENSSL_VERSION_NUMBER, but that didn't work with 1.1.0, because LibreSSL
13801381
# defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it

‎src/include/pg_config.h.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,9 @@
515515
/* Define to 1 if you have spinlocks. */
516516
#undef HAVE_SPINLOCKS
517517

518+
/* Define to 1 if you have the `SSL_CTX_set_cert_cb' function. */
519+
#undef HAVE_SSL_CTX_SET_CERT_CB
520+
518521
/* Define to 1 if you have the `SSL_CTX_set_num_tickets' function. */
519522
#undef HAVE_SSL_CTX_SET_NUM_TICKETS
520523

‎src/tools/msvc/Solution.pm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ sub GenerateFiles
364364
HAVE_SHM_OPEN=>undef,
365365
HAVE_SOCKLEN_T=> 1,
366366
HAVE_SPINLOCKS=> 1,
367+
HAVE_SSL_CTX_SET_CERT_CB=> 1,
367368
HAVE_SSL_CTX_SET_NUM_TICKETS=>undef,
368369
HAVE_STDINT_H=> 1,
369370
HAVE_STDLIB_H=> 1,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp