summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Paquier2019-06-26 23:25:26 +0000
committerMichael Paquier2019-06-26 23:25:26 +0000
commit322c5bfdc3d76f6463768ecd8fced30c881b8be5 (patch)
tree88187c44933d4f3dc0779ca3622bb7f6c776b2a4
parent55ed3defc966cf718fe1e8c0efe964580bb23351 (diff)
Remove remaining traces of Rand_OpenSSL() from the tree
fe0a0b5 has removed the last use of this routine from pgcrypto, leading to a useless symbol definition and an extra configure check. Author: Michael Paquier Reviewed-by: Daniel Gustafsson, Tom Lane Discussion: https://postgr.es/m/[email protected]
-rwxr-xr-xconfigure2
-rw-r--r--configure.in2
-rw-r--r--src/include/pg_config.h.in3
3 files changed, 2 insertions, 5 deletions
diff --git a/configure b/configure
index 8d47071e4ac..add1645346e 100755
--- a/configure
+++ b/configure
@@ -12146,7 +12146,7 @@ done
# defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it
# doesn't have these OpenSSL 1.1.0 functions. So check for individual
# functions.
- for ac_func in OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data RAND_OpenSSL
+ for ac_func in OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
diff --git a/configure.in b/configure.in
index 74938d4190e..efc33d47755 100644
--- a/configure.in
+++ b/configure.in
@@ -1212,7 +1212,7 @@ if test "$with_openssl" = yes ; then
# defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it
# doesn't have these OpenSSL 1.1.0 functions. So check for individual
# functions.
- AC_CHECK_FUNCS([OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data RAND_OpenSSL])
+ AC_CHECK_FUNCS([OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data])
# OpenSSL versions before 1.1.0 required setting callback functions, for
# thread-safety. In 1.1.0, it's no longer required, and CRYPTO_lock()
# function was removed.
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 6cd4cfed0aa..512213aa32f 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -464,9 +464,6 @@
/* Define to 1 if you have the `random' function. */
#undef HAVE_RANDOM
-/* Define to 1 if you have the `RAND_OpenSSL' function. */
-#undef HAVE_RAND_OPENSSL
-
/* Define to 1 if you have the <readline.h> header file. */
#undef HAVE_READLINE_H