postgres.git / summary / log / commit / refs

commit    da98d005cdbcd45af563d0c4ac86d0e9772cd15f
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Fri Jul 07 04:59:41 2023 +0000
First released in: 17.0

    Fix some comments in ./configure and meson setup files
    
    The comments referring to SSL_CTX_set_cert_cb() in ./configure and
    ./configure.ac were inconsistent, as `autoreconf -i` would show.  While
    on it, fix a typo on a comment related to the same check in
    meson.build.
    
    Issue introduced in 8e278b6, that removed support for OpenSSL 1.0.1.
    Per offlist report from Thomas Munro.


 configure    | 2 +-
 configure.ac | 3 +--
 meson.build  | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 997d42d8f71..c4463cb17a6 100755
--- a/configure
+++ b/configure
@@ -12961,7 +12961,7 @@ else
 fi
 
   fi
-  # LibreSSL does not have SSL_CTX_set_cert_cb().
+  # Function introduced in OpenSSL 1.0.2, not in LibreSSL.
   for ac_func in SSL_CTX_set_cert_cb
 do :
   ac_fn_c_check_func "$LINENO" "SSL_CTX_set_cert_cb" "ac_cv_func_SSL_CTX_set_cert_cb"
diff --git a/configure.ac b/configure.ac
index 6052675fb8e..2c18a64b0f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1377,8 +1377,7 @@ 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(SSL_new, [ssleay32 ssl], [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
   fi
-  # Function introduced in OpenSSL 1.0.2. LibreSSL does not have
-  # SSL_CTX_set_cert_cb().
+  # Function introduced in OpenSSL 1.0.2, not in LibreSSL.
   AC_CHECK_FUNCS([SSL_CTX_set_cert_cb])
   # 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
diff --git a/meson.build b/meson.build
index 3ea4b0d72a0..62942ead09a 100644
--- a/meson.build
+++ b/meson.build
@@ -1270,7 +1270,7 @@ if sslopt in ['auto', 'openssl']
       ['CRYPTO_new_ex_data', {'required': true}],
       ['SSL_new', {'required': true}],
 
-      # Functions introduced in OpenSSL 1.0.2, not in LibreSSL.
+      # Function introduced in OpenSSL 1.0.2, not in LibreSSL.
       ['SSL_CTX_set_cert_cb'],
 
       # Functions introduced in OpenSSL 1.1.0. We used to check for


[parent: f863d82b2f98]