Commit28f4bba

committed

Remove configure check for OpenSSL's SSL_get_current_compression()

This function has been added in OpenSSL 0.9.8, which is the oldestversion supported on HEAD, so checking for it at configure time isuseless. Both the frontend and backend code did not even bother to useit.Reported-by: Daniel GustafssonAuthor: Michael PaquierReviewed-by: Daniel Gustafsson, Tom LaneDiscussion:https://postgr.es/m/20191205083252.GE5064@paquier.xyzDiscussion:https://postgr.es/m/98F7F99E-1129-41D8-B86B-FE3B1E286881@yesql.se

1 parent431ba7b commit28f4bbaCopy full SHA for 28f4bba

File tree

-12

lines changed

-12

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12094,7 +12094,7 @@ else`
`12094`	`12094`	`fi`
`12095`	`12095`
`12096`	`12096`	`fi`
`12097`		`- for ac_func in SSL_clear_optionsSSL_get_current_compressionX509_get_signature_nid`
	`12097`	`+ for ac_func in SSL_clear_options X509_get_signature_nid`
`12098`	`12098`	`do :`
`12099`	`12099`	as_ac_var=`$as_echo "ac_cv_func_$ac_func" \| $as_tr_sh`
`12100`	`12100`	`ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1186,7 +1186,7 @@ if test "$with_openssl" = yes ; then`
`1186`	`1186`	`AC_SEARCH_LIBS(CRYPTO_new_ex_data, [eay32 crypto], [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])`
`1187`	`1187`	`AC_SEARCH_LIBS(SSL_new, [ssleay32 ssl], [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])`
`1188`	`1188`	`fi`
`1189`		`- AC_CHECK_FUNCS([SSL_clear_optionsSSL_get_current_compressionX509_get_signature_nid])`
	`1189`	`+ AC_CHECK_FUNCS([SSL_clear_options X509_get_signature_nid])`
`1190`	`1190`	`# Functions introduced in OpenSSL 1.1.0. We used to check for`
`1191`	`1191`	`# OPENSSL_VERSION_NUMBER, but that didn't work with 1.1.0, because LibreSSL`
`1192`	`1192`	`# defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -515,9 +515,6 @@`
`515`	`515`	/* Define to 1 if you have the `SSL_clear_options' function. */
`516`	`516`	`#undef HAVE_SSL_CLEAR_OPTIONS`
`517`	`517`
`518`		-/* Define to 1 if you have the `SSL_get_current_compression' function. */
`519`		`-#undef HAVE_SSL_GET_CURRENT_COMPRESSION`
`520`		`-`
`521`	`518`	`/* Define to 1 if stdbool.h conforms to C99. */`
`522`	`519`	`#undef HAVE_STDBOOL_H`
`523`	`520`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -373,9 +373,6 @@`
`373`	`373`	/* Define to 1 if you have the `SSL_clear_options' function. */
`374`	`374`	`#define HAVE_SSL_CLEAR_OPTIONS 1`
`375`	`375`
`376`		-/* Define to 1 if you have the `SSL_get_current_compression' function. */
`377`		`-#define HAVE_SSL_GET_CURRENT_COMPRESSION 1`
`378`		`-`
`379`	`376`	`/* Define to 1 if stdbool.h conforms to C99. */`
`380`	`377`	`#define HAVE_STDBOOL_H 1`
`381`	`378`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -446,10 +446,6 @@ extern void unsetenv(const char *name);`
`446`	`446`	`externvoidsrandom(unsignedintseed);`
`447`	`447`	`#endif`
`448`	`448`
`449`		`-#ifndefHAVE_SSL_GET_CURRENT_COMPRESSION`
`450`		`-#defineSSL_get_current_compression(x) 0`
`451`		`-#endif`
`452`		`-`
`453`	`449`	`#ifndefHAVE_DLOPEN`
`454`	`450`	`externvoiddlopen(constcharfile,intmode);`
`455`	`451`	`externvoiddlsym(voidhandle,constchar*symbol);`

Comments

(0)