remove remaining references to SSLeay

Prompted by Rosen Penev

2 files changed, 10 insertions, 7 deletions

diff --git a/configure.ac b/configure.ac
index 7379ab358..0d55bece5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2602,8 +2602,9 @@ if test "x$openssl" = "xyes" ; then
                 if(fd == NULL)
                         exit(1);
 
-                if ((rc = fprintf(fd, "%08lx (%s)\n", (unsigned long)SSLeay(),
-                    SSLeay_version(SSLEAY_VERSION))) < 0)
+                if ((rc = fprintf(fd, "%08lx (%s)\n",
+                    (unsigned long)OpenSSL_version_num(),
+                    OpenSSL_version(OPENSSL_VERSION))) < 0)
                         exit(1);
 
                 exit(0);
@@ -2645,7 +2646,7 @@ if test "x$openssl" = "xyes" ; then
         #include <openssl/opensslv.h>
         #include <openssl/crypto.h>
                 ]], [[
-                exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1);
+                exit(OpenSSL_version_num() == OPENSSL_VERSION_NUMBER ? 0 : 1);
                 ]])],
                 [
                         AC_MSG_RESULT([yes])
@@ -2673,7 +2674,7 @@ if test "x$openssl" = "xyes" ; then
         AC_MSG_CHECKING([if programs using OpenSSL functions will link])
         AC_LINK_IFELSE(
                 [AC_LANG_PROGRAM([[ #include <openssl/evp.h> ]],
-                [[ SSLeay_add_all_algorithms(); ]])],
+                [[ OpenSSL_add_all_algorithms(); ]])],
                 [
                         AC_MSG_RESULT([yes])
                 ],
@@ -2684,7 +2685,7 @@ if test "x$openssl" = "xyes" ; then
                         AC_MSG_CHECKING([if programs using OpenSSL need -ldl])
                         AC_LINK_IFELSE(
                                 [AC_LANG_PROGRAM([[ #include <openssl/evp.h> ]],
-                                [[ SSLeay_add_all_algorithms(); ]])],
+                                [[ OpenSSL_add_all_algorithms(); ]])],
                                 [
                                         AC_MSG_RESULT([yes])
                                 ],
diff --git a/entropy.c b/entropy.c
index c178c00cf..fc710ec23 100644
--- a/entropy.c
+++ b/entropy.c
@@ -219,9 +219,11 @@ seed_rng(void)
 #ifndef OPENSSL_PRNG_ONLY
         unsigned char buf[RANDOM_SEED_SIZE];
 #endif
-        if (!ssh_compatible_openssl(OPENSSL_VERSION_NUMBER, SSLeay()))
+        if (!ssh_compatible_openssl(OPENSSL_VERSION_NUMBER,
+            OpenSSL_version_num()))
                 fatal("OpenSSL version mismatch. Built against %lx, you "
-                    "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
+                    "have %lx", (u_long)OPENSSL_VERSION_NUMBER,
+                    OpenSSL_version_num());
 
 #ifndef OPENSSL_PRNG_ONLY
         if (RAND_status() == 1) {