Skip to content

Commit 322c5bf

Browse files
committed
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]
1 parent 55ed3de commit 322c5bf

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

configure

+1-1
Original file line numberDiff line numberDiff line change
@@ -12146,7 +12146,7 @@ done
1214612146
# defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it
1214712147
# doesn't have these OpenSSL 1.1.0 functions. So check for individual
1214812148
# functions.
12149-
for ac_func in OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data RAND_OpenSSL
12149+
for ac_func in OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data
1215012150
do :
1215112151
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1215212152
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

configure.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1212,7 +1212,7 @@ if test "$with_openssl" = yes ; then
12121212
# defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it
12131213
# doesn't have these OpenSSL 1.1.0 functions. So check for individual
12141214
# functions.
1215-
AC_CHECK_FUNCS([OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data RAND_OpenSSL])
1215+
AC_CHECK_FUNCS([OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data])
12161216
# OpenSSL versions before 1.1.0 required setting callback functions, for
12171217
# thread-safety. In 1.1.0, it's no longer required, and CRYPTO_lock()
12181218
# function was removed.

src/include/pg_config.h.in

-3
Original file line numberDiff line numberDiff line change
@@ -464,9 +464,6 @@
464464
/* Define to 1 if you have the `random' function. */
465465
#undef HAVE_RANDOM
466466

467-
/* Define to 1 if you have the `RAND_OpenSSL' function. */
468-
#undef HAVE_RAND_OPENSSL
469-
470467
/* Define to 1 if you have the <readline.h> header file. */
471468
#undef HAVE_READLINE_H
472469

0 commit comments

Comments
 (0)