Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 28f4bba

Browse files
committed
Remove configure check for OpenSSL's SSL_get_current_compression()
This function has been added in OpenSSL 0.9.8, which is the oldest version supported on HEAD, so checking for it at configure time is useless. Both the frontend and backend code did not even bother to use it. Reported-by: Daniel Gustafsson Author: Michael Paquier Reviewed-by: Daniel Gustafsson, Tom Lane Discussion: https://postgr.es/m/20191205083252.GE5064@paquier.xyz Discussion: https://postgr.es/m/98F7F99E-1129-41D8-B86B-FE3B1E286881@yesql.se
1 parent 431ba7b commit 28f4bba

File tree

5 files changed

+2
-12
lines changed

5 files changed

+2
-12
lines changed

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12094,7 +12094,7 @@ else
1209412094
fi
1209512095

1209612096
fi
12097-
for ac_func in SSL_clear_options SSL_get_current_compression X509_get_signature_nid
12097+
for ac_func in SSL_clear_options X509_get_signature_nid
1209812098
do :
1209912099
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1210012100
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1186,7 +1186,7 @@ if test "$with_openssl" = yes ; then
11861186
AC_SEARCH_LIBS(CRYPTO_new_ex_data, [eay32 crypto], [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
11871187
AC_SEARCH_LIBS(SSL_new, [ssleay32 ssl], [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
11881188
fi
1189-
AC_CHECK_FUNCS([SSL_clear_options SSL_get_current_compression X509_get_signature_nid])
1189+
AC_CHECK_FUNCS([SSL_clear_options X509_get_signature_nid])
11901190
# Functions introduced in OpenSSL 1.1.0. We used to check for
11911191
# OPENSSL_VERSION_NUMBER, but that didn't work with 1.1.0, because LibreSSL
11921192
# defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it

src/include/pg_config.h.in

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

518-
/* Define to 1 if you have the `SSL_get_current_compression' function. */
519-
#undef HAVE_SSL_GET_CURRENT_COMPRESSION
520-
521518
/* Define to 1 if stdbool.h conforms to C99. */
522519
#undef HAVE_STDBOOL_H
523520

src/include/pg_config.h.win32

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,6 @@
373373
/* Define to 1 if you have the `SSL_clear_options' function. */
374374
#define HAVE_SSL_CLEAR_OPTIONS 1
375375

376-
/* Define to 1 if you have the `SSL_get_current_compression' function. */
377-
#define HAVE_SSL_GET_CURRENT_COMPRESSION 1
378-
379376
/* Define to 1 if stdbool.h conforms to C99. */
380377
#define HAVE_STDBOOL_H 1
381378

src/include/port.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -446,10 +446,6 @@ extern void unsetenv(const char *name);
446446
extern void srandom(unsigned int seed);
447447
#endif
448448

449-
#ifndef HAVE_SSL_GET_CURRENT_COMPRESSION
450-
#define SSL_get_current_compression(x) 0
451-
#endif
452-
453449
#ifndef HAVE_DLOPEN
454450
extern void *dlopen(const char *file, int mode);
455451
extern void *dlsym(void *handle, const char *symbol);

0 commit comments

Comments
 (0)